Browse Source

Merge branch 'hotfix/修复dpi拼写错误' of Software/android-cloud-H5 into develop

zengzhixiang 2 years ago
parent
commit
0fac237f48
2 changed files with 6 additions and 6 deletions
  1. 3 3
      static/screenAndroid/WXdraw.js
  2. 3 3
      static/screenIos/WXdraw.js

+ 3 - 3
static/screenAndroid/WXdraw.js

@@ -154,7 +154,7 @@ function doConnectDirectives() {
             id: result.data.id,
             id: result.data.id,
             width: result.data.width,
             width: result.data.width,
             height: result.data.height,
             height: result.data.height,
-            pid: result.data.pid,
+            dpi: result.data.dpi,
           };
           };
           return;
           return;
         }
         }
@@ -199,13 +199,13 @@ function doConnectDirectives() {
         return (
         return (
           v.width === Math.min(result.data.width, result.data.height) &&
           v.width === Math.min(result.data.width, result.data.height) &&
           v.height === Math.max(result.data.width, result.data.height) &&
           v.height === Math.max(result.data.width, result.data.height) &&
-          v.pid === result.data.pid
+          v.dpi === result.data.dpi
         );
         );
       });
       });
       window.currentPhoneSize = data || {
       window.currentPhoneSize = data || {
         width: Math.min(result.data.width, result.data.height),
         width: Math.min(result.data.width, result.data.height),
         height: Math.max(result.data.width, result.data.height),
         height: Math.max(result.data.width, result.data.height),
-        pid: result.data.pid,
+        dpi: result.data.dpi,
       };
       };
       return;
       return;
     }
     }

+ 3 - 3
static/screenIos/WXdraw.js

@@ -163,7 +163,7 @@ function doConnectDirectives() {
             id: result.data.id,
             id: result.data.id,
             width: result.data.width,
             width: result.data.width,
             height: result.data.height,
             height: result.data.height,
-            pid: result.data.pid,
+            dpi: result.data.dpi,
           };
           };
           return;
           return;
         }
         }
@@ -208,13 +208,13 @@ function doConnectDirectives() {
         return (
         return (
           v.width === Math.min(result.data.width, result.data.height) &&
           v.width === Math.min(result.data.width, result.data.height) &&
           v.height === Math.max(result.data.width, result.data.height) &&
           v.height === Math.max(result.data.width, result.data.height) &&
-          v.pid === result.data.pid
+          v.dpi === result.data.dpi
         );
         );
       });
       });
       window.currentPhoneSize = data || {
       window.currentPhoneSize = data || {
         width: Math.min(result.data.width, result.data.height),
         width: Math.min(result.data.width, result.data.height),
         height: Math.max(result.data.width, result.data.height),
         height: Math.max(result.data.width, result.data.height),
-        pid: result.data.pid,
+        dpi: result.data.dpi,
       };
       };
       return;
       return;
     }
     }