You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/12/06 03:12:11 UTC
[incubator-weex] branch master updated: * [Android&iOS] Fix some
typos (#1614)
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new f30c217 * [Android&iOS] Fix some typos (#1614)
f30c217 is described below
commit f30c2171514487046a82b4574ab8394194125d3d
Author: Eduardo Cáceres <ed...@users.noreply.github.com>
AuthorDate: Thu Dec 6 03:12:05 2018 +0000
* [Android&iOS] Fix some typos (#1614)
* Fix typo: exsists
---
android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java | 2 +-
android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java | 4 ++--
ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h | 2 +-
weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp | 2 +-
weex_core/Source/android/utils/so_utils.cpp | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index b46f020..4f8d78d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -465,7 +465,7 @@ public class WXEnvironment {
WXLogUtils.e(libName + "'s Path is" + soPath);
return soFile.getAbsolutePath();
} else {
- WXLogUtils.e(libName + "'s Path is " + soPath + " but file is not exist");
+ WXLogUtils.e(libName + "'s Path is " + soPath + " but file does not exist");
}
}
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 20f2b0d..8842bc3 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1324,7 +1324,7 @@ public class WXBridgeManager implements Callback, BactchExecutor {
final Map<String, Object> options, final String data) {
final WXSDKInstance instance = WXSDKManager.getInstance().getSDKInstance(instanceId);
if (instance == null) {
- WXLogUtils.e("WXBridgeManager", "createInstance failed, SDKInstance is not exist");
+ WXLogUtils.e("WXBridgeManager", "createInstance failed, SDKInstance does not exist");
return;
}
if (TextUtils.isEmpty(instanceId) || template == null || template.isEmpty() || mJSHandler == null) {
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
index ff2d6fc..1585de1 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
@@ -158,7 +158,7 @@ public enum WXErrorCode {
/**
* Single progress init error
*/
- WX_ERR_SINGLE_PROCESS_DLOPEN_FILE_NOT_EXIST("-1004", "so file is not exist",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
+ WX_ERR_SINGLE_PROCESS_DLOPEN_FILE_NOT_EXIST("-1004", "so file does not exist",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
WX_ERR_SINGLE_PROCESS_DLOPEN_FLAIED("-1005", "dlopen so file failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
@@ -170,7 +170,7 @@ public enum WXErrorCode {
WX_JS_FRAMEWORK_REINIT_MULPROCESS_FAILED("-1009", "js framework reinit multiProcess failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
- WX_JS_FRAMEWORK_INIT_FAILED("-1010", "js framework init failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
+ WX_JS_FRAMEWORK_INIT_FAILED("-1010", "js framework init failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
WX_JS_FRAMEWORK_INIT_SINGLE_PROCESS_SUCCESS("-1011", "js framework init success in single process",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
diff --git a/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h b/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h
index 45aa826..d6210f4 100644
--- a/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h
+++ b/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h
@@ -22,7 +22,7 @@
/**
get config from config center handler
@param key the key for config
- @param defaultValue default value for key if the key is not exist.
+ @param defaultValue default value for key if the key does not exist.
@param isDefault whether the value is default value
@return the value for config key
*/
diff --git a/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp b/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp
index f7cbd80..629c329 100644
--- a/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp
+++ b/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp
@@ -494,7 +494,7 @@ void doExec(int fdClient, int fdServer, bool traceEnable, bool startupPie) {
int result = access(executableName.c_str(), 01);
#if PRINT_LOG_CACHEFILE
- mcfile << "jsengine WeexJSConnection::doExec file exsist result:"
+ mcfile << "jsengine WeexJSConnection::doExec file exist result:"
<< result << " startupPie:" << startupPie << std::endl;
#endif
if (result == -1) {
diff --git a/weex_core/Source/android/utils/so_utils.cpp b/weex_core/Source/android/utils/so_utils.cpp
index 02d6f5d..b5379dc 100644
--- a/weex_core/Source/android/utils/so_utils.cpp
+++ b/weex_core/Source/android/utils/so_utils.cpp
@@ -178,7 +178,7 @@ namespace WeexCore {
return soPath;
} else {
const char *error = soPath.c_str();
- LOGE("so path: %s is not exsist, use full package lib", error);
+ LOGE("so path: %s does not exist, use full package lib", error);
// executablePath = s_cacheDir;
executablePath = SoUtils::cache_dir();
std::string lib = "/cache";
@@ -188,7 +188,7 @@ namespace WeexCore {
soPath = executablePath + "/" + SoUtils::jss_so_name();
// soPath = executablePath + "/" + g_jssSoName;
if (access(soPath.c_str(), 00) != 0) {
- LOGE("so path: %s is not exsist", soPath.c_str());
+ LOGE("so path: %s does not exist", soPath.c_str());
g_exception_handler("-1004", error);
//return false;
//use libweexjss.so directly