This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6

Closed
ggfan wants to merge 1 commit into from
Closed

add support for 64 bit platforms #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions samples-android/TbmpSkeletonNative/.classpath
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
1 change: 1 addition & 0 deletions samples-android/TbmpSkeletonNative/jni/Application.mk
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down
1 change: 0 additions & 1 deletion samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
*/
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
Engine *eng = (Engine *)app->userData;
LOGI("message %d", cmd);
switch (cmd) {
case APP_CMD_SAVE_STATE:
break;
Expand Down
76 changes: 73 additions & 3 deletions samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
int32_t param2) {
JUIBase *p = (JUIBase *)id;
/*
* id from Java is generated toekn, which could be mapped into an UI pointer
* id is opaque to Java, so Java receives and return back the same id to us
*/
JUIBase *p = JUIBase::id_factory_.getUIBase(id);
if( p )
p->DispatchEvent(message, param1, param2);
else {
LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
}
}
}

p->DispatchEvent(message, param1, param2);
/*
* IdFactory Implementation: our ID is just a simple integer starting from 1,and
* keeps on counting up. There is no re-use -- even
* one ID is removed from cache, we still counting up
* It will take a long while to overflow a 32 bit integer
* for UI ids. Even it does, it wrap back, at that time,
* previous low values will long gone.
*/
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
auto it = ids_.find(ui_object);
if (it == ids_.end()) {
LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
ids_[ui_object] = cur_id_++;
return ids_[ui_object];
}
return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
for (auto id: ids_) {
if(id.second == ui_id) {
return const_cast<JUIBase*>(id.first);
}
}
LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
bool status = true;
auto it = ids_.find(ui_object);
if (it != ids_.end()) {
LOGE("Error: %p is already in = %d", it->first, it->second);
LOGE("Overwriting %p with %p for it", it->first, ui_object);
status = false;
//return false; ---> let it fall through
}
ids_[ui_object] = cur_id_++;
return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
auto it = ids_.find(ui_object);
if (it == ids_.end()) {
LOGE("IDs not inside hash for %p!!!", ui_object);
return false;
}
ids_.erase(it);
return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
for (auto id: ids_) {
LOGI("Cached ID (%p = %d)", id.first, id.second);
}
}

/*
* Our global instance for id factory
*/
IdFactory JUIBase::id_factory_;

/*
* JUIView
*/
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
const JUIView *parameter) {
AddRule(layoutParameterIndex, (int32_t) parameter);

/*
* perform pointer to id xlation
*/
AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down
4 changes: 2 additions & 2 deletions samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

//Notify 'id' to JNI side
ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

//Notify 'id' to JNI side
ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
env->DeleteLocalRef(obj);
}

Expand Down
27 changes: 24 additions & 3 deletions samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
const int32_t attribute_type;
};

/*
* class IdFactory: cache UI pointers and generate an ID, send ID to Java side
* when get id back from Java, retrieve the UI pointer for that
* ID, and continue. Mainly purpose is for things to be called
* back on UI thread
*/
class JUIBase;
class IdFactory {
public:
int32_t getId(const JUIBase* ui_object);
JUIBase* getUIBase(int32_t ui_id);
void debugDumpCurrentHashTable(void);
bool insert(const JUIBase* ui_object);
bool remove(const JUIBase* ui_object);

private:
std::unordered_map<const JUIBase*, int32_t> ids_;
static int32_t cur_id_;
};

/*
* Base class of JUIView
*/
class JUIBase {
public:
JUIBase() : obj_(NULL) {}

virtual ~JUIBase() {}
JUIBase() : obj_(NULL) { id_factory_.insert(this); }
virtual ~JUIBase() { id_factory_.remove(this); }

/*
* Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
return true;
}

static IdFactory id_factory_;

protected:
std::unordered_map<std::string, AttributeParameterStore>
map_attribute_parameters;
Expand Down
10 changes: 6 additions & 4 deletions samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
: activity_(NULL), suspended_(false), windowDestroyed_(false),
jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
env->DeleteGlobalRef(jni_helper_java_ref_);
env->DeleteGlobalRef(jni_helper_java_class_);

JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
}
}

jobject obj =
env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
jobject objGlobal = env->NewGlobalRef(obj);
env->DeleteLocalRef(name);
env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
return NULL;
}
}

jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
(int32_t) id, (int32_t) param);
JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

jobject objGlobal = env->NewGlobalRef(obj);
env->DeleteLocalRef(name);
env->DeleteLocalRef(objGlobal);
Expand Down
2 changes: 1 addition & 1 deletion samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
int64_t pointer) {
std::function<void()> *pCallback = (std::function<void()> *)pointer;
(*pCallback)();
Expand Down
2 changes: 1 addition & 1 deletion samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
int64_t pointer);
}

Expand Down
4 changes: 2 additions & 2 deletions samples-android/TbmpSkeletonNative/project.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib
2 changes: 1 addition & 1 deletion samples-android/TbmpSkeletonNative/res/values/strings.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
<string name="app_name">TBMPSkeleton</string>
<string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6
 Closed

ggfan
wants to merge
1
commit into

from

 Closed


add support for 64 bit platforms
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 9 additions & 0 deletions
samples-android/TbmpSkeletonNative/.classpath

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

1 change: 1 addition & 0 deletions
samples-android/TbmpSkeletonNative/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down

1 change: 0 additions & 1 deletion
samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

76 changes: 73 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
 JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
 int32_t param2) {
 JUIBase *p = (JUIBase *)id;
 /*
 * id from Java is generated toekn, which could be mapped into an UI pointer
 * id is opaque to Java, so Java receives and return back the same id to us
 */
 JUIBase *p = JUIBase::id_factory_.getUIBase(id);
 if( p )
 p->DispatchEvent(message, param1, param2);
 else {
 LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
 }
}
}

 p->DispatchEvent(message, param1, param2);
