[GitHub] cxfeng1 closed pull request #1818: Fix multicontext recreate
cxfeng1 closed pull request #1818: Fix multicontext recreate
URL: https://github.com/apache/incubator-weex/pull/1818
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index d6aca1de3f..aeb4d3b9b1 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -923,7 +923,6 @@
DCA445C41EFA57E300D0CFA8 /* WXAppConfiguration.h in Headers */
= {isa = PBXBuildFile; fileRef = 74A4BA941CB365D100195969 /*
WXAppConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
DCA445C51EFA57E800D0CFA8 /* WXAComponent.h in Headers */ = {isa
= PBXBuildFile; fileRef = 2AE5B7501CAB7DBD0082FDDB /* WXAComponent.h */;
settings = {ATTRIBUTES = (Public, ); }; };
DCA445C61EFA57EE00D0CFA8 /* NSObject+WXSwizzle.h in Headers */
= {isa = PBXBuildFile; fileRef = 74896F2E1D1AC79400D1D593 /*
NSObject+WXSwizzle.h */; settings = {ATTRIBUTES = (Public, ); }; };
- DCA445C91EFA58CE00D0CFA8 /* native-bundle-main.js in Resources
*/ = {isa = PBXBuildFile; fileRef = DCF0CD9D1EAF3A6B0062CA8F /*
native-bundle-main.js */; };
DCA445CA1EFA58CE00D0CFA8 /* wx_load_er...@3x.png in Resources
*/ = {isa = PBXBuildFile; fileRef = 59AC02501D2A7E6E00355112 /*
wx_load_er...@3x.png */; };
DCA445CB1EFA590600D0CFA8 /* WXComponent+Layout.h in Headers */
= {isa = PBXBuildFile; fileRef = 744BEA571D0520F300452B5D /*
WXComponent+Layout.h */; settings = {ATTRIBUTES = (Public, ); }; };
DCA445CC1EFA592800D0CFA8 /* WXResourceLoader.h in Headers */ =
{isa = PBXBuildFile; fileRef = 742AD7381DF98C8B007DC46C /* WXResourceLoader.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1030,7 +1029,6 @@
DCEA54631F2B7DBA000ECB23 /* WXTracingManager.m in Sources */ =
{isa = PBXBuildFile; fileRef = C4E97D321F1EF46D00ABC314 /* WXTracingManager.m
*/; };
DCF087611DCAE161005CD6EB /* WXInvocationConfig.h in Headers */
= {isa = PBXBuildFile; fileRef = DCF0875F1DCAE161005CD6EB /*
WXInvocationConfig.h */; };
DCF087621DCAE161005CD6EB /* WXInvocationConfig.m in Sources */
= {isa = PBXBuildFile; fileRef = DCF087601DCAE161005CD6EB /*
WXInvocationConfig.m */; };
- DCF0CD9E1EAF3A6B0062CA8F /* native-bundle-main.js in Resources
*/ = {isa = PBXBuildFile; fileRef = DCF0CD9D1EAF3A6B0062CA8F /*
native-bundle-main.js */; };
DCF343671E49CAEE00A2FB34 /* WXJSExceptionInfo.h in Headers */ =
{isa = PBXBuildFile; fileRef = DCF343651E49CAEE00A2FB34 /* WXJSExceptionInfo.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
DCF343681E49CAEE00A2FB34 /* WXJSExceptionInfo.m in Sources */ =
{isa = PBXBuildFile; fileRef = DCF343661E49CAEE00A2FB34 /* WXJSExceptionInfo.m
*/; };
ED053500207F4DEB007B4568 /* JSContext+Weex.h in Headers */ =
{isa = PBXBuildFile; fileRef = ED0534FE207F4DEB007B4568 /* JSContext+Weex.h */;
settings = {ATTRIBUTES = (Public, ); }; };
@@ -1599,7 +1597,6 @@
DCE7F1EE20AD358A00D471E7 /* WXPageEventNotifyEvent.h */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.h; name =
WXPageEventNotifyEvent.h; path = Protocol/WXPageEventNotifyEvent.h; sourceTree
= ""; };
DCF0875F1DCAE161005CD6EB /* WXInvocationConfig.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXInvocationConfig.h; sourceTree = ""; };
DCF087601DCAE161005CD6EB /* WXInvocationConfig.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXInvocationConfig.m; sourceTree = ""; };
- DCF0CD9D1EAF3A6B0062CA8F /* native-bundle-main.js */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.javascript; name =
"native-bundle-main.js"; path = "../../../../pre-build/native-bundle-main.js";
sourceTree = ""; };
DCF343651E49CAEE00A2FB34 /* WXJSExceptionInfo.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXJSExceptionInfo.h; sourceTree = ""; };
DCF343661E49CAEE00A2FB34 /* WXJSExceptionInfo.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXJSExceptionInfo.m; sourceTree = ""; };
ED0534FE207F4DEB007B4568 /* JSContext+Weex.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
"JSContext+Weex.h"; sourceTree = ""; };
@@ -1926,7 +1923,6 @@
DCD8D0F22073392A0002C420 /* weex-polyfill.js */,
DC15A3D92010BC93009C8977 /* weex-main-jsfm.js
*/,
[GitHub] win80540 commented on a change in pull request #1816: [WEEX-669][android] fix slider crash when adapter is null
win80540 commented on a change in pull request #1816: [WEEX-669][android] fix
slider crash when adapter is null
URL: https://github.com/apache/incubator-weex/pull/1816#discussion_r236153772
##
File path: android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
##
@@ -214,7 +214,14 @@ public void run() {
@Override
public void setLayout(WXComponent component) {
-mAdapter.setLayoutDirectionRTL(this.isNativeLayoutRTL());
+if (TextUtils.isEmpty(component.getComponentType())
Review comment:
Done
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[incubator-weex] branch master updated: Fix multicontext recreate (#1818)
This is an automated email from the ASF dual-hosted git repository.
cxfeng 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 adfa157 Fix multicontext recreate (#1818)
adfa157 is described below
commit adfa157737424d9f6424f032e42001b5273007f4
Author: wqyfavor
AuthorDate: Mon Nov 26 19:30:54 2018 +0800
Fix multicontext recreate (#1818)
* [iOS] Remove multicontext switch.
* [iOS] Remove multicontext switch.
* [iOS] For normal instance, do not create default jscontext which will be
deallocated soon.
---
ios/sdk/WeexSDK.xcodeproj/project.pbxproj| 6 --
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m | 49 +---
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.h | 5 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm | 99
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 17
ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h | 2 -
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m| 21 +
7 files changed, 79 insertions(+), 120 deletions(-)
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index d6aca1d..aeb4d3b 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -923,7 +923,6 @@
DCA445C41EFA57E300D0CFA8 /* WXAppConfiguration.h in Headers */
= {isa = PBXBuildFile; fileRef = 74A4BA941CB365D100195969 /*
WXAppConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
DCA445C51EFA57E800D0CFA8 /* WXAComponent.h in Headers */ = {isa
= PBXBuildFile; fileRef = 2AE5B7501CAB7DBD0082FDDB /* WXAComponent.h */;
settings = {ATTRIBUTES = (Public, ); }; };
DCA445C61EFA57EE00D0CFA8 /* NSObject+WXSwizzle.h in Headers */
= {isa = PBXBuildFile; fileRef = 74896F2E1D1AC79400D1D593 /*
NSObject+WXSwizzle.h */; settings = {ATTRIBUTES = (Public, ); }; };
- DCA445C91EFA58CE00D0CFA8 /* native-bundle-main.js in Resources
*/ = {isa = PBXBuildFile; fileRef = DCF0CD9D1EAF3A6B0062CA8F /*
native-bundle-main.js */; };
DCA445CA1EFA58CE00D0CFA8 /* wx_load_er...@3x.png in Resources
*/ = {isa = PBXBuildFile; fileRef = 59AC02501D2A7E6E00355112 /*
wx_load_er...@3x.png */; };
DCA445CB1EFA590600D0CFA8 /* WXComponent+Layout.h in Headers */
= {isa = PBXBuildFile; fileRef = 744BEA571D0520F300452B5D /*
WXComponent+Layout.h */; settings = {ATTRIBUTES = (Public, ); }; };
DCA445CC1EFA592800D0CFA8 /* WXResourceLoader.h in Headers */ =
{isa = PBXBuildFile; fileRef = 742AD7381DF98C8B007DC46C /* WXResourceLoader.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1030,7 +1029,6 @@
DCEA54631F2B7DBA000ECB23 /* WXTracingManager.m in Sources */ =
{isa = PBXBuildFile; fileRef = C4E97D321F1EF46D00ABC314 /* WXTracingManager.m
*/; };
DCF087611DCAE161005CD6EB /* WXInvocationConfig.h in Headers */
= {isa = PBXBuildFile; fileRef = DCF0875F1DCAE161005CD6EB /*
WXInvocationConfig.h */; };
DCF087621DCAE161005CD6EB /* WXInvocationConfig.m in Sources */
= {isa = PBXBuildFile; fileRef = DCF087601DCAE161005CD6EB /*
WXInvocationConfig.m */; };
- DCF0CD9E1EAF3A6B0062CA8F /* native-bundle-main.js in Resources
*/ = {isa = PBXBuildFile; fileRef = DCF0CD9D1EAF3A6B0062CA8F /*
native-bundle-main.js */; };
DCF343671E49CAEE00A2FB34 /* WXJSExceptionInfo.h in Headers */ =
{isa = PBXBuildFile; fileRef = DCF343651E49CAEE00A2FB34 /* WXJSExceptionInfo.h
*/; settings = {ATTRIBUTES = (Public, ); }; };
DCF343681E49CAEE00A2FB34 /* WXJSExceptionInfo.m in Sources */ =
{isa = PBXBuildFile; fileRef = DCF343661E49CAEE00A2FB34 /* WXJSExceptionInfo.m
*/; };
ED053500207F4DEB007B4568 /* JSContext+Weex.h in Headers */ =
{isa = PBXBuildFile; fileRef = ED0534FE207F4DEB007B4568 /* JSContext+Weex.h */;
settings = {ATTRIBUTES = (Public, ); }; };
@@ -1599,7 +1597,6 @@
DCE7F1EE20AD358A00D471E7 /* WXPageEventNotifyEvent.h */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.h; name =
WXPageEventNotifyEvent.h; path = Protocol/WXPageEventNotifyEvent.h; sourceTree
= ""; };
DCF0875F1DCAE161005CD6EB /* WXInvocationConfig.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WXInvocationConfig.h; sourceTree = ""; };
DCF087601DCAE161005CD6EB /* WXInvocationConfig.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WXInvocationConfig.m; sourceTree = ""; };
- DCF0CD9D1EAF3A6B0062CA8F /* native-bundle-main.js */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.javascript; name =
"native-bundle-main.js"; path = "../../../../pre-build/native-bundle-main.js";
sourceTree = ""; };
[GitHub] weex-bot edited a comment on issue #1816: [WEEX-669][android] fix slider crash when adapter is null
weex-bot edited a comment on issue #1816: [WEEX-669][android] fix slider crash when adapter is null URL: https://github.com/apache/incubator-weex/pull/1816#issuecomment-441541863 Fails :no_entry_sign: Failed to run assembleDebug task for android. Messages :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-weex] 01/01: Merge pull request #1817 from YorkShen/android_jacoco
This is an automated email from the ASF dual-hosted git repository. efurture pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-weex.git commit 4a3055ad30046b3518fbd860c73445fcbb9891c3 Merge: 349ee5f 5d188ab Author: codefurture AuthorDate: Mon Nov 26 18:12:44 2018 +0800 Merge pull request #1817 from YorkShen/android_jacoco * [Android] Fix Jacoco crash android/sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[incubator-weex] branch master updated (349ee5f -> 4a3055a)
This is an automated email from the ASF dual-hosted git repository. efurture pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-weex.git. from 349ee5f [android] fix slider crash when adapter is null (#1816) add 5d188ab * [Android] Fix Jacoco problem new 4a3055a Merge pull request #1817 from YorkShen/android_jacoco The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: android/sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[incubator-weex] branch master updated: Some Emoji emotion not Show On Android 9.0 (#1804)
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 78db8a6 Some Emoji emotion not Show On Android 9.0 (#1804)
78db8a6 is described below
commit 78db8a66eb5422fa1b09b24f7cf0b60ed5b77bb0
Author: codefurture
AuthorDate: Mon Nov 26 18:53:04 2018 +0800
Some Emoji emotion not Show On Android 9.0 (#1804)
---
weex_core/Source/wson/wson_util.cpp | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/weex_core/Source/wson/wson_util.cpp
b/weex_core/Source/wson/wson_util.cpp
index 75c7aa7..fcfbc2c 100644
--- a/weex_core/Source/wson/wson_util.cpp
+++ b/weex_core/Source/wson/wson_util.cpp
@@ -141,9 +141,8 @@ namespace wson {
for(int i=0; i
[GitHub] weex-bot edited a comment on issue #1816: [WEEX-669][android] fix slider crash when adapter is null
weex-bot edited a comment on issue #1816: [WEEX-669][android] fix slider crash when adapter is null URL: https://github.com/apache/incubator-weex/pull/1816#issuecomment-441541863 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] YorkShen opened a new pull request #1817: * [Android] Fix Jacoco crash
YorkShen opened a new pull request #1817: * [Android] Fix Jacoco crash URL: https://github.com/apache/incubator-weex/pull/1817 Fix the crash of Android weex Playground This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] YorkShen closed pull request #1816: [WEEX-669][android] fix slider crash when adapter is null
YorkShen closed pull request #1816: [WEEX-669][android] fix slider crash when
adapter is null
URL: https://github.com/apache/incubator-weex/pull/1816
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
index 45846cf988..24946fea87 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
@@ -41,7 +41,7 @@ public void executeAction() {
}
component.setDemission(mLayoutSize, mLayoutPosition);
-component.setLayout(component);
+component.setSafeLayout(component);
component.setPadding(component.getPadding(), component.getBorder());
}
}
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index fbf8bc3279..4d9447168d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -682,7 +682,7 @@ public void applyLayoutAndEvent(WXComponent component) {
component = this;
}
bindComponent(component);
- setLayout(component);
+ setSafeLayout(component);
setPadding(component.getPadding(), component.getBorder());
applyEvents();
}
@@ -701,7 +701,7 @@ public void updateDemission(float top, float bottom, float
left, float right, fl
public void applyLayoutOnly(){
if(!isLazy()) {
- setLayout(this);
+ setSafeLayout(this);
setPadding(this.getPadding(), this.getBorder());
}
}
@@ -922,13 +922,19 @@ protected BorderDrawable getOrCreateBorder() {
/**
* layout view
*/
- public void setLayout(WXComponent component) {
+ public void setSafeLayout(WXComponent component) {
if (TextUtils.isEmpty(component.getComponentType())
|| TextUtils.isEmpty(component.getRef()) ||
component.getLayoutPosition() == null
|| component.getLayoutSize() == null) {
return;
}
+setLayout(component);
+ }
+ /**
+ * layout view
+ */
+ public void setLayout(WXComponent component) {
setLayoutSize(component.getLayoutSize());
setLayoutPosition(component.getLayoutPosition());
setPaddings(component.getPadding());
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index 8e9474069f..d0033185b3 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -214,7 +214,9 @@ public void run() {
@Override
public void setLayout(WXComponent component) {
-mAdapter.setLayoutDirectionRTL(this.isNativeLayoutRTL());
+if (mAdapter != null) {
+ mAdapter.setLayoutDirectionRTL(this.isNativeLayoutRTL());
+}
super.setLayout(component);
}
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index a9a2c67910..c994707cfe 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -198,11 +198,6 @@ public void
setMarginsSupportRTL(ViewGroup.MarginLayoutParams lp, int left, int
@Override
public void setLayout(WXComponent component) {
-if (TextUtils.isEmpty(component.getComponentType())
-|| TextUtils.isEmpty(component.getRef()) ||
component.getLayoutPosition() == null
-|| component.getLayoutSize() == null) {
- return;
-}
if (component.getHostView() != null) {
int layoutDirection = component.isNativeLayoutRTL() ?
View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR;
ViewCompat.setLayoutDirection(component.getHostView(), layoutDirection);
diff --git
a/android/sdk/src/test/java/com/taobao/weex/ui/component/ComponentTest.java
b/android/sdk/src/test/java/com/taobao/weex/ui/component/ComponentTest.java
index 1e74e7a5ee..bcafc2a19f 100644
--- a/android/sdk/src/test/java/com/taobao/weex/ui/component/ComponentTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/ui/component/ComponentTest.java
@@ -49,7 +49,7 @@ public static void create(WXComponent comp,View view){
parent.createChildViewAt(-1);
}
-comp.setLayout(comp);
+comp.setSafeLayout(comp);
//domObject = new TestDomObject();
//
[GitHub] YorkShen commented on a change in pull request #1816: [WEEX-669][android] fix slider crash when adapter is null
YorkShen commented on a change in pull request #1816: [WEEX-669][android] fix
slider crash when adapter is null
URL: https://github.com/apache/incubator-weex/pull/1816#discussion_r236151536
##
File path: android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
##
@@ -214,7 +214,14 @@ public void run() {
@Override
public void setLayout(WXComponent component) {
-mAdapter.setLayoutDirectionRTL(this.isNativeLayoutRTL());
+if (TextUtils.isEmpty(component.getComponentType())
Review comment:
```
WXComponent.java
public static void setLayoutSafe(Component ){
if Check
setLayout(Component)
}
proctected void setLayout(Component ){
//Remove if check
}
```
Make sure codes in weex_sdk invoke setLayoutSafe
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[incubator-weex] branch master updated: [android] fix slider crash when adapter is null (#1816)
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 349ee5f [android] fix slider crash when adapter is null (#1816)
349ee5f is described below
commit 349ee5f1377116dc5c7b97f5b8a08e8845c7268b
Author: Klueze
AuthorDate: Mon Nov 26 17:24:20 2018 +0800
[android] fix slider crash when adapter is null (#1816)
---
.../java/com/taobao/weex/ui/action/GraphicActionLayout.java | 2 +-
.../main/java/com/taobao/weex/ui/component/WXComponent.java | 12 +---
.../src/main/java/com/taobao/weex/ui/component/WXSlider.java | 4 +++-
.../taobao/weex/ui/component/list/BasicListComponent.java| 5 -
.../java/com/taobao/weex/ui/component/ComponentTest.java | 2 +-
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
index 45846cf..24946fe 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java
@@ -41,7 +41,7 @@ public class GraphicActionLayout extends BasicGraphicAction {
}
component.setDemission(mLayoutSize, mLayoutPosition);
-component.setLayout(component);
+component.setSafeLayout(component);
component.setPadding(component.getPadding(), component.getBorder());
}
}
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index fbf8bc3..4d94471 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -682,7 +682,7 @@ public abstract class WXComponent extends
WXBasicComponent imple
component = this;
}
bindComponent(component);
- setLayout(component);
+ setSafeLayout(component);
setPadding(component.getPadding(), component.getBorder());
applyEvents();
}
@@ -701,7 +701,7 @@ public abstract class WXComponent extends
WXBasicComponent imple
public void applyLayoutOnly(){
if(!isLazy()) {
- setLayout(this);
+ setSafeLayout(this);
setPadding(this.getPadding(), this.getBorder());
}
}
@@ -922,13 +922,19 @@ public abstract class WXComponent extends
WXBasicComponent imple
/**
* layout view
*/
- public void setLayout(WXComponent component) {
+ public void setSafeLayout(WXComponent component) {
if (TextUtils.isEmpty(component.getComponentType())
|| TextUtils.isEmpty(component.getRef()) ||
component.getLayoutPosition() == null
|| component.getLayoutSize() == null) {
return;
}
+setLayout(component);
+ }
+ /**
+ * layout view
+ */
+ public void setLayout(WXComponent component) {
setLayoutSize(component.getLayoutSize());
setLayoutPosition(component.getLayoutPosition());
setPaddings(component.getPadding());
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index 8e94740..d003318 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -214,7 +214,9 @@ public class WXSlider extends WXVContainer {
@Override
public void setLayout(WXComponent component) {
-mAdapter.setLayoutDirectionRTL(this.isNativeLayoutRTL());
+if (mAdapter != null) {
+ mAdapter.setLayoutDirectionRTL(this.isNativeLayoutRTL());
+}
super.setLayout(component);
}
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index a9a2c67..c994707 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -198,11 +198,6 @@ public abstract class BasicListComponent
[GitHub] weex-bot commented on issue #1817: * [Android] Fix Jacoco crash
weex-bot commented on issue #1817: * [Android] Fix Jacoco crash URL: https://github.com/apache/incubator-weex/pull/1817#issuecomment-441565236 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1817: * [Android] Fix Jacoco crash
weex-bot edited a comment on issue #1817: * [Android] Fix Jacoco crash URL: https://github.com/apache/incubator-weex/pull/1817#issuecomment-441565236 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1816: [WEEX-669][android] fix slider crash when adapter is null
weex-bot edited a comment on issue #1816: [WEEX-669][android] fix slider crash when adapter is null URL: https://github.com/apache/incubator-weex/pull/1816#issuecomment-441541863 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1817: * [Android] Fix Jacoco crash
weex-bot edited a comment on issue #1817: * [Android] Fix Jacoco crash URL: https://github.com/apache/incubator-weex/pull/1817#issuecomment-441565236 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wqyfavor opened a new pull request #1818: Fix multicontext recreate
wqyfavor opened a new pull request #1818: Fix multicontext recreate URL: https://github.com/apache/incubator-weex/pull/1818 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. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1822: [iOS] Release jscontext in bridge thread to avoid main thread deadlock.
weex-bot edited a comment on issue #1822: [iOS] Release jscontext in bridge thread to avoid main thread deadlock. URL: https://github.com/apache/incubator-weex/pull/1822#issuecomment-441879491 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wqyfavor opened a new pull request #1822: [iOS] Release jscontext in bridge thread to avoid main thread deadlock.
wqyfavor opened a new pull request #1822: [iOS] Release jscontext in bridge thread to avoid main thread deadlock. URL: https://github.com/apache/incubator-weex/pull/1822 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. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot commented on issue #1822: [iOS] Release jscontext in bridge thread to avoid main thread deadlock.
weex-bot commented on issue #1822: [iOS] Release jscontext in bridge thread to avoid main thread deadlock. URL: https://github.com/apache/incubator-weex/pull/1822#issuecomment-441879491 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] cxfeng1 closed pull request #1822: [iOS] Release jscontext in bridge thread to avoid main thread deadlock.
cxfeng1 closed pull request #1822: [iOS] Release jscontext in bridge thread to
avoid main thread deadlock.
URL: https://github.com/apache/incubator-weex/pull/1822
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
index de414bd5fb..0e7a48d529 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
@@ -79,6 +79,10 @@ - (instancetype)initWithoutDefaultContext
- (void)dealloc
{
_jsContext.instanceId = nil;
+__block JSContext* theContext = _jsContext;
+WXPerformBlockOnBridgeThread(^{
+theContext = nil; // release the context in js thread to avoid
main-thread deadlock
+});
}
- (void)setJSContext:(JSContext *)context
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
index 8728161254..3422ab06fa 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
@@ -23,7 +23,13 @@
@class WXBridgeMethod;
@class WXSDKInstance;
-extern void WXPerformBlockOnBridgeThread(void (^block)(void));
+#ifdef __cplusplus
+extern "C" {
+#endif
+void WXPerformBlockOnBridgeThread(void (^block)(void));
+#ifdef __cplusplus
+}
+#endif
@interface WXBridgeManager : NSObject
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] wqyfavor opened a new pull request #1821: [iOS] Use libc++. (#1819)
wqyfavor opened a new pull request #1821: [iOS] Use libc++. (#1819) URL: https://github.com/apache/incubator-weex/pull/1821 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. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-weex] branch master updated: [iOS] Release jscontext in bridge thread to avoid main thread deadlock. (#1822)
This is an automated email from the ASF dual-hosted git repository.
cxfeng 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 78b887c [iOS] Release jscontext in bridge thread to avoid main thread
deadlock. (#1822)
78b887c is described below
commit 78b887ce8256d3e13c3cfa0294c286db05efccb9
Author: wqyfavor
AuthorDate: Tue Nov 27 10:57:42 2018 +0800
[iOS] Release jscontext in bridge thread to avoid main thread deadlock.
(#1822)
---
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm | 4
ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h | 8 +++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
index de414bd..0e7a48d 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
@@ -79,6 +79,10 @@
- (void)dealloc
{
_jsContext.instanceId = nil;
+__block JSContext* theContext = _jsContext;
+WXPerformBlockOnBridgeThread(^{
+theContext = nil; // release the context in js thread to avoid
main-thread deadlock
+});
}
- (void)setJSContext:(JSContext *)context
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
index 8728161..3422ab0 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
@@ -23,7 +23,13 @@
@class WXBridgeMethod;
@class WXSDKInstance;
-extern void WXPerformBlockOnBridgeThread(void (^block)(void));
+#ifdef __cplusplus
+extern "C" {
+#endif
+void WXPerformBlockOnBridgeThread(void (^block)(void));
+#ifdef __cplusplus
+}
+#endif
@interface WXBridgeManager : NSObject
[GitHub] Darin726 commented on issue #1803: 0.18.0 libweexjsc.so 异常导致app crash
Darin726 commented on issue #1803: 0.18.0 libweexjsc.so 异常导致app crash URL: https://github.com/apache/incubator-weex/issues/1803#issuecomment-441882288 时间较久libweexjsc.so 的符号文件已经丢失 建议你们升级一下 weex_sdk. 在观察是否还存在这个问题. 编译 libweexcore.so后记得保留符号文件哈. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wqyfavor closed pull request #1821: [iOS] Use libc++. (#1819)
wqyfavor closed pull request #1821: [iOS] Use libc++. (#1819)
URL: https://github.com/apache/incubator-weex/pull/1821
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
index 7f594c415f..d456a1b5d2 100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@ -53,7 +53,7 @@ Pod::Spec.new do |s|
w.xcconfig = { 'USER_HEADER_SEARCH_PATHS' =>
['${PODS_ROOT}/Headers/Public/WeexSDK/core/**'] }
w.header_mappings_dir = 'weex_core/Source'
-w.libraries = "stdc++"
+w.libraries = "c++"
end
end
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] weex-bot edited a comment on issue #1821: [iOS] Use libc++. (#1819)
weex-bot edited a comment on issue #1821: [iOS] Use libc++. (#1819) URL: https://github.com/apache/incubator-weex/pull/1821#issuecomment-441872352 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot commented on issue #1821: [iOS] Use libc++. (#1819)
weex-bot commented on issue #1821: [iOS] Use libc++. (#1819) URL: https://github.com/apache/incubator-weex/pull/1821#issuecomment-441872352 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1821: [iOS] Use libc++. (#1819)
weex-bot edited a comment on issue #1821: [iOS] Use libc++. (#1819) URL: https://github.com/apache/incubator-weex/pull/1821#issuecomment-441872352 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr closed issue #1811: Review community pr
zshshr closed issue #1811: Review community pr URL: https://github.com/apache/incubator-weex/issues/1811 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr commented on issue #1811: Review community pr
zshshr commented on issue #1811: Review community pr URL: https://github.com/apache/incubator-weex/issues/1811#issuecomment-441885403 done ，thanks！ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] lucky-chen commented on issue #1596: android使用源码导入工程失败，界面显示 reader error -1001 degradeToH5|createInstance fail|wx_create_instance_error isJSFrameworkInit==false reInitCount == 1
lucky-chen commented on issue #1596: android使用源码导入工程失败，界面显示 reader error -1001 degradeToH5|createInstance fail|wx_create_instance_error isJSFrameworkInit==false reInitCount == 1 URL: https://github.com/apache/incubator-weex/issues/1596#issuecomment-441889760 > @fantasysea 这个问题解决了吗？同样遇到这个问题 gradle的配置发一下看看 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-weex] branch master updated: [Android] support for hot updates under specified ports
This is an automated email from the ASF dual-hosted git repository.
zshshr 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 6e9edfc [Android] support for hot updates under specified ports
6e9edfc is described below
commit 6e9edfc2660e8c93bc97f1a6173b039396ff952b
Author: erha19
AuthorDate: Mon Nov 26 20:43:57 2018 +0800
[Android] support for hot updates under specified ports
---
.../main/java/com/alibaba/weex/WXPageActivity.java | 41 +++---
1 file changed, 28 insertions(+), 13 deletions(-)
diff --git
a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
index 8a5408d..01f496d 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
@@ -54,14 +54,18 @@ import com.alibaba.weex.https.WXHttpTask;
import com.alibaba.weex.https.WXRequestListener;
import com.taobao.weex.IWXRenderListener;
import com.taobao.weex.RenderContainer;
+import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKEngine;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
+import com.taobao.weex.bridge.WXBridgeManager;
+import com.taobao.weex.common.IWXDebugProxy;
import com.taobao.weex.common.WXRenderStrategy;
import com.taobao.weex.ui.component.NestedContainer;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXVContainer;
import com.taobao.weex.utils.WXFileUtils;
+import com.taobao.weex.utils.WXJsonUtils;
import com.taobao.weex.utils.WXLogUtils;
import java.io.File;
@@ -70,6 +74,8 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class WXPageActivity extends WXBaseActivity implements
IWXRenderListener, Handler.Callback, WXSDKInstance.NestedInstanceInterceptor {
@@ -182,7 +188,7 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
ctx.getWindow().getDecorView().getWindowVisibleDisplayFrame(outRect);
mConfigMap.put("bundleUrl", mUri.toString());
String path = "file".equals(mUri.getScheme()) ? assembleFilePath(mUri)
: mUri.toString();
-mInstance.render(path, WXFileUtils.loadAsset(path,
WXPageActivity.this),
+mInstance.render(TAG, WXFileUtils.loadAsset(path, WXPageActivity.this),
mConfigMap, null,
WXRenderStrategy.APPEND_ASYNC);
}
@@ -242,13 +248,8 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
public void onSuccess(WXHttpTask task) {
Log.i(TAG, "into--[http:onSuccess] url:" + url);
try {
- Uri uri = Uri.parse(url);
mConfigMap.put("bundleUrl", url);
- if (uri.getPath().endsWith(".wlasm")){
-mInstance.render(TAG, task.response.data, mConfigMap, null);
- } else {
-mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
- }
+ mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
@@ -270,14 +271,28 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
*/
private void startHotRefresh() {
try {
- String host = new URL(mUri.toString()).getHost();
- String wsUrl = "ws://" + host + ":8082";
+ URL url = new URL(mUri.toString());
+ String host = url.getHost();
+ String query = url.getQuery();
+ String wsport = getUrlParam("wsport", query);
+ String wsUrl = "ws://" + host + ":" + (wsport.equals("") ? "8082" :
wsport) ;
mWXHandler.obtainMessage(Constants.HOT_REFRESH_CONNECT, 0, 0,
wsUrl).sendToTarget();
} catch (MalformedURLException e) {
e.printStackTrace();
}
}
+ private String getUrlParam(String key, String queryString) {
+String regex = "[?|&]?" + key + "=([^&]+)";
+Pattern p = Pattern.compile(regex);
+Matcher matcher = p.matcher(queryString);
+if (matcher.find()) {
+ return matcher.group(1);
+} else {
+ return "";
+}
+ }
+
private void addOnListener() {
}
@@ -517,8 +532,8 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
private void registerBroadcastReceiver() {
mReceiver = new RefreshBroadcastReceiver();
IntentFilter filter = new IntentFilter();
-filter.addAction(WXSDKInstance.ACTION_DEBUG_INSTANCE_REFRESH);
-filter.addAction(WXSDKInstance.ACTION_INSTANCE_RELOAD);
+
[GitHub] zshshr closed pull request #1820: [Android] support for hot updates under specified ports
zshshr closed pull request #1820: [Android] support for hot updates under
specified ports
URL: https://github.com/apache/incubator-weex/pull/1820
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
index 8a5408daf8..01f496de5b 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
@@ -54,14 +54,18 @@
import com.alibaba.weex.https.WXRequestListener;
import com.taobao.weex.IWXRenderListener;
import com.taobao.weex.RenderContainer;
+import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKEngine;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
+import com.taobao.weex.bridge.WXBridgeManager;
+import com.taobao.weex.common.IWXDebugProxy;
import com.taobao.weex.common.WXRenderStrategy;
import com.taobao.weex.ui.component.NestedContainer;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXVContainer;
import com.taobao.weex.utils.WXFileUtils;
+import com.taobao.weex.utils.WXJsonUtils;
import com.taobao.weex.utils.WXLogUtils;
import java.io.File;
@@ -70,6 +74,8 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class WXPageActivity extends WXBaseActivity implements
IWXRenderListener, Handler.Callback, WXSDKInstance.NestedInstanceInterceptor {
@@ -182,7 +188,7 @@ public void run() {
ctx.getWindow().getDecorView().getWindowVisibleDisplayFrame(outRect);
mConfigMap.put("bundleUrl", mUri.toString());
String path = "file".equals(mUri.getScheme()) ? assembleFilePath(mUri)
: mUri.toString();
-mInstance.render(path, WXFileUtils.loadAsset(path,
WXPageActivity.this),
+mInstance.render(TAG, WXFileUtils.loadAsset(path, WXPageActivity.this),
mConfigMap, null,
WXRenderStrategy.APPEND_ASYNC);
}
@@ -242,13 +248,8 @@ private void loadWXfromService(final String url) {
public void onSuccess(WXHttpTask task) {
Log.i(TAG, "into--[http:onSuccess] url:" + url);
try {
- Uri uri = Uri.parse(url);
mConfigMap.put("bundleUrl", url);
- if (uri.getPath().endsWith(".wlasm")){
-mInstance.render(TAG, task.response.data, mConfigMap, null);
- } else {
-mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
- }
+ mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
@@ -270,14 +271,28 @@ public void onError(WXHttpTask task) {
*/
private void startHotRefresh() {
try {
- String host = new URL(mUri.toString()).getHost();
- String wsUrl = "ws://" + host + ":8082";
+ URL url = new URL(mUri.toString());
+ String host = url.getHost();
+ String query = url.getQuery();
+ String wsport = getUrlParam("wsport", query);
+ String wsUrl = "ws://" + host + ":" + (wsport.equals("") ? "8082" :
wsport) ;
mWXHandler.obtainMessage(Constants.HOT_REFRESH_CONNECT, 0, 0,
wsUrl).sendToTarget();
} catch (MalformedURLException e) {
e.printStackTrace();
}
}
+ private String getUrlParam(String key, String queryString) {
+String regex = "[?|&]?" + key + "=([^&]+)";
+Pattern p = Pattern.compile(regex);
+Matcher matcher = p.matcher(queryString);
+if (matcher.find()) {
+ return matcher.group(1);
+} else {
+ return "";
+}
+ }
+
private void addOnListener() {
}
@@ -517,8 +532,8 @@ protected void onStop() {
private void registerBroadcastReceiver() {
mReceiver = new RefreshBroadcastReceiver();
IntentFilter filter = new IntentFilter();
-filter.addAction(WXSDKInstance.ACTION_DEBUG_INSTANCE_REFRESH);
-filter.addAction(WXSDKInstance.ACTION_INSTANCE_RELOAD);
+filter.addAction(IWXDebugProxy.ACTION_DEBUG_INSTANCE_REFRESH);
+filter.addAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
registerReceiver(mReceiver, filter);
}
@@ -588,8 +603,8 @@ public boolean setNavBarTitle(String param) {
public class RefreshBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- if (WXSDKInstance.ACTION_INSTANCE_RELOAD.equals(intent.getAction()) ||
-
[GitHub] wqyfavor commented on issue #1800: [IOS]add call onJSException when error log
wqyfavor commented on issue #1800: [IOS]add call onJSException when error log URL: https://github.com/apache/incubator-weex/pull/1800#issuecomment-441898539 Sorry, we couldn't call commitCriticalExceptionRT in this method. Besides, logs with level of WXLogFlagWarning and WXLogFlagError are handled by appMonitorHandler, you could change your implementation of WXAppMonitorProtocol. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] Luis-X edited a comment on issue #1823: 用了weex被AppStore下架了
Luis-X edited a comment on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441945101 > Do you still have other dynamic fixes? Like js patch? Weex did not appear to be removed our app not used JSPatch. only use weex This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wqyfavor commented on issue #1823: 用了weex被AppStore下架了
wqyfavor commented on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441946608 如果有问题可以留一下电话，详细沟通一下。 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr closed issue #1748: IOS stream get方法不支持graphql语法
zshshr closed issue #1748: IOS stream get方法不支持graphql语法 URL: https://github.com/apache/incubator-weex/issues/1748 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1824: [Android] fix WXpageActivity class on playground app
weex-bot edited a comment on issue #1824: [Android] fix WXpageActivity class on playground app URL: https://github.com/apache/incubator-weex/pull/1824#issuecomment-441947065 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] erha19 opened a new pull request #1824: [Android] fix WXpageActivity class on playground app
erha19 opened a new pull request #1824: [Android] fix WXpageActivity class on playground app URL: https://github.com/apache/incubator-weex/pull/1824 Bugfix: - fix WXpageActivity class on playground app. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot commented on issue #1824: [Android] fix WXpageActivity class on playground app
weex-bot commented on issue #1824: [Android] fix WXpageActivity class on playground app URL: https://github.com/apache/incubator-weex/pull/1824#issuecomment-441947065 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] Luis-X commented on issue #1823: 用了weex被AppStore下架了
Luis-X commented on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441946812 > 可以给苹果回复邮件，说明自己的App并没有在应用审核后，利用任何动态能力修改应用行为。言辞一定要肯定。 已经上架将近1个月的时间了，最近突然被下架了，可能是因为苹果的复查机制 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr closed issue #1783: video组件能否支持rtsp,rtmp之类的直播流播放？
zshshr closed issue #1783: video组件能否支持rtsp,rtmp之类的直播流播放？ URL: https://github.com/apache/incubator-weex/issues/1783 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr closed issue #1508: 现在支持android x86 的cpu吗
zshshr closed issue #1508: 现在支持android x86 的cpu吗 URL: https://github.com/apache/incubator-weex/issues/1508 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr commented on issue #1508: 现在支持android x86 的cpu吗
zshshr commented on issue #1508: 现在支持android x86 的cpu吗 URL: https://github.com/apache/incubator-weex/issues/1508#issuecomment-441948878 support x86  This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr commented on issue #1823: 用了weex被AppStore下架了
zshshr commented on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441951421 What are you App? @Luis-X This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr commented on issue #1682: toLocaleString显示的时间在安卓上有时会慢一个小时，很奇怪（而且时区是对的）
zshshr commented on issue #1682: toLocaleString显示的时间在安卓上有时会慢一个小时，很奇怪（而且时区是对的） URL: https://github.com/apache/incubator-weex/issues/1682#issuecomment-441953165 Provide a reproducible example at http://dotwe.org/vue This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot edited a comment on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-weex] branch master updated: [core] add script section in opcode file (#1827)
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 b8a5064 [core] add script section in opcode file (#1827)
b8a5064 is described below
commit b8a506437c4c79036b92b94b6ba70514b05fad04
Author: jianhan-he <41508406+jianhan...@users.noreply.github.com>
AuthorDate: Tue Nov 27 15:51:01 2018 +0800
[core] add script section in opcode file (#1827)
---
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
weex_core/Source/core/data_render/exec_state.cc| 1 +
.../Source/core/data_render/exec_state_binary.cc | 13 ++
.../Source/core/data_render/exec_state_section.cc | 150 -
.../Source/core/data_render/exec_state_section.h | 19 ++-
.../core/data_render/vnode/vnode_exec_env.cc | 8 +-
.../Source/core/data_render/vnode/vnode_exec_env.h | 1 +
.../core/data_render/vnode/vnode_render_context.h | 7 +
.../core/data_render/vnode/vnode_render_manager.cc | 1 +
9 files changed, 199 insertions(+), 5 deletions(-)
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index deb383e..2baee25 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -470,7 +470,7 @@ typedef enum : NSUInteger {
newOptions[bundleUrlOptionKey] = url.absoluteString;
}
-if ([url.absoluteString hasSuffix:WEEX_LITE_URL_SUFFIX]) {
+if ([url.absoluteString hasSuffix:WEEX_LITE_URL_SUFFIX] ||
[url.absoluteString containsString:@"__eagle=true"]) {
newOptions[@"WLASM_RENDER"] = @(YES);
}
@@ -534,7 +534,7 @@ typedef enum : NSUInteger {
return;
}
-if (([options[@"DATA_RENDER"] boolValue] &&
[options[@"RENDER_WITH_BINARY"] boolValue]) || [options[@"WLASM_RENDER"]
boolValue]) {
+if (([newOptions[@"DATA_RENDER"] boolValue] &&
[newOptions[@"RENDER_WITH_BINARY"] boolValue]) || [newOptions[@"WLASM_RENDER"]
boolValue]) {
[strongSelf _renderWithData:data];
return;
}
diff --git a/weex_core/Source/core/data_render/exec_state.cc
b/weex_core/Source/core/data_render/exec_state.cc
index 56aae72..6ba2054 100644
--- a/weex_core/Source/core/data_render/exec_state.cc
+++ b/weex_core/Source/core/data_render/exec_state.cc
@@ -92,6 +92,7 @@ void ExecState::Compile(std::string& err) {
if (!context()->raw_json().is_null()) {
VNodeExecEnv::ParseData(this);
VNodeExecEnv::ParseStyle((this));
+ VNodeExecEnv::ParseScript(this);
ParseResult result = Parser::Parse(context()->raw_json(),err);
generator.Visit(result.expr().get(), nullptr);
}
diff --git a/weex_core/Source/core/data_render/exec_state_binary.cc
b/weex_core/Source/core/data_render/exec_state_binary.cc
index 0b19a00..6c57c81 100644
--- a/weex_core/Source/core/data_render/exec_state_binary.cc
+++ b/weex_core/Source/core/data_render/exec_state_binary.cc
@@ -69,6 +69,11 @@ bool ExecStateEncoder::encoding(std::string ) {
err = "data section encoding error";
break;
}
+SectionScript script(this);
+if (!script.encoding()) {
+err = "script section encoding error";
+break;
+}
SectionFunction function(this, gs_op_code_bits);
if (!function.encoding()) {
err = "function section encoding error";
@@ -160,6 +165,14 @@ bool ExecStateDecoder::decoding(std::string ) {
}
break;
}
+case ExecSection::EXEC_SECTION_SCRIPT:
+{
+SectionScript script(this, section_length);
+if (!script.decoding()) {
+throw EncoderError("script section decoding
error");
+}
+break;
+}
case ExecSection::EXEC_SECTION_FUNCTION:
{
SectionFunction function(this, gs_op_code_bits,
section_length);
diff --git a/weex_core/Source/core/data_render/exec_state_section.cc
b/weex_core/Source/core/data_render/exec_state_section.cc
index b68ea2f..c40df1c 100644
--- a/weex_core/Source/core/data_render/exec_state_section.cc
+++ b/weex_core/Source/core/data_render/exec_state_section.cc
@@ -1274,6 +1274,154 @@ bool SectionData::decoding() {
return finished;
}
+
+uint32_t SectionScript::size() {
+uint32_t size = 0;
+do {
+const json11::Json& scripts =
encoder()->exec_state()->context()->script_json();
+if (!scripts.array_items().size()) {
+break;
+}
+size += GetFTLVLength(kValueScriptSize, sizeof(uint32_t));
+
[GitHub] YorkShen closed pull request #1827: [core] add script section in opcode file
YorkShen closed pull request #1827: [core] add script section in opcode file
URL: https://github.com/apache/incubator-weex/pull/1827
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 4a04c1443b..3cd20f9b8a 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -485,7 +485,7 @@ - (void)_renderWithRequest:(WXResourceRequest *)request
options:(NSDictionary *)
newOptions[bundleUrlOptionKey] = url.absoluteString;
}
-if ([url.absoluteString hasSuffix:WEEX_LITE_URL_SUFFIX]) {
+if ([url.absoluteString hasSuffix:WEEX_LITE_URL_SUFFIX] ||
[url.absoluteString containsString:@"__eagle=true"]) {
newOptions[@"WLASM_RENDER"] = @(YES);
}
@@ -549,7 +549,7 @@ - (void)_renderWithRequest:(WXResourceRequest *)request
options:(NSDictionary *)
return;
}
-if (([options[@"DATA_RENDER"] boolValue] &&
[options[@"RENDER_WITH_BINARY"] boolValue]) || [options[@"WLASM_RENDER"]
boolValue]) {
+if (([newOptions[@"DATA_RENDER"] boolValue] &&
[newOptions[@"RENDER_WITH_BINARY"] boolValue]) || [newOptions[@"WLASM_RENDER"]
boolValue]) {
[strongSelf _renderWithData:data];
return;
}
diff --git a/weex_core/Source/core/data_render/exec_state.cc
b/weex_core/Source/core/data_render/exec_state.cc
index 56aae72010..6ba2054c3c 100644
--- a/weex_core/Source/core/data_render/exec_state.cc
+++ b/weex_core/Source/core/data_render/exec_state.cc
@@ -92,6 +92,7 @@ void ExecState::Compile(std::string& err) {
if (!context()->raw_json().is_null()) {
VNodeExecEnv::ParseData(this);
VNodeExecEnv::ParseStyle((this));
+ VNodeExecEnv::ParseScript(this);
ParseResult result = Parser::Parse(context()->raw_json(),err);
generator.Visit(result.expr().get(), nullptr);
}
diff --git a/weex_core/Source/core/data_render/exec_state_binary.cc
b/weex_core/Source/core/data_render/exec_state_binary.cc
index 0b19a00818..6c57c81053 100644
--- a/weex_core/Source/core/data_render/exec_state_binary.cc
+++ b/weex_core/Source/core/data_render/exec_state_binary.cc
@@ -69,6 +69,11 @@ bool ExecStateEncoder::encoding(std::string ) {
err = "data section encoding error";
break;
}
+SectionScript script(this);
+if (!script.encoding()) {
+err = "script section encoding error";
+break;
+}
SectionFunction function(this, gs_op_code_bits);
if (!function.encoding()) {
err = "function section encoding error";
@@ -160,6 +165,14 @@ bool ExecStateDecoder::decoding(std::string ) {
}
break;
}
+case ExecSection::EXEC_SECTION_SCRIPT:
+{
+SectionScript script(this, section_length);
+if (!script.decoding()) {
+throw EncoderError("script section decoding
error");
+}
+break;
+}
case ExecSection::EXEC_SECTION_FUNCTION:
{
SectionFunction function(this, gs_op_code_bits,
section_length);
diff --git a/weex_core/Source/core/data_render/exec_state_section.cc
b/weex_core/Source/core/data_render/exec_state_section.cc
index b68ea2f068..c40df1cce3 100644
--- a/weex_core/Source/core/data_render/exec_state_section.cc
+++ b/weex_core/Source/core/data_render/exec_state_section.cc
@@ -1274,6 +1274,154 @@ bool SectionData::decoding() {
return finished;
}
+
+uint32_t SectionScript::size() {
+uint32_t size = 0;
+do {
+const json11::Json& scripts =
encoder()->exec_state()->context()->script_json();
+if (!scripts.array_items().size()) {
+break;
+}
+size += GetFTLVLength(kValueScriptSize, sizeof(uint32_t));
+for (auto script : scripts.array_items()) {
+const json11::Json::object& items = script.object_items();
+size += GetFTLVLength(kValueScriptItemSize, sizeof(uint32_t));
+for (auto iter = items.begin(); iter != items.end(); iter++) {
+uint32_t key_length =
static_cast(iter->first.length());
+size += GetFTLVLength(kValueScriptKey, key_length);
+uint32_t val_length =
static_cast(iter->second.string_value().length());
+size += GetFTLVLength(kValueScriptValue, val_length);
+}
+}
+} while (0);
+
+return size;
[GitHub] Luis-X opened a new issue #1823: 用了weex被AppStore下架了
Luis-X opened a new issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823 2018年11月27日 上午8:04 发件人 Apple Hello, We are writing to let you know about new information regarding your app currently live on the App Store. Upon re-evaluation, we found that your app is not in compliance with the App Store Review Guidelines. Specifically, we found: Performance - 2.5.2 Your app, extension, or linked framework appears to contain code designed explicitly with the capability to change your app’s behavior or functionality after App Review approval, which is not in compliance with App Store Review Guideline 2.5.2 and section 3.3.2 of the Apple Developer Program License Agreement. For this reason, your app will be removed from sale on the App Store at this time. Deliberate disregard of the App Store Review Guidelines and attempts to deceive users or undermine the review process are unacceptable and is a direct violation Section 3.2(f) of the Apple Developer Program License Agreement. Continuing to violate the Terms & Conditions of the Apple Developer Program will result in the termination of your account, as well as any related or linked accounts, and the removal of all your associated apps from the App Store. Future submissions of this app may require a longer review time, and this app will not be eligible for an expedited review. If you have any questions about this information, please reply to this message to let us know. Best regards, App Store Review 使用了weex动态分发页面，被下架了，有遇到相同情况的吗？ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] jianhan-he closed pull request #1801: [core] add script section in opcode file
jianhan-he closed pull request #1801: [core] add script section in opcode file
URL: https://github.com/apache/incubator-weex/pull/1801
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 4a04c1443b..3cd20f9b8a 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -485,7 +485,7 @@ - (void)_renderWithRequest:(WXResourceRequest *)request
options:(NSDictionary *)
newOptions[bundleUrlOptionKey] = url.absoluteString;
}
-if ([url.absoluteString hasSuffix:WEEX_LITE_URL_SUFFIX]) {
+if ([url.absoluteString hasSuffix:WEEX_LITE_URL_SUFFIX] ||
[url.absoluteString containsString:@"__eagle=true"]) {
newOptions[@"WLASM_RENDER"] = @(YES);
}
@@ -549,7 +549,7 @@ - (void)_renderWithRequest:(WXResourceRequest *)request
options:(NSDictionary *)
return;
}
-if (([options[@"DATA_RENDER"] boolValue] &&
[options[@"RENDER_WITH_BINARY"] boolValue]) || [options[@"WLASM_RENDER"]
boolValue]) {
+if (([newOptions[@"DATA_RENDER"] boolValue] &&
[newOptions[@"RENDER_WITH_BINARY"] boolValue]) || [newOptions[@"WLASM_RENDER"]
boolValue]) {
[strongSelf _renderWithData:data];
return;
}
diff --git a/weex_core/Source/core/data_render/exec_state_binary.cc
b/weex_core/Source/core/data_render/exec_state_binary.cc
index 0b19a00818..6c57c81053 100644
--- a/weex_core/Source/core/data_render/exec_state_binary.cc
+++ b/weex_core/Source/core/data_render/exec_state_binary.cc
@@ -69,6 +69,11 @@ bool ExecStateEncoder::encoding(std::string ) {
err = "data section encoding error";
break;
}
+SectionScript script(this);
+if (!script.encoding()) {
+err = "script section encoding error";
+break;
+}
SectionFunction function(this, gs_op_code_bits);
if (!function.encoding()) {
err = "function section encoding error";
@@ -160,6 +165,14 @@ bool ExecStateDecoder::decoding(std::string ) {
}
break;
}
+case ExecSection::EXEC_SECTION_SCRIPT:
+{
+SectionScript script(this, section_length);
+if (!script.decoding()) {
+throw EncoderError("script section decoding
error");
+}
+break;
+}
case ExecSection::EXEC_SECTION_FUNCTION:
{
SectionFunction function(this, gs_op_code_bits,
section_length);
diff --git a/weex_core/Source/core/data_render/exec_state_section.cc
b/weex_core/Source/core/data_render/exec_state_section.cc
index b68ea2f068..22ade17194 100644
--- a/weex_core/Source/core/data_render/exec_state_section.cc
+++ b/weex_core/Source/core/data_render/exec_state_section.cc
@@ -1274,6 +1274,69 @@ bool SectionData::decoding() {
return finished;
}
+
+uint32_t SectionScript::size() {
+ExecState *exec_state = encoder()->exec_state();
+const json11::Json& script = exec_state->context()->raw_json()["script"];
+std::string script_string = script.string_value();
+uint32_t size = 0;
+if (!script_string.empty()) {
+size += GetFTLVLength(kValueScriptPayload,
(uint32_t)script_string.length());
+}
+return size;
+}
+
+bool SectionScript::encoding() {
+uint32_t size = this->size();
+if (!size) {
+return true;
+}
+if (!Section::encoding((uint16_t)ExecSection::EXEC_SECTION_SCRIPT, size)) {
+return false;
+}
+ExecState *exec_state = encoder()->exec_state();
+const json11::Json& script = exec_state->context()->raw_json()["script"];
+std::string script_string = script.string_value();
+
+uint32_t length = (uint32_t)script_string.length();
+if (!Section::encoding(kValueScriptPayload, length, (void
*)script_string.c_str())) {
+return false;
+}
+return true;
+}
+
+bool SectionScript::decoding() {
+fStream *stream = Section::stream();
+if (!stream) {
+return false;
+}
+if (stream->Tell() < 0) {
+return false;
+}
+uint16_t vindex = 0;
+uint32_t varlen = stream->ReadTarget(, NULL, NULL);
+if (vindex != kValueScriptPayload) {
+return false;
+}
+if (varlen == 0) {
+std::string str = "";
+decoder()->exec_state()->context()->set_script(str);
+return true;
+}
+char *pstr = (char *)malloc(varlen + 1);
+
[GitHub] Luis-X commented on issue #1823: 用了weex被AppStore下架了
Luis-X commented on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441945101 > Do you still have other dynamic fixes? Like js patch? Weex did not appear to be removed we app not used JSPatch. only use weex This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] wqyfavor commented on issue #1823: 用了weex被AppStore下架了
wqyfavor commented on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441944889 你们最近有发布改动非常大的页面吗？应用都上架了，怎么会被苹果发现？ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr commented on issue #1823: 用了weex被AppStore下架了
zshshr commented on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441944756 Do you still have other dynamic fixes? Like js patch? Weex did not appear to be removed This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1824: [Android] fix WXpageActivity class on playground app
weex-bot edited a comment on issue #1824: [Android] fix WXpageActivity class on playground app URL: https://github.com/apache/incubator-weex/pull/1824#issuecomment-441947065 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] erha19 opened a new pull request #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
erha19 opened a new pull request #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825 Changed: - replace `IWXDebugProxy` as `WXSDKInstance` class. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] Darin726 commented on issue #1565: 异常如下：java.lang.UnsatisfiedLinkError: No implementation found for boolean
Darin726 commented on issue #1565: 异常如下：java.lang.UnsatisfiedLinkError: No implementation found for boolean URL: https://github.com/apache/incubator-weex/issues/1565#issuecomment-441955514 Hi x86 has been supported in the latest code. Please try it again This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr commented on issue #1810: 如何动态的移除和添加一个普通 div ？
zshshr commented on issue #1810: 如何动态的移除和添加一个普通 div ？ URL: https://github.com/apache/incubator-weex/issues/1810#issuecomment-441946247 http://dotwe.org/vue/ca5ef0dd40e57d3aa6c3ec8f24752a3d This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] zshshr closed issue #1810: 如何动态的移除和添加一个普通 div ？
zshshr closed issue #1810: 如何动态的移除和添加一个普通 div ？ URL: https://github.com/apache/incubator-weex/issues/1810 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] YorkShen closed pull request #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
YorkShen closed pull request #1825: [Android] replace IWXDebugProxy as
WXSDKInstance class
URL: https://github.com/apache/incubator-weex/pull/1825
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
index 01f496de5b..28a36e3b0c 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
@@ -54,18 +54,14 @@
import com.alibaba.weex.https.WXRequestListener;
import com.taobao.weex.IWXRenderListener;
import com.taobao.weex.RenderContainer;
-import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKEngine;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
-import com.taobao.weex.bridge.WXBridgeManager;
-import com.taobao.weex.common.IWXDebugProxy;
import com.taobao.weex.common.WXRenderStrategy;
import com.taobao.weex.ui.component.NestedContainer;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXVContainer;
import com.taobao.weex.utils.WXFileUtils;
-import com.taobao.weex.utils.WXJsonUtils;
import com.taobao.weex.utils.WXLogUtils;
import java.io.File;
@@ -188,7 +184,7 @@ public void run() {
ctx.getWindow().getDecorView().getWindowVisibleDisplayFrame(outRect);
mConfigMap.put("bundleUrl", mUri.toString());
String path = "file".equals(mUri.getScheme()) ? assembleFilePath(mUri)
: mUri.toString();
-mInstance.render(TAG, WXFileUtils.loadAsset(path, WXPageActivity.this),
+mInstance.render(path, WXFileUtils.loadAsset(path,
WXPageActivity.this),
mConfigMap, null,
WXRenderStrategy.APPEND_ASYNC);
}
@@ -248,8 +244,13 @@ private void loadWXfromService(final String url) {
public void onSuccess(WXHttpTask task) {
Log.i(TAG, "into--[http:onSuccess] url:" + url);
try {
+ Uri uri = Uri.parse(url);
mConfigMap.put("bundleUrl", url);
- mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
+ if (uri.getPath().endsWith(".wlasm")){
+mInstance.render(TAG, task.response.data, mConfigMap, null);
+ } else {
+mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
+ }
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
@@ -532,8 +533,8 @@ protected void onStop() {
private void registerBroadcastReceiver() {
mReceiver = new RefreshBroadcastReceiver();
IntentFilter filter = new IntentFilter();
-filter.addAction(IWXDebugProxy.ACTION_DEBUG_INSTANCE_REFRESH);
-filter.addAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
+filter.addAction(WXSDKInstance.ACTION_DEBUG_INSTANCE_REFRESH);
+filter.addAction(WXSDKInstance.ACTION_INSTANCE_RELOAD);
registerReceiver(mReceiver, filter);
}
@@ -603,8 +604,8 @@ public boolean setNavBarTitle(String param) {
public class RefreshBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- if (IWXDebugProxy.ACTION_INSTANCE_RELOAD.equals(intent.getAction()) ||
-
IWXDebugProxy.ACTION_DEBUG_INSTANCE_REFRESH.equals(intent.getAction())) {
+ if (WXSDKInstance.ACTION_INSTANCE_RELOAD.equals(intent.getAction()) ||
+
WXSDKInstance.ACTION_DEBUG_INSTANCE_REFRESH.equals(intent.getAction())) {
// String myUrl = intent.getStringExtra("url");
// Log.e("WXPageActivity", "RefreshBroadcastReceiver reload onReceive
ACTION_DEBUG_INSTANCE_REFRESH mBundleUrl:" + myUrl + " mUri:" + mUri);
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[incubator-weex] branch master updated: [Android] replace IWXDebugProxy as WXSDKInstance class (#1825)
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 6245093 [Android] replace IWXDebugProxy as WXSDKInstance class (#1825)
6245093 is described below
commit 624509345f0937d127fa56f9b2a7ef7c432df0ce
Author: Mario
AuthorDate: Tue Nov 27 15:22:42 2018 +0800
[Android] replace IWXDebugProxy as WXSDKInstance class (#1825)
---
.../main/java/com/alibaba/weex/WXPageActivity.java | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git
a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
index 01f496d..28a36e3 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
@@ -54,18 +54,14 @@ import com.alibaba.weex.https.WXHttpTask;
import com.alibaba.weex.https.WXRequestListener;
import com.taobao.weex.IWXRenderListener;
import com.taobao.weex.RenderContainer;
-import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKEngine;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
-import com.taobao.weex.bridge.WXBridgeManager;
-import com.taobao.weex.common.IWXDebugProxy;
import com.taobao.weex.common.WXRenderStrategy;
import com.taobao.weex.ui.component.NestedContainer;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXVContainer;
import com.taobao.weex.utils.WXFileUtils;
-import com.taobao.weex.utils.WXJsonUtils;
import com.taobao.weex.utils.WXLogUtils;
import java.io.File;
@@ -188,7 +184,7 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
ctx.getWindow().getDecorView().getWindowVisibleDisplayFrame(outRect);
mConfigMap.put("bundleUrl", mUri.toString());
String path = "file".equals(mUri.getScheme()) ? assembleFilePath(mUri)
: mUri.toString();
-mInstance.render(TAG, WXFileUtils.loadAsset(path, WXPageActivity.this),
+mInstance.render(path, WXFileUtils.loadAsset(path,
WXPageActivity.this),
mConfigMap, null,
WXRenderStrategy.APPEND_ASYNC);
}
@@ -248,8 +244,13 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
public void onSuccess(WXHttpTask task) {
Log.i(TAG, "into--[http:onSuccess] url:" + url);
try {
+ Uri uri = Uri.parse(url);
mConfigMap.put("bundleUrl", url);
- mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
+ if (uri.getPath().endsWith(".wlasm")){
+mInstance.render(TAG, task.response.data, mConfigMap, null);
+ } else {
+mInstance.render(TAG, new String(task.response.data, "utf-8"),
mConfigMap, null, WXRenderStrategy.APPEND_ASYNC);
+ }
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
@@ -532,8 +533,8 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
private void registerBroadcastReceiver() {
mReceiver = new RefreshBroadcastReceiver();
IntentFilter filter = new IntentFilter();
-filter.addAction(IWXDebugProxy.ACTION_DEBUG_INSTANCE_REFRESH);
-filter.addAction(IWXDebugProxy.ACTION_INSTANCE_RELOAD);
+filter.addAction(WXSDKInstance.ACTION_DEBUG_INSTANCE_REFRESH);
+filter.addAction(WXSDKInstance.ACTION_INSTANCE_RELOAD);
registerReceiver(mReceiver, filter);
}
@@ -603,8 +604,8 @@ public class WXPageActivity extends WXBaseActivity
implements IWXRenderListener,
public class RefreshBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- if (IWXDebugProxy.ACTION_INSTANCE_RELOAD.equals(intent.getAction()) ||
-
IWXDebugProxy.ACTION_DEBUG_INSTANCE_REFRESH.equals(intent.getAction())) {
+ if (WXSDKInstance.ACTION_INSTANCE_RELOAD.equals(intent.getAction()) ||
+
WXSDKInstance.ACTION_DEBUG_INSTANCE_REFRESH.equals(intent.getAction())) {
// String myUrl = intent.getStringExtra("url");
// Log.e("WXPageActivity", "RefreshBroadcastReceiver reload onReceive
ACTION_DEBUG_INSTANCE_REFRESH mBundleUrl:" + myUrl + " mUri:" + mUri);
[GitHub] Luis-X commented on issue #1823: 用了weex被AppStore下架了
Luis-X commented on issue #1823: 用了weex被AppStore下架了 URL: https://github.com/apache/incubator-weex/issues/1823#issuecomment-441955018 > 你们最近有发布改动非常大的页面吗？应用都上架了，怎么会被苹果发现？ > 如果有问题可以留一下电话，详细沟通一下。  This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1827: [core] add script section in opcode file
weex-bot edited a comment on issue #1827: [core] add script section in opcode file URL: https://github.com/apache/incubator-weex/pull/1827#issuecomment-441957103 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot commented on issue #1827: [core] add script section in opcode file
weex-bot commented on issue #1827: [core] add script section in opcode file URL: https://github.com/apache/incubator-weex/pull/1827#issuecomment-441957103 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] jianhan-he opened a new pull request #1827: [core] add script section in opcode file
jianhan-he opened a new pull request #1827: [core] add script section in opcode file URL: https://github.com/apache/incubator-weex/pull/1827 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] qzcsgs closed issue #1826: Vuex, web, must call Vue.use(Vuex) before creating a store instance
qzcsgs closed issue #1826: Vuex, web, must call Vue.use(Vuex) before creating a store instance URL: https://github.com/apache/incubator-weex/issues/1826 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[incubator-weex] branch master updated: [Android] fix WXpageActivity class on playground app (#1824)
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 fa82778 [Android] fix WXpageActivity class on playground app (#1824) fa82778 is described below commit fa827785f718bf4cb3d643acbe583849a0dbb587 Author: Mario AuthorDate: Tue Nov 27 14:59:07 2018 +0800 [Android] fix WXpageActivity class on playground app (#1824) * [Android] support for hot updates under specified ports * [Android] fix WXpageActivity class on playground app
[GitHub] YorkShen closed pull request #1824: [Android] fix WXpageActivity class on playground app
YorkShen closed pull request #1824: [Android] fix WXpageActivity class on
playground app
URL: https://github.com/apache/incubator-weex/pull/1824
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
index 8a5408daf8..28a36e3b0c 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXPageActivity.java
@@ -70,6 +70,8 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class WXPageActivity extends WXBaseActivity implements
IWXRenderListener, Handler.Callback, WXSDKInstance.NestedInstanceInterceptor {
@@ -270,14 +272,28 @@ public void onError(WXHttpTask task) {
*/
private void startHotRefresh() {
try {
- String host = new URL(mUri.toString()).getHost();
- String wsUrl = "ws://" + host + ":8082";
+ URL url = new URL(mUri.toString());
+ String host = url.getHost();
+ String query = url.getQuery();
+ String wsport = getUrlParam("wsport", query);
+ String wsUrl = "ws://" + host + ":" + (wsport.equals("") ? "8082" :
wsport) ;
mWXHandler.obtainMessage(Constants.HOT_REFRESH_CONNECT, 0, 0,
wsUrl).sendToTarget();
} catch (MalformedURLException e) {
e.printStackTrace();
}
}
+ private String getUrlParam(String key, String queryString) {
+String regex = "[?|&]?" + key + "=([^&]+)";
+Pattern p = Pattern.compile(regex);
+Matcher matcher = p.matcher(queryString);
+if (matcher.find()) {
+ return matcher.group(1);
+} else {
+ return "";
+}
+ }
+
private void addOnListener() {
}
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] qzcsgs opened a new issue #1826: Vuex, web, must call Vue.use(Vuex) before creating a store instance
qzcsgs opened a new issue #1826: Vuex, web, must call Vue.use(Vuex) before
creating a store instance
URL: https://github.com/apache/incubator-weex/issues/1826
## web end Vuex
```js
/* global Vue */
/* weex initialized here, please do not move this line */
import router from './router'
import store from '@/store/index'
import App from '@/index'
// Vuex is auto installed on the web
if (WXEnvironment.platform !== 'Web') {
Vue.use(store)
}
/* eslint-disable no-new */
new Vue(Vue.util.extend({el: '#root', router, store}, App))
```
error message `[vuex] must call Vue.use(Vuex) before creating a store
instance`
```json
{
"vue": "^2.5.11",
"vue-router": "^3.0.1",
"vuex": "^3.0.1",
"weex-vue-render": "^1.0.17"
}
```
`macOS v10.13.4`
`weex v1.3.11`
`weexpack : v1.2.7`
`weex-builder : v0.4.0`
`weex-previewer : v1.5.1`
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] weex-bot commented on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class
weex-bot commented on issue #1825: [Android] replace IWXDebugProxy as WXSDKInstance class URL: https://github.com/apache/incubator-weex/pull/1825#issuecomment-441953152 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1827: [core] add script section in opcode file
weex-bot edited a comment on issue #1827: [core] add script section in opcode file URL: https://github.com/apache/incubator-weex/pull/1827#issuecomment-441957103 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] erha19 opened a new pull request #1820: [Android] support for hot updates under specified ports
erha19 opened a new pull request #1820: [Android] support for hot updates under specified ports URL: https://github.com/apache/incubator-weex/pull/1820 Feature: - support for hot updates under specified ports. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1820: [Android] support for hot updates under specified ports
weex-bot edited a comment on issue #1820: [Android] support for hot updates under specified ports URL: https://github.com/apache/incubator-weex/pull/1820#issuecomment-441626843 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot commented on issue #1819: [iOS] Use libc++.
weex-bot commented on issue #1819: [iOS] Use libc++. URL: https://github.com/apache/incubator-weex/pull/1819#issuecomment-441613304 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1819: [iOS] Use libc++.
weex-bot edited a comment on issue #1819: [iOS] Use libc++. URL: https://github.com/apache/incubator-weex/pull/1819#issuecomment-441613304 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1819: [iOS] Use libc++.
weex-bot edited a comment on issue #1819: [iOS] Use libc++. URL: https://github.com/apache/incubator-weex/pull/1819#issuecomment-441613304 Messages :book: No android file has been changed. :book: android build verification finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] cxfeng1 closed pull request #1819: [iOS] Use libc++.
cxfeng1 closed pull request #1819: [iOS] Use libc++.
URL: https://github.com/apache/incubator-weex/pull/1819
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
index 7f594c415f..d456a1b5d2 100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@ -53,7 +53,7 @@ Pod::Spec.new do |s|
w.xcconfig = { 'USER_HEADER_SEARCH_PATHS' =>
['${PODS_ROOT}/Headers/Public/WeexSDK/core/**'] }
w.header_mappings_dir = 'weex_core/Source'
-w.libraries = "stdc++"
+w.libraries = "c++"
end
end
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[incubator-weex] branch master updated: [iOS] Use libc++. (#1819)
This is an automated email from the ASF dual-hosted git repository.
cxfeng 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 1e757cd [iOS] Use libc++. (#1819)
1e757cd is described below
commit 1e757cdfcbae827c98696c2fc24ac15621356c11
Author: wqyfavor
AuthorDate: Mon Nov 26 20:04:44 2018 +0800
[iOS] Use libc++. (#1819)
---
WeexSDK.podspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
index 7f594c4..d456a1b 100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@ -53,7 +53,7 @@ Pod::Spec.new do |s|
w.xcconfig = { 'USER_HEADER_SEARCH_PATHS' =>
['${PODS_ROOT}/Headers/Public/WeexSDK/core/**'] }
w.header_mappings_dir = 'weex_core/Source'
-w.libraries = "stdc++"
+w.libraries = "c++"
end
end
[GitHub] wqyfavor opened a new pull request #1819: [iOS] Use libc++.
wqyfavor opened a new pull request #1819: [iOS] Use libc++. URL: https://github.com/apache/incubator-weex/pull/1819 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. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot edited a comment on issue #1820: [Android] support for hot updates under specified ports
weex-bot edited a comment on issue #1820: [Android] support for hot updates under specified ports URL: https://github.com/apache/incubator-weex/pull/1820#issuecomment-441626843 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] weex-bot commented on issue #1820: [Android] support for hot updates under specified ports
weex-bot commented on issue #1820: [Android] support for hot updates under specified ports URL: https://github.com/apache/incubator-weex/pull/1820#issuecomment-441626843 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
