Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Commit

Permalink
[core][Android] replace StringCache with JNIEnv::NewStringUTF (#1549)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yxping @YorkShen
yxping authored and YorkShen committed Sep 20, 2018
1 parent 339b3f9 commit 6879915
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 60 deletions.
116 changes: 58 additions & 58 deletions weex_core/Source/android/wrap/wx_bridge.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,62 +574,62 @@ bool WXBridge::RegisterJNIUtils(JNIEnv* env) {

base::android::ScopedLocalJavaRef<jobject> WXBridge::GetMeasureFunc(
JNIEnv* env, const char* page_id, jlong render_object_ptr) {
jstring jni_page_id = getKeyFromCache(env, page_id);
return Java_WXBridge_getMeasurementFunc(env, jni_object(), jni_page_id,
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
return Java_WXBridge_getMeasurementFunc(env, jni_object(), jni_page_id.Get(),
render_object_ptr);
}

int WXBridge::HasTransitionPros(
JNIEnv* env, const char* page_id, const char* ref,
const std::vector<std::pair<std::string, std::string>>& styles) {
jstring jni_page_id = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

auto styles_map = std::unique_ptr<WXMap>(new WXMap);
if (!styles.empty()) {
styles_map->Put(env, styles);
}

return Java_WXBridge_callHasTransitionPros(env, jni_object(), jni_page_id,
jni_ref, styles_map->jni_object());
return Java_WXBridge_callHasTransitionPros(env, jni_object(), jni_page_id.Get(),
jni_ref.Get(), styles_map->jni_object());
}

int WXBridge::AppendTreeCreateFinish(JNIEnv* env, const char* page_id,
const char* ref) {
jstring jni_page_id = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));
return Java_WXBridge_callAppendTreeCreateFinish(env, jni_object(),
jni_page_id, jni_ref);
jni_page_id.Get(), jni_ref.Get());
}

int WXBridge::MoveElement(JNIEnv* env, const char* page_id, const char* ref,
const char* parent_ref, int index) {
jstring jni_page_id = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
jstring jni_parent_ref = getKeyFromCache(env, parent_ref);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));
auto jni_parent_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(parent_ref));

return Java_WXBridge_callMoveElement(env, jni_object(), jni_page_id, jni_ref,
jni_parent_ref, index);
return Java_WXBridge_callMoveElement(env, jni_object(), jni_page_id.Get(), jni_ref.Get(),
jni_parent_ref.Get(), index);
}

int WXBridge::RemoveElement(JNIEnv* env, const char* page_id, const char* ref) {
jstring jni_page_id = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

return Java_WXBridge_callRemoveElement(env, jni_object(), jni_page_id,
jni_ref);
return Java_WXBridge_callRemoveElement(env, jni_object(), jni_page_id.Get(),
jni_ref.Get());
}

int WXBridge::CreateFinish(JNIEnv* env, const char* page_id) {
jstring jni_page_id = getKeyFromCache(env, page_id);
return Java_WXBridge_callCreateFinish(env, jni_object(), jni_page_id);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
return Java_WXBridge_callCreateFinish(env, jni_object(), jni_page_id.Get());
}