/*
 * IdFactory Implementation: our ID is just a simple integer starting from 1,and
 * keeps on counting up. There is no re-use -- even
 * one ID is removed from cache, we still counting up
 * It will take a long while to overflow a 32 bit integer
 * for UI ids. Even it does, it wrap back, at that time,
 * previous low values will long gone.
 */
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
 ids_[ui_object] = cur_id_++;
 return ids_[ui_object];
 }
 return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
 for (auto id: ids_) {
 if(id.second == ui_id) {
 return const_cast<JUIBase*>(id.first);
 }
 }
 LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
 return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
 bool status = true;
 auto it = ids_.find(ui_object);
 if (it != ids_.end()) {
 LOGE("Error: %p is already in = %d", it->first, it->second);
 LOGE("Overwriting %p with %p for it", it->first, ui_object);
 status = false;
 //return false; ---> let it fall through
 }
 ids_[ui_object] = cur_id_++;
 return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p!!!", ui_object);
 return false;
 }
 ids_.erase(it);
 return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
 for (auto id: ids_) {
 LOGI("Cached ID (%p = %d)", id.first, id.second);
 }
}

/*
 * Our global instance for id factory
 */
IdFactory JUIBase::id_factory_;

/*
 * JUIView
 */
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
 const JUIView *parameter) {
 AddRule(layoutParameterIndex, (int32_t) parameter);

 /*
 * perform pointer to id xlation
 */
 AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand Down

27 changes: 24 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
 const int32_t attribute_type;
};

/*
 * class IdFactory: cache UI pointers and generate an ID, send ID to Java side
 * when get id back from Java, retrieve the UI pointer for that
 * ID, and continue. Mainly purpose is for things to be called
 * back on UI thread
 */
class JUIBase;
class IdFactory {
 public:
 int32_t getId(const JUIBase* ui_object);
 JUIBase* getUIBase(int32_t ui_id);
 void debugDumpCurrentHashTable(void);
 bool insert(const JUIBase* ui_object);
 bool remove(const JUIBase* ui_object);

 private:
 std::unordered_map<const JUIBase*, int32_t> ids_;
 static int32_t cur_id_;
};

/*
 * Base class of JUIView
 */
class JUIBase {
public:
 JUIBase() : obj_(NULL) {}

 virtual ~JUIBase() {}
 JUIBase() : obj_(NULL) { id_factory_.insert(this); }
 virtual ~JUIBase() { id_factory_.remove(this); }

 /*
 * Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
 return true;
 }

 static IdFactory id_factory_;

protected:
 std::unordered_map<std::string, AttributeParameterStore>
 map_attribute_parameters;
Expand Down

10 changes: 6 additions & 4 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
 : activity_(NULL), suspended_(false), windowDestroyed_(false),
 jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
 JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
 views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
 env->DeleteGlobalRef(jni_helper_java_ref_);
 env->DeleteGlobalRef(jni_helper_java_class_);

 JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
 }
 }

 jobject obj =
 env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
 return NULL;
 }
 }

 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
 (int32_t) id, (int32_t) param);
 JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(objGlobal);
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
 int64_t pointer) {
 std::function<void()> *pCallback = (std::function<void()> *)pointer;
 (*pCallback)();
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
 int64_t pointer);
}

Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/res/values/strings.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
 <string name="app_name">TBMPSkeleton</string>
 <string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6
 Closed

ggfan
wants to merge
1
commit into

from

 Closed


add support for 64 bit platforms
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 9 additions & 0 deletions
samples-android/TbmpSkeletonNative/.classpath

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

1 change: 1 addition & 0 deletions
samples-android/TbmpSkeletonNative/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down

1 change: 0 additions & 1 deletion
samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

76 changes: 73 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
 JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
 int32_t param2) {
 JUIBase *p = (JUIBase *)id;
 /*
 * id from Java is generated toekn, which could be mapped into an UI pointer
 * id is opaque to Java, so Java receives and return back the same id to us
 */
 JUIBase *p = JUIBase::id_factory_.getUIBase(id);
 if( p )
 p->DispatchEvent(message, param1, param2);
 else {
 LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
 }
}
}

 p->DispatchEvent(message, param1, param2);
