You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/23 08:10:41 UTC
[13/18] incubator-weex git commit: Revert: * [android] modify
border-android.png
Revert: * [android] modify border-android.png
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bdcc5356
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bdcc5356
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bdcc5356
Branch: refs/heads/release-0.16
Commit: bdcc5356b3bdf8d5238296a4f8e1a68bdd598da2
Parents: 28dd9f3
Author: misakuo <mi...@apache.org>
Authored: Mon Oct 23 14:38:44 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Oct 23 14:38:44 2017 +0800
----------------------------------------------------------------------
.github/PULL_REQUEST_TEMPLATE.md | 4 +-
.travis.yml | 4 +
CONTRIBUTING.md | 22 +-
.../java/com/alibaba/weex/IndexActivity.java | 12 +
android/sdk/build.gradle | 1 -
android/sdk/libs/armeabi/libweexjsb.so | Bin 22620 -> 22620 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 335324 -> 338160 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes
android/sdk/libs/armeabi/libweexjst.so | Bin 22552 -> 0 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12126020 -> 12121924 bytes
.../main/java/com/taobao/weex/WXSDKEngine.java | 13 -
.../java/com/taobao/weex/bridge/WXBridge.java | 17 -
.../com/taobao/weex/bridge/WXBridgeManager.java | 1019 +++++++++---------
.../java/com/taobao/weex/common/Constants.java | 3 -
.../java/com/taobao/weex/common/IWXBridge.java | 9 -
.../java/com/taobao/weex/dom/WXDomObject.java | 4 +-
.../dom/action/AbstractAddElementAction.java | 4 +-
.../weex/dom/action/MoveElementAction.java | 3 -
.../ui/component/AbstractEditComponent.java | 8 -
.../taobao/weex/ui/component/WXComponent.java | 4 +-
.../weex/ui/component/WXComponentFactory.java | 2 +
.../com/taobao/weex/ui/component/WXImage.java | 10 -
.../taobao/weex/ui/component/WXScroller.java | 2 +-
.../com/taobao/weex/ui/component/WXSlider.java | 2 +-
.../weex/ui/component/WXSliderNeighbor.java | 2 +-
.../taobao/weex/ui/component/WXVContainer.java | 6 +-
.../ui/component/list/BasicListComponent.java | 116 +-
.../ui/component/list/StickyHeaderHelper.java | 43 +-
.../taobao/weex/ui/component/list/WXCell.java | 68 +-
.../list/template/WXRecyclerTemplateList.java | 4 +-
.../weex/ui/view/listview/WXRecyclerView.java | 24 +-
.../java/com/taobao/weex/utils/WXLogUtils.java | 30 +-
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 69 --
.../java/com/taobao/weex/utils/WXViewUtils.java | 25 +-
.../com/taobao/weex/utils/WXLogUtilsTest.java | 16 +-
.../java/com/taobao/weex/utils/WXUtilsTest.java | 3 +-
.../taobao/weex/bridge/WXWebsocketBridge.java | 15 -
dangerfile.js | 47 +-
doc/source/cn/guide/contributing.md | 27 +-
doc/source/guide/contributing.md | 26 +-
doc/source/references/platform-difference.md | 11 -
doc/source/references/platfrom-difference.md | 11 +
.../references/vue/difference-with-web.md | 2 +-
doc/themes/weex/layout/_partial/article.ejs | 2 -
doc/themes/weex/layout/index.ejs | 3 -
doc/themes/weex/layout/layout.ejs | 2 +
doc/themes/weex/source/css/common.scss | 4 +-
doc/themes/weex/source/css/partial/header.scss | 2 +-
doc/themes/weex/source/css/post.scss | 7 +-
doc/themes/weex/source/css/variable.scss | 2 +-
html5/runtime/api/WeexInstance.js | 126 ---
html5/runtime/api/component.js | 51 -
html5/runtime/api/init.js | 107 +-
html5/runtime/api/module.js | 56 -
html5/runtime/vdom/Element.js | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 12 -
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 13 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 16 +-
.../Sources/Component/WXCycleSliderComponent.m | 2 +-
.../Sources/Component/WXScrollerComponent.m | 31 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 3 -
.../Sources/Display/WXComponent+BoxShadow.m | 9 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 5 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 6 -
.../WeexSDK/Sources/Monitor/WXExceptionUtils.h | 29 -
.../WeexSDK/Sources/Monitor/WXExceptionUtils.m | 57 -
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 -
pre-build/native-bundle-main.js | 16 +-
test/screenshot/border-android.png | Bin 164417 -> 0 bytes
test/screenshot/border-ios.png | Bin 129071 -> 128088 bytes
70 files changed, 758 insertions(+), 1494 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/.github/PULL_REQUEST_TEMPLATE.md
----------------------------------------------------------------------
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fea8dd9..0a6fb20 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -48,13 +48,13 @@ Thank you for your support.
<!--
（请在***提交***前删除这段描述）
-It's ***RECOMMENDED*** to submit typo fix, new demo, tiny bugfix and large feature to `master` branch.
+It's ***RECOMMENDED*** to submit typo fix, new demo and tiny bugfix to `master` branch. New feature and other modifications can be submitted to "domain" branch including `ios`, `android`, `jsfm`, `html5`.
See [Branch Strategy](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management) for more detail.
----
-错别字修改、新 demo、较小的 bugfix、甚至较大的功能都可以直接提到 `master` 分支；
+错别字修改、新 demo、较小的 bugfix 都可以直接提到 `master` 分支；新需求以及任何你不确定影响面的改动，请提交到对应“领域”的分支（`ios`、`android`、`jsfm`、`html5`）。
查看完整的[分支策略 (英文)](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management)。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 95624a6..a7bca6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,10 @@ matrix:
- os: linux
env: TEST_SUITE=android
include:
+ - os: osx
+ env: TEST_SUITE=ios
+ osx_image: xcode8.1
+ language: objective-c
- os: linux
env: TEST_SUITE=android
jdk: oraclejdk8
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e18f8de..e30a65c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,21 +19,21 @@ Besides Weex dev mailing list, we also have some other mailing lists for you. Yo
```
release
↑
-{version}
- ↑
-master <--- PR(feature/hotfix/typo)
+master <--- PR(hotfix/typo/3rd-PR)
+ ↑ PR
+{domain}-feature-{point}
```
-0. `master` branch
- 0. `master` is the stable developing branch.
- 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `master `***.
-0. `{version}` branch
- 0. `{version}` is used for every version which we consider for stable publish.
- 0. e.g. `v0.16`
0. `release` branch
- 0. `release` is the latest release branch,we will make tag and publish version on this branch.
+ 0. `release ` is the latest release branch.
+0. `master ` branch
+ 0. `master ` is the stable developing branch.
+ 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `master `***.
+0. `{domain}-feature-{point}` branch
+ 0. The branch for a developing iteration, e.g. `android-feature-list-update` is an android developing iteration which is for list update. `{domain}` consists of `android`, `ios`, `jsfm` and `html5`.
+ 0. **DO NOT commit any PR to such a branch**.
-### Branch Name For PR
+### Branch Name
```
{module}-{action}-{shortName}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
----------------------------------------------------------------------
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java b/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
index 0603363..866733a 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/IndexActivity.java
@@ -103,6 +103,18 @@ public class IndexActivity extends AbstractWeexActivity {
};
LocalBroadcastManager.getInstance(this).registerReceiver(mReloadReceiver, new IntentFilter(WXSDKEngine.JS_FRAMEWORK_RELOAD));
+
+ requestWeexPermission();
+ }
+
+ private void requestWeexPermission() {
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+ Toast.makeText(this, "please give me the permission", Toast.LENGTH_SHORT).show();
+ } else {
+ ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, WRITE_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
+ }
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/build.gradle
----------------------------------------------------------------------
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index a49a05f..0be69fb 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -127,7 +127,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_7
}
testOptions {
- unitTests.returnDefaultValues = true
unitTests.all {
maxHeapSize = "1024m"
jvmArgs += ['-XX:-UseSplitVerifier', '-noverify','-Xverify:none']/* fix VerifyError */
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/libs/armeabi/libweexjsb.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsb.so b/android/sdk/libs/armeabi/libweexjsb.so
index cb739b4..4b13b06 100755
Binary files a/android/sdk/libs/armeabi/libweexjsb.so and b/android/sdk/libs/armeabi/libweexjsb.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index 7a9d85b..12f6df2 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/libs/armeabi/libweexjss.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjss.so b/android/sdk/libs/armeabi/libweexjss.so
index 3efefa5..0187882 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and b/android/sdk/libs/armeabi/libweexjss.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/libs/armeabi/libweexjst.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjst.so b/android/sdk/libs/armeabi/libweexjst.so
deleted file mode 100755
index 099256c..0000000
Binary files a/android/sdk/libs/armeabi/libweexjst.so and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/libs/x86/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexjsc.so b/android/sdk/libs/x86/libweexjsc.so
index 3698a49..ab27aa9 100755
Binary files a/android/sdk/libs/x86/libweexjsc.so and b/android/sdk/libs/x86/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index 3ea86e2..3a287cc 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -93,7 +93,6 @@ import com.taobao.weex.ui.module.WXMetaModule;
import com.taobao.weex.ui.module.WXModalUIModule;
import com.taobao.weex.ui.module.WXTimerModule;
import com.taobao.weex.ui.module.WXWebViewModule;
-import com.taobao.weex.utils.LogLevel;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXSoInstallMgrSdk;
import com.taobao.weex.utils.batch.BatchOperationHelper;
@@ -159,15 +158,6 @@ public class WXSDKEngine {
}
long start = System.currentTimeMillis();
WXEnvironment.sSDKInitStart = start;
- if(WXEnvironment.isApkDebugable()){
- WXEnvironment.sLogLevel = LogLevel.DEBUG;
- }else{
- if(WXEnvironment.sApplication != null){
- WXEnvironment.sLogLevel = LogLevel.WARN;
- }else {
- WXLogUtils.e(TAG,"WXEnvironment.sApplication is " + WXEnvironment.sApplication);
- }
- }
doInitInternal(application,config);
WXEnvironment.sSDKInitInvokeTime = System.currentTimeMillis()-start;
WXLogUtils.renderPerformanceLog("SDKInitInvokeTime", WXEnvironment.sSDKInitInvokeTime);
@@ -177,9 +167,6 @@ public class WXSDKEngine {
private static void doInitInternal(final Application application,final InitConfig config){
WXEnvironment.sApplication = application;
- if(application == null){
- WXLogUtils.e(TAG, " doInitInternal application is null");
- }
WXEnvironment.JsFrameworkInit = false;
WXBridgeManager.getInstance().post(new Runnable() {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdcc5356/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
index 9586f2a..9d88fc2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java
@@ -36,8 +36,6 @@ class WXBridge implements IWXBridge {
public static final String TAG = "WXBridge";
- public static final boolean MULTIPROCESS = true;
-
/**
* Init JSFrameWork
*
@@ -45,13 +43,6 @@ class WXBridge implements IWXBridge {
*/
public native int initFramework(String framework, WXParams params);
- /**
- * Init JSFrameWork
- *
- * @param framework assets/main.js
- */
- public native int initFramework(String framework, WXParams params, String cacheDir, boolean pieSupport);
-
/**
* Execute JavaScript function
@@ -77,14 +68,6 @@ class WXBridge implements IWXBridge {
*/
public native void takeHeapSnapshot(String filename);
-
- public int initFrameworkEnv(String framework, WXParams params, String cacheDir, boolean pieSupport){
- if (MULTIPROCESS) {
- return initFramework(framework, params, cacheDir, pieSupport);
- } else {
- return initFramework(framework, params);
- }
- }
/**
* JavaScript uses this methods to call Android code
*