int WXBridge::UpdateAttr(
JNIEnv* env, const char* page_id, const char* ref,
std::vector<std::pair<std::string, std::string>>* attrs) {
jstring jni_page_id = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

auto attributes_map = std::unique_ptr<WXMap>();
if (attrs != nullptr) {
Expand All @@ -639,7 +639,7 @@ int WXBridge::UpdateAttr(

jobject jni_attributes =
attributes_map.get() != nullptr ? attributes_map->jni_object() : nullptr;
return Java_WXBridge_callUpdateAttrs(env, jni_object(), jni_page_id, jni_ref,
return Java_WXBridge_callUpdateAttrs(env, jni_object(), jni_page_id.Get(), jni_ref.Get(),
jni_attributes);
}

Expand All @@ -649,8 +649,8 @@ int WXBridge::UpdateStyle(
std::vector<std::pair<std::string, std::string>>* margin,
std::vector<std::pair<std::string, std::string>>* padding,
std::vector<std::pair<std::string, std::string>>* border) {
jstring jni_page_id = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

auto styles_map = std::unique_ptr<WXMap>();
if (style != nullptr) {
Expand Down Expand Up @@ -682,18 +682,18 @@ int WXBridge::UpdateStyle(
jobject jni_borders =
borders_map.get() != nullptr ? borders_map->jni_object() : nullptr;

return Java_WXBridge_callUpdateStyle(env, jni_object(), jni_page_id, jni_ref,
return Java_WXBridge_callUpdateStyle(env, jni_object(), jni_page_id.Get(), jni_ref.Get(),
jni_styles, jni_margins, jni_paddings,
jni_borders);
}

int WXBridge::Layout(JNIEnv* env, const char* page_id, const char* ref, int top,
int bottom, int left, int right, int height, int width,
int index) {
jstring jPageId = getKeyFromCache(env, page_id);
jstring jRef = getKeyFromCache(env, ref);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jRef = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

return Java_WXBridge_callLayout(env, jni_object(), jPageId, jRef, top, bottom,
return Java_WXBridge_callLayout(env, jni_object(), jPageId.Get(), jRef.Get(), top, bottom,
left, right, height, width, index);
}

Expand All @@ -706,9 +706,9 @@ int WXBridge::AddElement(JNIEnv* env, const char* page_id,
const WXCoreMargin& margins,
const WXCorePadding& paddings,
const WXCoreBorderWidth& borders, bool willLayout) {
jstring jni_page_id = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
jstring jni_parent_ref = getKeyFromCache(env, parentRef);
auto jni_page_id = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));
auto jni_parent_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(parentRef));

auto styles_map = std::unique_ptr<WXMap>(new WXMap);
styles_map->Put(env, *styles);
Expand Down Expand Up @@ -758,8 +758,8 @@ int WXBridge::AddElement(JNIEnv* env, const char* page_id,
}

return Java_WXBridge_callAddElement(
env, jni_object(), jni_page_id, jni_component_type, jni_ref, index,
jni_parent_ref, styles_map->jni_object(), attributes_map->jni_object(),
env, jni_object(), jni_page_id.Get(), jni_component_type, jni_ref.Get(), index,
jni_parent_ref.Get(), styles_map->jni_object(), attributes_map->jni_object(),
events_set->jni_object(), jni_margins.Get(), jni_paddings.Get(),
jni_borders.Get(), willLayout);
}
Expand All @@ -772,8 +772,8 @@ int WXBridge::CreateBody(JNIEnv* env, const char* page_id,
const WXCoreMargin& margins,
const WXCorePadding& paddings,
const WXCoreBorderWidth& borders) {
jstring jni_pageId = getKeyFromCache(env, page_id);
jstring jni_ref = getKeyFromCache(env, ref);
auto jni_pageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jni_ref = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

auto styles_map = std::unique_ptr<WXMap>(new WXMap);
styles_map->Put(env, *styles);
Expand Down Expand Up @@ -823,7 +823,7 @@ int WXBridge::CreateBody(JNIEnv* env, const char* page_id,
}

int flag = Java_WXBridge_callCreateBody(
env, jni_object(), jni_pageId, jni_component_type, jni_ref,
env, jni_object(), jni_pageId.Get(), jni_component_type, jni_ref.Get(),
styles_map->jni_object(), attributes_map->jni_object(),
events_set->jni_object(), jni_margins.Get(), jni_paddings.Get(),
jni_borders.Get());
Expand All @@ -832,24 +832,24 @@ int WXBridge::CreateBody(JNIEnv* env, const char* page_id,

int WXBridge::RemoveEvent(JNIEnv* env, const char* page_id, const char* ref,
const char* event) {
jstring jPageId = getKeyFromCache(env, page_id);
jstring jRef = getKeyFromCache(env, ref);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jRef = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

auto jEventId =
base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(event));

return Java_WXBridge_callRemoveEvent(env, jni_object(), jPageId, jRef,
return Java_WXBridge_callRemoveEvent(env, jni_object(), jPageId.Get(), jRef.Get(),
jEventId.Get());
}

int WXBridge::AddEvent(JNIEnv* env, const char* page_id, const char* ref,
const char* event) {
jstring jPageId = getKeyFromCache(env, page_id);
jstring jRef = getKeyFromCache(env, ref);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jRef = base::android::ScopedLocalJavaRef<jstring >(env, env->NewStringUTF(ref));

auto jEventId =
base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(event));
return Java_WXBridge_callAddEvent(env, jni_object(), jPageId, jRef,
return Java_WXBridge_callAddEvent(env, jni_object(), jPageId.Get(), jRef.Get(),
jEventId.Get());
}

Expand All @@ -859,14 +859,14 @@ int WXBridge::RefreshFinish(JNIEnv* env, const char* page_id, const char* task,
env, newJByteArray(env, task));
auto jCallback = base::android::ScopedLocalJavaRef<jstring>(
env, env->NewStringUTF(callback));
jstring jPageId = getKeyFromCache(env, page_id);
return Java_WXBridge_callRefreshFinish(env, jni_object(), jPageId,
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
return Java_WXBridge_callRefreshFinish(env, jni_object(), jPageId.Get(),
jTask.Get(), jCallback.Get());
}

int WXBridge::RenderSuccess(JNIEnv* env, const char* page_id) {
jstring jPageId = getKeyFromCache(env, page_id);
return Java_WXBridge_callRenderSuccess(env, jni_object(), jPageId);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
return Java_WXBridge_callRenderSuccess(env, jni_object(), jPageId.Get());
}

int WXBridge::UpdateFinish(JNIEnv* env, const char* page_id, const char* task,
Expand All @@ -875,9 +875,9 @@ int WXBridge::UpdateFinish(JNIEnv* env, const char* page_id, const char* task,
env, newJByteArray(env, task));
auto jCallback = base::android::ScopedLocalJavaRef<jstring>(
env, env->NewStringUTF(callback));
jstring jPageId = getKeyFromCache(env, page_id);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));

return Java_WXBridge_callUpdateFinish(env, jni_object(), jPageId, jTask.Get(),
return Java_WXBridge_callUpdateFinish(env, jni_object(), jPageId.Get(), jTask.Get(),
jCallback.Get());
}

Expand All @@ -902,11 +902,11 @@ void WXBridge::CallNativeComponent(JNIEnv* env, const char* page_id,
env, newJByteArray(env, arguments, arguments_length));
auto jOptString = base::android::ScopedLocalJavaRef<jbyteArray>(
env, newJByteArray(env, options, options_length));
jstring jPageId = getKeyFromCache(env, page_id);
jstring jRef = getKeyFromCache(env, ref);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));
auto jRef = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(ref));

if (!jMethod.IsNull()) {
Java_WXBridge_callNativeComponent(env, jni_object(), jPageId, jRef,
Java_WXBridge_callNativeComponent(env, jni_object(), jPageId.Get(), jRef.Get(),
jMethod.Get(), jArgString.Get(),
jOptString.Get());
}
Expand All @@ -924,10 +924,10 @@ base::android::ScopedLocalJavaRef<jobject> WXBridge::CallNativeModule(
env, newJByteArray(env, arguments, arguments_length));
auto jOptString = base::android::ScopedLocalJavaRef<jbyteArray>(
env, newJByteArray(env, options, options_length));
jstring jPageId = getKeyFromCache(env, page_id);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));

if (!jModule.IsNull() && !jMethod.IsNull()) {
return Java_WXBridge_callNativeModule(env, jni_object(), jPageId,
return Java_WXBridge_callNativeModule(env, jni_object(), jPageId.Get(),
jModule.Get(), jMethod.Get(),
jArgString.Get(), jOptString.Get());
}
Expand All @@ -940,10 +940,10 @@ int WXBridge::CallNative(JNIEnv* env, const char* page_id, const char* task,
env, newJByteArray(env, task));
auto jCallback = base::android::ScopedLocalJavaRef<jstring>(
env, env->NewStringUTF(callback));
jstring jPageId = getKeyFromCache(env, page_id);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));