/*
 * IdFactory Implementation: our ID is just a simple integer starting from 1,and
 * keeps on counting up. There is no re-use -- even
 * one ID is removed from cache, we still counting up
 * It will take a long while to overflow a 32 bit integer
 * for UI ids. Even it does, it wrap back, at that time,
 * previous low values will long gone.
 */
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
 ids_[ui_object] = cur_id_++;
 return ids_[ui_object];
 }
 return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
 for (auto id: ids_) {
 if(id.second == ui_id) {
 return const_cast<JUIBase*>(id.first);
 }
 }
 LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
 return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
 bool status = true;
 auto it = ids_.find(ui_object);
 if (it != ids_.end()) {
 LOGE("Error: %p is already in = %d", it->first, it->second);
 LOGE("Overwriting %p with %p for it", it->first, ui_object);
 status = false;
 //return false; ---> let it fall through
 }
 ids_[ui_object] = cur_id_++;
 return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p!!!", ui_object);
 return false;
 }
 ids_.erase(it);
 return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
 for (auto id: ids_) {
 LOGI("Cached ID (%p = %d)", id.first, id.second);
 }
}

/*
 * Our global instance for id factory
 */
IdFactory JUIBase::id_factory_;

/*
 * JUIView
 */
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
 const JUIView *parameter) {
 AddRule(layoutParameterIndex, (int32_t) parameter);

 /*
 * perform pointer to id xlation
 */
 AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand Down

27 changes: 24 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
 const int32_t attribute_type;
};

/*
 * class IdFactory: cache UI pointers and generate an ID, send ID to Java side
 * when get id back from Java, retrieve the UI pointer for that
 * ID, and continue. Mainly purpose is for things to be called
 * back on UI thread
 */
class JUIBase;
class IdFactory {
 public:
 int32_t getId(const JUIBase* ui_object);
 JUIBase* getUIBase(int32_t ui_id);
 void debugDumpCurrentHashTable(void);
 bool insert(const JUIBase* ui_object);
 bool remove(const JUIBase* ui_object);

 private:
 std::unordered_map<const JUIBase*, int32_t> ids_;
 static int32_t cur_id_;
};

/*
 * Base class of JUIView
 */
class JUIBase {
public:
 JUIBase() : obj_(NULL) {}

 virtual ~JUIBase() {}
 JUIBase() : obj_(NULL) { id_factory_.insert(this); }
 virtual ~JUIBase() { id_factory_.remove(this); }

 /*
 * Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
 return true;
 }

 static IdFactory id_factory_;

protected:
 std::unordered_map<std::string, AttributeParameterStore>
 map_attribute_parameters;
Expand Down

10 changes: 6 additions & 4 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
 : activity_(NULL), suspended_(false), windowDestroyed_(false),
 jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
 JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
 views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
 env->DeleteGlobalRef(jni_helper_java_ref_);
 env->DeleteGlobalRef(jni_helper_java_class_);

 JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
 }
 }

 jobject obj =
 env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
 return NULL;
 }
 }

 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
 (int32_t) id, (int32_t) param);
 JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(objGlobal);
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
 int64_t pointer) {
 std::function<void()> *pCallback = (std::function<void()> *)pointer;
 (*pCallback)();
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
 int64_t pointer);
}

Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/res/values/strings.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
 <string name="app_name">TBMPSkeleton</string>
 <string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6
 Closed

ggfan
wants to merge
1
commit into

from

 Closed


add support for 64 bit platforms
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 9 additions & 0 deletions
samples-android/TbmpSkeletonNative/.classpath

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

1 change: 1 addition & 0 deletions
samples-android/TbmpSkeletonNative/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down

1 change: 0 additions & 1 deletion
samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

76 changes: 73 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
 JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
 int32_t param2) {
 JUIBase *p = (JUIBase *)id;
 /*
 * id from Java is generated toekn, which could be mapped into an UI pointer
 * id is opaque to Java, so Java receives and return back the same id to us
 */
 JUIBase *p = JUIBase::id_factory_.getUIBase(id);
 if( p )
 p->DispatchEvent(message, param1, param2);
 else {
 LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
 }
}
}

 p->DispatchEvent(message, param1, param2);
