incubator-weex git commit: *[android] weekly release 0.18.0-beta-3
Repository: incubator-weex
Updated Branches:
refs/heads/master 069fea2a1 -> 28d776877
*[android] weekly release 0.18.0-beta-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/28d77687
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/28d77687
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/28d77687
Branch: refs/heads/master
Commit: 28d776877362b951a1337335d20d5e7f88cb5c46
Parents: 069fea2
Author: misakuo
Authored: Fri Mar 30 11:35:30 2018 +0800
Committer: misakuo
Committed: Fri Mar 30 11:35:30 2018 +0800
--
android/playground/app/build.gradle | 4 ++--
android/sdk/build.gradle| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28d77687/android/playground/app/build.gradle
--
diff --git a/android/playground/app/build.gradle
b/android/playground/app/build.gradle
index bae43ca..422dd25 100755
--- a/android/playground/app/build.gradle
+++ b/android/playground/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.alibaba.weex"
minSdkVersion project.appMinSdkVersion
targetSdkVersion project.targetSdkVersion
-versionCode 16
-versionName "0.18.0-beta-2"
+versionCode 17
+versionName "0.18.0-beta-3"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
ndk{
abiFilters "x86"
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28d77687/android/sdk/build.gradle
--
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index ecb40c2..7e05943 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -40,7 +40,7 @@ checkstyle {
toolVersion = '6.9'
}
-version = "0.18.0-beta-2"
+version = "0.18.0-beta-3"
android {
compileSdkVersion project.compileSdkVersion
[GitHub] incubator-weex issue #1095: [WEEX-270][iOS]WXListComponent should add reload...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1095 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex pull request #1095: [WEEX-270][iOS]WXListComponent should add...
GitHub user bbmjja8123 opened a pull request: https://github.com/apache/incubator-weex/pull/1095 [WEEX-270][iOS]WXListComponent should add reload type of data update Currently WXListComponent data update only supports insertRows. This can't be satisfied under some drop-down loading scenes. For example, the pulldown load needs to be positioned to the original position. When the tableView is still decaling and inserts and tries to fix the position, the cell will blink. Because when deceiring, the externally modified contentOffset will be re-edited by the internal implementation of tableView, altering contentOffset alternately will cause flicker problems. If you use the tableView reloadData this is not a problem, so you need to support the WXListComponent in the drop-down restore location scene to add the reload attribute. featï¼270 First of all, thank you for your contribution! Please makes sure that these checkboxes are checked before submitting your PR, thank you! CheckList: **if** *isBugFix* **:** * [ ] Make sure that you add at least one unit test for the bug which you had fixed. **elif** *isNewFeature* **:** * [ ] Update API docs for the component. * [ ] Update/Add demo to demonstrate new feature. * [ ] Update test scripts for the feature. * [ ] Add unit tests for the feature. You can merge this pull request into a Git repository by running: $ git pull https://github.com/bbmjja8123/incubator-weex im_drop_down Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1095.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1095 commit 9f75e24ef14810d5a0fa47b8c10fe7018b35ffc5 Author: jianjun.mjj Date: 2018-03-30T01:55:52Z [WEEX-270][iOS]WXListComponent should add reload type of data update Currently WXListComponent data update only supports insertRows. This can't be satisfied under some drop-down loading scenes. For example, the pulldown load needs to be positioned to the original position. When the tableView is still decaling and inserts and tries to fix the position, the cell will blink. Because when deceiring, the externally modified contentOffset will be re-edited by the internal implementation of tableView, altering contentOffset alternately will cause flicker problems. If you use the tableView reloadData this is not a problem, so you need to support the WXListComponent in the drop-down restore location scene to add the reload attribute. featï¼270 ---
[GitHub] incubator-weex pull request #1092: [Android] rm useless code
Github user lucky-chen closed the pull request at: https://github.com/apache/incubator-weex/pull/1092 ---
[GitHub] incubator-weex pull request #1072: [WEEX-249][iOS]fix WXRuleManager multi-th...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/1072 ---
incubator-weex git commit: [WEEX-249][iOS]fix WXRuleManager multi-thread crash
Repository: incubator-weex
Updated Branches:
refs/heads/master 0bc243d95 -> 069fea2a1
[WEEX-249][iOS]fix WXRuleManager multi-thread crash
[WEEX-249][iOS]fix WXRuleManager multi-thread crash
close #1072
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/069fea2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/069fea2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/069fea2a
Branch: refs/heads/master
Commit: 069fea2a178f63cbdf2503fb3260d2a8522d641c
Parents: 0bc243d
Author: xuyouyang
Authored: Thu Mar 15 13:37:27 2018 +0800
Committer: acton393
Committed: Thu Mar 29 19:34:27 2018 +0800
--
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/069fea2a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
b/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
index 5125194..b72d11b 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m
@@ -83,13 +83,13 @@ static WXRuleManager *_sharedInstance = nil;
}
fontSrc = newURL;
-NSMutableDictionary * fontFamily = [self.fontStorage
objectForKey:rule[@"fontFamily"]];
+WXThreadSafeMutableDictionary * fontFamily = [self.fontStorage
objectForKey:rule[@"fontFamily"]];
if (fontFamily && [fontFamily[@"tempSrc"]
isEqualToString:fontSrc]) {
// if the new src is same as src in dictionary , ignore it, or
update it
return;
}
if (!fontFamily) {
-fontFamily = [NSMutableDictionary dictionary];
+fontFamily = [[WXThreadSafeMutableDictionary alloc] init];
}
NSURL *fontURL = [NSURL URLWithString:fontSrc];
if (!fontURL) {
@@ -114,7 +114,7 @@ static WXRuleManager *_sharedInstance = nil;
[WXUtility getIconfont:fontURL completion:^(NSURL * _Nonnull url,
NSError * _Nullable error) {
if (!error && url) {
// load success
-NSMutableDictionary * dictForFontFamily =
[weakSelf.fontStorage objectForKey:rule[@"fontFamily"]];
+WXThreadSafeMutableDictionary * dictForFontFamily =
[weakSelf.fontStorage objectForKey:rule[@"fontFamily"]];
NSString *fontSrc = [dictForFontFamily
objectForKey:@"tempSrc"];
if (fontSrc) {
// only remote font will be mark as tempSrc
[GitHub] incubator-weex issue #1085: [Weex-260][android]switch supports setting color
Github user whn9527 commented on the issue: https://github.com/apache/incubator-weex/pull/1085 demo link please look at http://dotwe.org/vue/e9d87730e016bec01225e546ff10ef0d ---
[GitHub] incubator-weex pull request #1093: [WEEX-113] [iOS] New Touch Dispatch Mecha...
Github user acton393 commented on a diff in the pull request:
https://github.com/apache/incubator-weex/pull/1093#discussion_r177999835
--- Diff: ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m ---
@@ -698,10 +732,41 @@ - (void)checkRemoveTouchGesture
}
}
-#pragma mark - UIGestureRecognizerDelegate
+- (void)gestureShouldStopPropagation:(UIGestureRecognizer
*)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
+{
+NSString *ref = _templateComponent ? _templateComponent.ref : self.ref;
+CGPoint screenLocation = [touch locationInView:touch.window];
+CGPoint pageLocation = [touch
locationInView:self.weexInstance.rootView];
+NSDictionary *resultTouch = [self
touchResultWithScreenLocation:screenLocation pageLocation:pageLocation
identifier:touch.wx_identifier];
+NSString *touchState;
+if (touch.phase == UITouchPhaseBegan) {
+touchState = @"start";
+}
+else if (touch.phase == UITouchPhaseMoved){
+touchState = @"move";
+}
+else{
+touchState = @"end";
+}
+BOOL stopPropagation = [[WXEventManager
sharedManager]stopPropagation:self.weexInstance.instanceId ref:ref
type:@"stopPropagation" params:@{@"changedTouches":resultTouch ? @[resultTouch]
: @[],@"action":touchState}];
+touch.wx_stopPropagation = stopPropagation ? @1 : @0;
+}
+#pragma mark - UIGestureRecognizerDelegate
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
shouldReceiveTouch:(UITouch *)touch
{
+CGPoint screenLocation = [touch locationInView:touch.window];
+NSLog(@"%@",NSStringFromCGPoint(screenLocation));
--- End diff --
NSLog is not recommended here, you can use WXLog combined with its
loglevel
---
[GitHub] incubator-weex pull request #1093: [WEEX-113] [iOS] New Touch Dispatch Mecha...
Github user acton393 commented on a diff in the pull request: https://github.com/apache/incubator-weex/pull/1093#discussion_r177977039 --- Diff: ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m --- @@ -35,6 +35,35 @@ @interface WXScrollerComponnetView:UIScrollView @implementation WXScrollerComponnetView @end +@interface UIScrollView (Events) --- End diff -- I think that the name of Events category for UIScrollview is not long enough avoiding conflict later. ---
[GitHub] incubator-weex pull request #1093: [WEEX-113] [iOS] New Touch Dispatch Mecha...
Github user acton393 commented on a diff in the pull request: https://github.com/apache/incubator-weex/pull/1093#discussion_r177976635 --- Diff: ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m --- @@ -584,6 +583,12 @@ - (void)callJSMethod:(NSString *)method args:(NSArray *)args onContext:(JSContex } } +- (JSValue *)excuteJsMethodWithResult:(WXCallJSMethod *)method --- End diff -- `executeJSMethod...` maybe `JS` should be capital ---
[2/2] incubator-weex git commit: * [Android] rm useless code
* [Android] rm useless code
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e69a0d2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e69a0d2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e69a0d2a
Branch: refs/heads/master
Commit: e69a0d2ad69f59b88fc00c99f01eb4b229abd035
Parents: 1ab83cd
Author: zhongcang
Authored: Thu Mar 29 14:27:05 2018 +0800
Committer: wentao.swt
Committed: Thu Mar 29 15:24:34 2018 +0800
--
.../main/java/com/taobao/weex/WXSDKEngine.java | 1 -
.../com/taobao/weex/common/WXPerformance.java | 72 +---
.../taobao/weex/performance/FpsCollector.java | 113 ---
.../com/taobao/weex/performance/MemUtils.java | 80 -
4 files changed, 2 insertions(+), 264 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e69a0d2a/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 cbcac83..ef87679 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -59,7 +59,6 @@ import com.taobao.weex.dom.WXScrollerDomObject;
import com.taobao.weex.dom.WXSwitchDomObject;
import com.taobao.weex.dom.WXTextDomObject;
import com.taobao.weex.http.WXStreamModule;
-import com.taobao.weex.performance.FpsCollector;
import com.taobao.weex.ui.ExternalLoaderComponentHolder;
import com.taobao.weex.ui.IExternalComponentGetter;
import com.taobao.weex.ui.IExternalModuleGetter;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e69a0d2a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java
b/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java
index 8af7d85..77e43e9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java
@@ -18,14 +18,10 @@
*/
package com.taobao.weex.common;
-import android.os.Debug;
import android.support.annotation.RestrictTo;
import android.support.annotation.RestrictTo.Scope;
-import android.text.TextUtils;
import com.taobao.weex.WXEnvironment;
-import com.taobao.weex.performance.FpsCollector;
-import com.taobao.weex.performance.MemUtils;
import com.taobao.weex.utils.WXViewUtils;
import java.util.HashMap;
@@ -63,8 +59,8 @@ public class WXPerformance {
*/
JSLibSize(0D, Double.MAX_VALUE),
//normal 300ms.. first install apk 30s ?
-JSLibInitTime(0D, 5D),
-SDKInitTime(0D, 5000D),
+JSLibInitTime(0D, 8D),
+SDKInitTime(0D, 12D),
SDKInitInvokeTime(0D, 5000D),
SDKInitExecuteTime(0D, 5000D),
JSTemplateSize(0D, 5000D),
@@ -186,19 +182,10 @@ public class WXPerformance {
public int fsCallEventTotalNum;
public long avgFPS;
- public long frameSum;
- public long frameStartTime;
- public long frameEndTime;
public double fluency = 100D;
- public long maxImproveMemory;
-
public long backImproveMemory;
- public long pushImproveMemory;
-
- public long memTotalBeforeRender;
-
/**
* Time spent for reading, time unit is ms.
@@ -369,9 +356,6 @@ public class WXPerformance {
}
public static void init() {
-if (WXPerformance.TRACE_DATA) {
- FpsCollector.getInstance().init();
-}
}
public Map getMeasureMap() {
@@ -533,63 +517,11 @@ public class WXPerformance {
}
- private FpsRecorder mFpsRecorder = new FpsRecorder();
-
public void beforeInstanceRender(String instanceId) {
renderTimeOrigin = System.currentTimeMillis();
-if (WXPerformance.TRACE_DATA) {
- if (TextUtils.isEmpty(instanceId)) {
-return;
- }
- Debug.MemoryInfo mem =
MemUtils.getMemoryInfo(WXEnvironment.getApplication());
- if (null != mem) {
-memTotalBeforeRender = mem.getTotalPss();
- }
- FpsCollector.getInstance().registerListener(instanceId, mFpsRecorder);
-}
}
- // public void onInstanceEndRender(String instanceId,boolean isFirstScreen){
- //
- // }
-
-
public void afterInstanceDestroy(String instanceId) {
-if (WXPerformance.TRACE_DATA) {
- if (TextUtils.isEmpty(instanceId)) {
-return;
- }
- FpsCollector.getInstance().unRegister(instanceId);
- Debug.MemoryInfo mem =
MemUtils.getMemoryInfo(WXEnvironment.getApplication());
- if (null != mem) {
-backImproveMemory = mem.getTotalPss() - memTotalBeforeRender;
-
[1/2] incubator-weex git commit: [WEEX-269] [android] add T3D api support can use callT3DLinkNative on js runtime
Repository: incubator-weex
Updated Branches:
refs/heads/master 1ab83cdcf -> 0bc243d95
[WEEX-269] [android] add T3D api support
can use callT3DLinkNative on js runtime
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0bc243d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0bc243d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0bc243d9
Branch: refs/heads/master
Commit: 0bc243d95812d2e1d19922ec8480278cad6ca11e
Parents: e69a0d2
Author: yuhun-alibaba
Authored: Thu Mar 29 14:57:35 2018 +0800
Committer: wentao.swt
Committed: Thu Mar 29 15:24:34 2018 +0800
--
android/playground/app/build.gradle | 2 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 276000 -> 276000 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 2965560 -> 2965608 bytes
.../com/taobao/weex/bridge/WXBridgeManager.java | 13 +++--
4 files changed, 12 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bc243d9/android/playground/app/build.gradle
--
diff --git a/android/playground/app/build.gradle
b/android/playground/app/build.gradle
index ede9c84..bae43ca 100755
--- a/android/playground/app/build.gradle
+++ b/android/playground/app/build.gradle
@@ -104,5 +104,5 @@ dependencies {
compile 'com.jakewharton.scalpel:scalpel:1.1.2'
compile
'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
-compile 'com.taobao.android:weex_inspector:0.13.4'
+compile 'com.taobao.android:weex_inspector:0.13.5-multicontext'
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bc243d9/android/sdk/libs/armeabi/libweexjsc.so
--
diff --git a/android/sdk/libs/armeabi/libweexjsc.so
b/android/sdk/libs/armeabi/libweexjsc.so
index f45aee4..96fe1c2 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/0bc243d9/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so
b/android/sdk/libs/armeabi/libweexjss.so
index 94d4478..f91f45a 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/0bc243d9/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
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 aed1c53..ffede54 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
@@ -117,6 +117,7 @@ import static
com.taobao.weex.bridge.WXModuleManager.createDomModule;
public class WXBridgeManager implements Callback, BactchExecutor {
public static final String METHOD_CREATE_INSTANCE = "createInstance";
+ public static final String METHOD_CREATE_INSTANCE_CONTEXT =
"createInstanceContext";
public static final String METHOD_DESTROY_INSTANCE = "destroyInstance";
public static final String METHOD_CALL_JS = "callJS";
public static final String METHOD_SET_TIMEOUT = "setTimeoutCallback";
@@ -1175,6 +1176,14 @@ public class WXBridgeManager implements Callback,
BactchExecutor {
public String syncExecJsOnInstanceWithResult(final String instanceId, final
String js, final int type) {
+try {
+ if (isJSThread()) {
+return invokeExecJSOnInstance(instanceId, js, type);
+ }
+} catch (Throwable e) {
+ WXLogUtils.e("[WXBridgeManager] syncExecJsOnInstanceWithResult on
jsThread Exception");
+ return "";
+}
final CountDownLatch waitLatch = new CountDownLatch(1);
EventResult callback = new EventResult(){
@Override
@@ -1746,7 +1755,7 @@ public class WXBridgeManager implements Callback,
BactchExecutor {
return;
}
if (type == BundType.Vue || type == BundType.Rax) {
- invokeCreateInstanceContext(instance.getInstanceId(), null,
METHOD_CREATE_INSTANCE, args, false);
+ invokeCreateInstanceContext(instance.getInstanceId(), null,
METHOD_CREATE_INSTANCE_CONTEXT, args, false);
return;
} else {
invokeExecJS(instance.getInstanceId(), null, METHOD_CREATE_INSTANCE,
args, false);
@@ -2420,7 +2429,
[GitHub] incubator-weex issue #1094: [WEEX-269] [android] add T3D api support
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1094 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/";>dangerJS ---
[GitHub] incubator-weex issue #1092: [Android] rm useless code
Github user yuhun-alibaba commented on the issue: https://github.com/apache/incubator-weex/pull/1092 +1 ---
[GitHub] incubator-weex pull request #1094: [WEEX-269] [android] add T3D api support
GitHub user yuhun-alibaba opened a pull request: https://github.com/apache/incubator-weex/pull/1094 [WEEX-269] [android] add T3D api support [WEEX-269] [android] add T3D api support can use callT3DLinkNative on js runtime You can merge this pull request into a Git repository by running: $ git pull https://github.com/yuhun-alibaba/incubator-weex master_0329 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1094.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1094 commit 139bbf9962acf8e3b62a7a822f269073c8ed9f0b Author: yuhun-alibaba Date: 2018-03-29T06:57:35Z [WEEX-269] [android] add T3D api support can use callT3DLinkNative on js runtime ---
