[Android] Avoid duplicated call of setViewPort (#2764)

apache · Aug 1, 2019 · b2a455a · b2a455a
1 parent b943ea4
commit b2a455a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -452,9 +452,15 @@ public void setUseScroller(boolean use) {
   }
 
   public void setInstanceViewPortWidth(int instanceViewPortWidth) {
+    setInstanceViewPortWidth(instanceViewPortWidth,false);
+
+  }
+  public void setInstanceViewPortWidth(int instanceViewPortWidth,boolean fromMetaModule){
     this.mInstanceViewPortWidth = instanceViewPortWidth;
     this.mAutoAdjustDeviceWidth = false;
-    WXBridgeManager.getInstance().setViewPortWidth(getInstanceId(),mInstanceViewPortWidth);
+    if(!fromMetaModule){
+      WXBridgeManager.getInstance().setViewPortWidth(getInstanceId(), mInstanceViewPortWidth);
+    }
   }
 
   public void setAutoAdjustDeviceWidth(boolean autoAdjustViewPort){

diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java
@@ -60,12 +60,12 @@ public void setViewport(String param) {
                 // todo maybe getString(WIDTH) is "device-height"
                 if (DEVICE_WIDTH.endsWith(jsObj.getString(WIDTH))) {
                     int width = (int)(WXViewUtils.getScreenWidth(cxt)/WXViewUtils.getScreenDensity(cxt));
-                    mWXSDKInstance.setInstanceViewPortWidth(width);
+                    mWXSDKInstance.setInstanceViewPortWidth(width,true);
                     WXLogUtils.d("[WXMetaModule] setViewport success[device-width]=" + width);
                 } else {
                     int width = jsObj.getInteger(WIDTH);
                     if (width > 0) {
-                        mWXSDKInstance.setInstanceViewPortWidth(width);
+                        mWXSDKInstance.setInstanceViewPortWidth(width,true);
                     }
                     WXLogUtils.d("[WXMetaModule] setViewport success[width]=" + width);
                 }