/*
 * IdFactory Implementation: our ID is just a simple integer starting from 1,and
 * keeps on counting up. There is no re-use -- even
 * one ID is removed from cache, we still counting up
 * It will take a long while to overflow a 32 bit integer
 * for UI ids. Even it does, it wrap back, at that time,
 * previous low values will long gone.
 */
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
 ids_[ui_object] = cur_id_++;
 return ids_[ui_object];
 }
 return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
 for (auto id: ids_) {
 if(id.second == ui_id) {
 return const_cast<JUIBase*>(id.first);
 }
 }
 LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
 return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
 bool status = true;
 auto it = ids_.find(ui_object);
 if (it != ids_.end()) {
 LOGE("Error: %p is already in = %d", it->first, it->second);
 LOGE("Overwriting %p with %p for it", it->first, ui_object);
 status = false;
 //return false; ---> let it fall through
 }
 ids_[ui_object] = cur_id_++;
 return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p!!!", ui_object);
 return false;
 }
 ids_.erase(it);
 return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
 for (auto id: ids_) {
 LOGI("Cached ID (%p = %d)", id.first, id.second);
 }
}

/*
 * Our global instance for id factory
 */
IdFactory JUIBase::id_factory_;

/*
 * JUIView
 */
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
 const JUIView *parameter) {
 AddRule(layoutParameterIndex, (int32_t) parameter);

 /*
 * perform pointer to id xlation
 */
 AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand Down

27 changes: 24 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
 const int32_t attribute_type;
};

/*
 * class IdFactory: cache UI pointers and generate an ID, send ID to Java side
 * when get id back from Java, retrieve the UI pointer for that
 * ID, and continue. Mainly purpose is for things to be called
 * back on UI thread
 */
class JUIBase;
class IdFactory {
 public:
 int32_t getId(const JUIBase* ui_object);
 JUIBase* getUIBase(int32_t ui_id);
 void debugDumpCurrentHashTable(void);
 bool insert(const JUIBase* ui_object);
 bool remove(const JUIBase* ui_object);

 private:
 std::unordered_map<const JUIBase*, int32_t> ids_;
 static int32_t cur_id_;
};

/*
 * Base class of JUIView
 */
class JUIBase {
public:
 JUIBase() : obj_(NULL) {}

 virtual ~JUIBase() {}
 JUIBase() : obj_(NULL) { id_factory_.insert(this); }
 virtual ~JUIBase() { id_factory_.remove(this); }

 /*
 * Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
 return true;
 }

 static IdFactory id_factory_;

protected:
 std::unordered_map<std::string, AttributeParameterStore>
 map_attribute_parameters;
Expand Down

10 changes: 6 additions & 4 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
 : activity_(NULL), suspended_(false), windowDestroyed_(false),
 jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
 JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
 views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
 env->DeleteGlobalRef(jni_helper_java_ref_);
 env->DeleteGlobalRef(jni_helper_java_class_);

 JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
 }
 }

 jobject obj =
 env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
 return NULL;
 }
 }

 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
 (int32_t) id, (int32_t) param);
 JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(objGlobal);
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
 int64_t pointer) {
 std::function<void()> *pCallback = (std::function<void()> *)pointer;
 (*pCallback)();
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
 int64_t pointer);
}

Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/res/values/strings.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
 <string name="app_name">TBMPSkeleton</string>
 <string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6
 Closed

ggfan
wants to merge
1
commit into

from

 Closed


add support for 64 bit platforms
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 9 additions & 0 deletions
samples-android/TbmpSkeletonNative/.classpath

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

1 change: 1 addition & 0 deletions
samples-android/TbmpSkeletonNative/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down

1 change: 0 additions & 1 deletion
samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

76 changes: 73 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
 JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
 int32_t param2) {
 JUIBase *p = (JUIBase *)id;
 /*
 * id from Java is generated toekn, which could be mapped into an UI pointer
 * id is opaque to Java, so Java receives and return back the same id to us
 */
 JUIBase *p = JUIBase::id_factory_.getUIBase(id);
 if( p )
 p->DispatchEvent(message, param1, param2);
 else {
 LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
 }
}
}

 p->DispatchEvent(message, param1, param2);
/*
 * IdFactory Implementation: our ID is just a simple integer starting from 1,and
 * keeps on counting up. There is no re-use -- even
 * one ID is removed from cache, we still counting up
 * It will take a long while to overflow a 32 bit integer
 * for UI ids. Even it does, it wrap back, at that time,
 * previous low values will long gone.
 */
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
 ids_[ui_object] = cur_id_++;
 return ids_[ui_object];
 }
 return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
 for (auto id: ids_) {
 if(id.second == ui_id) {
 return const_cast<JUIBase*>(id.first);
 }
 }
 LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
 return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
 bool status = true;
 auto it = ids_.find(ui_object);
 if (it != ids_.end()) {
 LOGE("Error: %p is already in = %d", it->first, it->second);
 LOGE("Overwriting %p with %p for it", it->first, ui_object);
 status = false;
 //return false; ---> let it fall through
 }
 ids_[ui_object] = cur_id_++;
 return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p!!!", ui_object);
 return false;
 }
 ids_.erase(it);
 return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
 for (auto id: ids_) {
 LOGI("Cached ID (%p = %d)", id.first, id.second);
 }
}