if (!jTask.IsNull()) {
return Java_WXBridge_callNative(env, jni_object(), jPageId, jTask.Get(),
return Java_WXBridge_callNative(env, jni_object(), jPageId.Get(), jTask.Get(),
jCallback.Get());
}
return -1;
Expand All @@ -955,9 +955,9 @@ void WXBridge::ReportException(JNIEnv* env, const char* page_id,
base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(func));
auto jExceptionString = base::android::ScopedLocalJavaRef<jstring>(
env, env->NewStringUTF(exception_string));
jstring jPageId = getKeyFromCache(env, page_id);
auto jPageId = base::android::ScopedLocalJavaRef<jstring>(env, env->NewStringUTF(page_id));

Java_WXBridge_reportJSException(env, jni_object(), jPageId, jFunc.Get(),
Java_WXBridge_reportJSException(env, jni_object(), jPageId.Get(), jFunc.Get(),
jExceptionString.Get());
}

Expand Down
6 changes: 4 additions & 2 deletions weex_core/Source/android/wrap/wx_map.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@ void WXMap::Put(
jbyteArray jni_value;

for (int i = 0; i < vector.size(); ++i) {
jni_key = getKeyFromCache(env, vector[i].first.c_str());
jni_key = env->NewStringUTF(vector[i].first.c_str());
jni_value = newJByteArray(env, vector[i].second.c_str());
Java_WXMap_put(env, jni_object(), jni_key, jni_value);
env->DeleteLocalRef(jni_value);
env->DeleteLocalRef(jni_key);
}
}

Expand All @@ -83,10 +84,11 @@ void WXMap::Put(JNIEnv* env, const std::map<std::string, std::string>& map) {
jbyteArray jni_value;

for (; it != end; ++it) {
jni_key = getKeyFromCache(env, it->first.c_str());
jni_key = env->NewStringUTF(it->first.c_str());
jni_value = newJByteArray(env, it->second.c_str());
Java_WXMap_put(env, jni_object(), jni_key, jni_value);
env->DeleteLocalRef(jni_value);
env->DeleteLocalRef(jni_key);
}
}
} // namespace WeexCore

0 comments on commit 6879915

Please sign in to comment.