/*
 * Our global instance for id factory
 */
IdFactory JUIBase::id_factory_;

/*
 * JUIView
 */
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
 const JUIView *parameter) {
 AddRule(layoutParameterIndex, (int32_t) parameter);

 /*
 * perform pointer to id xlation
 */
 AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand Down

27 changes: 24 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
 const int32_t attribute_type;
};

/*
 * class IdFactory: cache UI pointers and generate an ID, send ID to Java side
 * when get id back from Java, retrieve the UI pointer for that
 * ID, and continue. Mainly purpose is for things to be called
 * back on UI thread
 */
class JUIBase;
class IdFactory {
 public:
 int32_t getId(const JUIBase* ui_object);
 JUIBase* getUIBase(int32_t ui_id);
 void debugDumpCurrentHashTable(void);
 bool insert(const JUIBase* ui_object);
 bool remove(const JUIBase* ui_object);

 private:
 std::unordered_map<const JUIBase*, int32_t> ids_;
 static int32_t cur_id_;
};

/*
 * Base class of JUIView
 */
class JUIBase {
public:
 JUIBase() : obj_(NULL) {}

 virtual ~JUIBase() {}
 JUIBase() : obj_(NULL) { id_factory_.insert(this); }
 virtual ~JUIBase() { id_factory_.remove(this); }

 /*
 * Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
 return true;
 }

 static IdFactory id_factory_;

protected:
 std::unordered_map<std::string, AttributeParameterStore>
 map_attribute_parameters;
Expand Down

10 changes: 6 additions & 4 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
 : activity_(NULL), suspended_(false), windowDestroyed_(false),
 jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
 JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
 views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
 env->DeleteGlobalRef(jni_helper_java_ref_);
 env->DeleteGlobalRef(jni_helper_java_class_);

 JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
 }
 }

 jobject obj =
 env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
 return NULL;
 }
 }

 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
 (int32_t) id, (int32_t) param);
 JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(objGlobal);
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
 int64_t pointer) {
 std::function<void()> *pCallback = (std::function<void()> *)pointer;
 (*pCallback)();
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
 int64_t pointer);
}

Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/res/values/strings.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
 <string name="app_name">TBMPSkeleton</string>
 <string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6
 Closed

ggfan
wants to merge
1
commit into

from

 Closed


add support for 64 bit platforms
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 9 additions & 0 deletions
samples-android/TbmpSkeletonNative/.classpath

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

1 change: 1 addition & 0 deletions
samples-android/TbmpSkeletonNative/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down

1 change: 0 additions & 1 deletion
samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

76 changes: 73 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
 JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
 int32_t param2) {
 JUIBase *p = (JUIBase *)id;
 /*
 * id from Java is generated toekn, which could be mapped into an UI pointer
 * id is opaque to Java, so Java receives and return back the same id to us
 */
 JUIBase *p = JUIBase::id_factory_.getUIBase(id);
 if( p )
 p->DispatchEvent(message, param1, param2);
 else {
 LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
 }
}
}

 p->DispatchEvent(message, param1, param2);
/*
 * IdFactory Implementation: our ID is just a simple integer starting from 1,and
 * keeps on counting up. There is no re-use -- even
 * one ID is removed from cache, we still counting up
 * It will take a long while to overflow a 32 bit integer
 * for UI ids. Even it does, it wrap back, at that time,
 * previous low values will long gone.
 */
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
 ids_[ui_object] = cur_id_++;
 return ids_[ui_object];
 }
 return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
 for (auto id: ids_) {
 if(id.second == ui_id) {
 return const_cast<JUIBase*>(id.first);
 }
 }
 LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
 return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
 bool status = true;
 auto it = ids_.find(ui_object);
 if (it != ids_.end()) {
 LOGE("Error: %p is already in = %d", it->first, it->second);
 LOGE("Overwriting %p with %p for it", it->first, ui_object);
 status = false;
 //return false; ---> let it fall through
 }
 ids_[ui_object] = cur_id_++;
 return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p!!!", ui_object);
 return false;
 }
 ids_.erase(it);
 return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
 for (auto id: ids_) {
 LOGI("Cached ID (%p = %d)", id.first, id.second);
 }
}

/*
 * Our global instance for id factory
 */
IdFactory JUIBase::id_factory_;

/*
 * JUIView
 */
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
 const JUIView *parameter) {
 AddRule(layoutParameterIndex, (int32_t) parameter);

 /*
 * perform pointer to id xlation
 */
 AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand Down

27 changes: 24 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
 const int32_t attribute_type;
};

/*
 * class IdFactory: cache UI pointers and generate an ID, send ID to Java side
 * when get id back from Java, retrieve the UI pointer for that
 * ID, and continue. Mainly purpose is for things to be called
 * back on UI thread
 */
class JUIBase;
class IdFactory {
 public:
 int32_t getId(const JUIBase* ui_object);
 JUIBase* getUIBase(int32_t ui_id);
 void debugDumpCurrentHashTable(void);
 bool insert(const JUIBase* ui_object);
 bool remove(const JUIBase* ui_object);

 private:
 std::unordered_map<const JUIBase*, int32_t> ids_;
 static int32_t cur_id_;
};

/*
 * Base class of JUIView
 */
class JUIBase {
public:
 JUIBase() : obj_(NULL) {}

 virtual ~JUIBase() {}
 JUIBase() : obj_(NULL) { id_factory_.insert(this); }
 virtual ~JUIBase() { id_factory_.remove(this); }

 /*
 * Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
 return true;
 }

 static IdFactory id_factory_;

protected:
 std::unordered_map<std::string, AttributeParameterStore>
 map_attribute_parameters;
Expand Down

10 changes: 6 additions & 4 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
 : activity_(NULL), suspended_(false), windowDestroyed_(false),
 jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
 JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
 views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
 env->DeleteGlobalRef(jni_helper_java_ref_);
 env->DeleteGlobalRef(jni_helper_java_class_);

 JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
 }
 }

 jobject obj =
 env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
 return NULL;
 }
 }

 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
 (int32_t) id, (int32_t) param);
 JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(objGlobal);
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
 int64_t pointer) {
 std::function<void()> *pCallback = (std::function<void()> *)pointer;
 (*pCallback)();
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
 int64_t pointer);
}

Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/res/values/strings.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
 <string name="app_name">TBMPSkeleton</string>
 <string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6
 Closed

ggfan
wants to merge
1
commit into

from

 Closed


add support for 64 bit platforms
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 9 additions & 0 deletions
samples-android/TbmpSkeletonNative/.classpath

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

1 change: 1 addition & 0 deletions
samples-android/TbmpSkeletonNative/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down

1 change: 0 additions & 1 deletion
samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

76 changes: 73 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
 JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
 int32_t param2) {
 JUIBase *p = (JUIBase *)id;
 /*
 * id from Java is generated toekn, which could be mapped into an UI pointer
 * id is opaque to Java, so Java receives and return back the same id to us
 */
 JUIBase *p = JUIBase::id_factory_.getUIBase(id);
 if( p )
 p->DispatchEvent(message, param1, param2);
 else {
 LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
 }
}
}

 p->DispatchEvent(message, param1, param2);
/*
 * IdFactory Implementation: our ID is just a simple integer starting from 1,and
 * keeps on counting up. There is no re-use -- even
 * one ID is removed from cache, we still counting up
 * It will take a long while to overflow a 32 bit integer
 * for UI ids. Even it does, it wrap back, at that time,
 * previous low values will long gone.
 */
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
 ids_[ui_object] = cur_id_++;
 return ids_[ui_object];
 }
 return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
 for (auto id: ids_) {
 if(id.second == ui_id) {
 return const_cast<JUIBase*>(id.first);
 }
 }
 LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
 return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
 bool status = true;
 auto it = ids_.find(ui_object);
 if (it != ids_.end()) {
 LOGE("Error: %p is already in = %d", it->first, it->second);
 LOGE("Overwriting %p with %p for it", it->first, ui_object);
 status = false;
 //return false; ---> let it fall through
 }
 ids_[ui_object] = cur_id_++;
 return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p!!!", ui_object);
 return false;
 }
 ids_.erase(it);
 return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
 for (auto id: ids_) {
 LOGI("Cached ID (%p = %d)", id.first, id.second);
 }
}

/*
 * Our global instance for id factory
 */
IdFactory JUIBase::id_factory_;

/*
 * JUIView
 */
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
 const JUIView *parameter) {
 AddRule(layoutParameterIndex, (int32_t) parameter);

 /*
 * perform pointer to id xlation
 */
 AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand Down

27 changes: 24 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
 const int32_t attribute_type;
};

/*
 * class IdFactory: cache UI pointers and generate an ID, send ID to Java side
 * when get id back from Java, retrieve the UI pointer for that
 * ID, and continue. Mainly purpose is for things to be called
 * back on UI thread
 */
class JUIBase;
class IdFactory {
 public:
 int32_t getId(const JUIBase* ui_object);
 JUIBase* getUIBase(int32_t ui_id);
 void debugDumpCurrentHashTable(void);
 bool insert(const JUIBase* ui_object);
 bool remove(const JUIBase* ui_object);

 private:
 std::unordered_map<const JUIBase*, int32_t> ids_;
 static int32_t cur_id_;
};

/*
 * Base class of JUIView
 */
class JUIBase {
public:
 JUIBase() : obj_(NULL) {}

 virtual ~JUIBase() {}
 JUIBase() : obj_(NULL) { id_factory_.insert(this); }
 virtual ~JUIBase() { id_factory_.remove(this); }

 /*
 * Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
 return true;
 }

 static IdFactory id_factory_;

protected:
 std::unordered_map<std::string, AttributeParameterStore>
 map_attribute_parameters;
Expand Down

10 changes: 6 additions & 4 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
 : activity_(NULL), suspended_(false), windowDestroyed_(false),
 jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
 JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
 views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
 env->DeleteGlobalRef(jni_helper_java_ref_);
 env->DeleteGlobalRef(jni_helper_java_class_);

 JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
 }
 }

 jobject obj =
 env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
 return NULL;
 }
 }

 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
 (int32_t) id, (int32_t) param);
 JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(objGlobal);
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
 int64_t pointer) {
 std::function<void()> *pCallback = (std::function<void()> *)pointer;
 (*pCallback)();
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
 int64_t pointer);
}

Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/res/values/strings.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
 <string name="app_name">TBMPSkeleton</string>
 <string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Apr 19, 2026. It is now read-only.

add support for 64 bit platforms#6
 Closed

ggfan
wants to merge
1
commit into

from

 Closed


add support for 64 bit platforms
#6
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 9 additions & 0 deletions
samples-android/TbmpSkeletonNative/.classpath

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

1 change: 1 addition & 0 deletions
samples-android/TbmpSkeletonNative/jni/Application.mk

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
APP_PLATFORM := android-11
APP_ABI := armeabi armeabi-v7a x86
#APP_ABI := all

APP_STL := c++_static

Expand Down

1 change: 0 additions & 1 deletion
samples-android/TbmpSkeletonNative/jni/TBMPSkeletonNativeActivity_Engine.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
 */
void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
 Engine *eng = (Engine *)app->userData;
 LOGI("message %d", cmd);
 switch (cmd) {
 case APP_CMD_SAVE_STATE:
 break;
Expand Down

76 changes: 73 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,12 +25,78 @@ extern "C" {
JNIEXPORT void Java_com_sample_helper_JUIHelper_JUICallbackHandler(
 JNIEnv *env, jobject thiz, int32_t id, int32_t message, int32_t param1,
 int32_t param2) {
 JUIBase *p = (JUIBase *)id;
 /*
 * id from Java is generated toekn, which could be mapped into an UI pointer
 * id is opaque to Java, so Java receives and return back the same id to us
 */
 JUIBase *p = JUIBase::id_factory_.getUIBase(id);
 if( p )
 p->DispatchEvent(message, param1, param2);
 else {
 LOGE("Failed to get JUIBase pointer for %d in %s", id, __FILE__);
 }
}
}

 p->DispatchEvent(message, param1, param2);
/*
 * IdFactory Implementation: our ID is just a simple integer starting from 1,and
 * keeps on counting up. There is no re-use -- even
 * one ID is removed from cache, we still counting up
 * It will take a long while to overflow a 32 bit integer
 * for UI ids. Even it does, it wrap back, at that time,
 * previous low values will long gone.
 */
int32_t IdFactory::cur_id_ = 1;
int32_t IdFactory::getId(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p, patching done (%d)", ui_object, cur_id_);
 ids_[ui_object] = cur_id_++;
 return ids_[ui_object];
 }
 return it->second;
}
JUIBase* IdFactory::getUIBase(int32_t ui_id) {
 for (auto id: ids_) {
 if(id.second == ui_id) {
 return const_cast<JUIBase*>(id.first);
 }
 }
 LOGE("Unable to find object point for ID(%d, %x)", ui_id, ui_id);
 return nullptr;
}
bool IdFactory::insert(const JUIBase* ui_object) {
 bool status = true;
 auto it = ids_.find(ui_object);
 if (it != ids_.end()) {
 LOGE("Error: %p is already in = %d", it->first, it->second);
 LOGE("Overwriting %p with %p for it", it->first, ui_object);
 status = false;
 //return false; ---> let it fall through
 }
 ids_[ui_object] = cur_id_++;
 return status;
}
bool IdFactory::remove(const JUIBase* ui_object) {
 auto it = ids_.find(ui_object);
 if (it == ids_.end()) {
 LOGE("IDs not inside hash for %p!!!", ui_object);
 return false;
 }
 ids_.erase(it);
 return true;
}
void IdFactory::debugDumpCurrentHashTable(void) {
 for (auto id: ids_) {
 LOGI("Cached ID (%p = %d)", id.first, id.second);
 }
}

/*
 * Our global instance for id factory
 */
IdFactory JUIBase::id_factory_;

/*
 * JUIView
 */
Expand DownExpand Up@@ -138,7 +204,11 @@ void JUIView::AddRule(const int32_t layoutParameterIndex,

void JUIView::AddRule(const int32_t layoutParameterIndex,
 const JUIView *parameter) {
 AddRule(layoutParameterIndex, (int32_t) parameter);

 /*
 * perform pointer to id xlation
 */
 AddRule(layoutParameterIndex, id_factory_.getId(parameter));
}

void JUIView::SetLayoutParams(const int32_t width, const int32_t height) {
Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Dialog.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ void JUIDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand DownExpand Up@@ -319,7 +319,7 @@ void JUIAlertDialog::CreateDialog() {

 //Notify 'id' to JNI side
 ndk_helper::JNIHelper::GetInstance()->CallVoidMethod(obj_, "setID", "(I)V",
(int32_t) this);
id_factory_.getId(this));
 env->DeleteLocalRef(obj);
}

Expand Down

27 changes: 24 additions & 3 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_View.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -203,14 +203,33 @@ struct AttributeType {
 const int32_t attribute_type;
};

/*
 * class IdFactory: cache UI pointers and generate an ID, send ID to Java side
 * when get id back from Java, retrieve the UI pointer for that
 * ID, and continue. Mainly purpose is for things to be called
 * back on UI thread
 */
class JUIBase;
class IdFactory {
 public:
 int32_t getId(const JUIBase* ui_object);
 JUIBase* getUIBase(int32_t ui_id);
 void debugDumpCurrentHashTable(void);
 bool insert(const JUIBase* ui_object);
 bool remove(const JUIBase* ui_object);

 private:
 std::unordered_map<const JUIBase*, int32_t> ids_;
 static int32_t cur_id_;
};

/*
 * Base class of JUIView
 */
class JUIBase {
public:
 JUIBase() : obj_(NULL) {}

 virtual ~JUIBase() {}
 JUIBase() : obj_(NULL) { id_factory_.insert(this); }
 virtual ~JUIBase() { id_factory_.remove(this); }

 /*
 * Dispatch Widget events. This one is called from Java code through
Expand DownExpand Up@@ -424,6 +443,8 @@ class JUIBase {
 return true;
 }

 static IdFactory id_factory_;

protected:
 std::unordered_map<std::string, AttributeParameterStore>
 map_attribute_parameters;
Expand Down

10 changes: 6 additions & 4 deletions
samples-android/TbmpSkeletonNative/jni/jui_helper/JavaUI_Window.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ namespace jui_helper {
JUIWindow::JUIWindow()
 : activity_(NULL), suspended_(false), windowDestroyed_(false),
 jni_helper_java_ref_(NULL), jni_helper_java_class_(NULL), dialog_(NULL) {
 JUIBase::id_factory_.insert(reinterpret_cast<const JUIBase*>(this));
 views_.clear();
}

Expand All@@ -34,6 +35,8 @@ JUIWindow::~JUIWindow() {
 env->DeleteGlobalRef(jni_helper_java_ref_);
 env->DeleteGlobalRef(jni_helper_java_class_);

 JUIBase::id_factory_.remove(reinterpret_cast<const JUIBase *>(this));

}

/*
Expand DownExpand Up@@ -251,8 +254,7 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id) {
 }
 }

 jobject obj =
 env->CallObjectMethod(jni_helper_java_ref_, mid, name, (int32_t) id);
 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name, JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)));
 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(obj);
Expand DownExpand Up@@ -283,9 +285,9 @@ jobject JUIWindow::CreateWidget(const char *strWidgetName, void *id,
 return NULL;
 }
 }

 jobject obj = env->CallObjectMethod(jni_helper_java_ref_, mid, name,
 (int32_t) id, (int32_t) param);
 JUIBase::id_factory_.getId(reinterpret_cast<const JUIBase*>(id)), (int32_t) param);

 jobject objGlobal = env->NewGlobalRef(obj);
 env->DeleteLocalRef(name);
 env->DeleteLocalRef(objGlobal);
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -596,7 +596,7 @@ void JNIHelper::RunOnUiThread(std::function<void()> callback) {
// This JNI function is invoked from UIThread asynchronously
extern "C" {
JNIEXPORT void
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env, jobject thiz,
 int64_t pointer) {
 std::function<void()> *pCallback = (std::function<void()> *)pointer;
 (*pCallback)();
Expand Down

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/jni/ndk_helper/JNIHelper.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,7 @@ class JNIHelper {

extern "C" {
JNIEXPORT void
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,
 Java_com_sample_helper_NDKHelper_RunOnUiThreadHandler(JNIEnv *env,jobject thiz,
 int64_t pointer);
}

Expand Down

4 changes: 2 additions & 2 deletions
samples-android/TbmpSkeletonNative/project.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=${gpg.lib}
target=Google Inc.:Google APIs:22
android.library.reference.1=../../../../eclipse-project/TbmpSkeletonNative/google-play-services_lib

2 changes: 1 addition & 1 deletion
samples-android/TbmpSkeletonNative/res/values/strings.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@
 <string name="app_name">TBMPSkeleton</string>
 <string name="app_id">REPLACE_WITH_YOUR_OWN_APPID</string>

</resources>
</resources>