From: qiaowei <jov123@163.com>
Date: Mon, 2 Dec 2019 06:14:09 +0000 (+0800)
Subject: 修改安卓版本问题
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=596b36b7eb576a403d34234727c4d78c5db581dc;p=dali_platform%2Fmobile.git

修改安卓版本问题
---

diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
index 3a20b4b..5b518d8 100644
--- a/platforms/android/app/build.gradle
+++ b/platforms/android/app/build.gradle
@@ -173,6 +173,10 @@ android {
         ndk {
             abiFilters "armeabi"
         }
+        versionCode 10
+        versionName '1.3.6'
+        versionNameSuffix 'v1'
+        targetSdkVersion 26
     }
     lintOptions {
         abortOnError false;
diff --git a/platforms/android/app/release/app-release.apk b/platforms/android/app/release/app-release.apk
index db6bf3c..64af5de 100644
Binary files a/platforms/android/app/release/app-release.apk and b/platforms/android/app/release/app-release.apk differ
diff --git a/platforms/android/app/release/output.json b/platforms/android/app/release/output.json
index 6e993a2..8aa304e 100644
--- a/platforms/android/app/release/output.json
+++ b/platforms/android/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10004,"versionName":"1.0.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.3.6v1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml
index 107ebba..9b5f879 100644
--- a/platforms/android/app/src/main/AndroidManifest.xml
+++ b/platforms/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10004" android:versionName="1.0.4" package="com.dalicitycard.app" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10004" android:versionName="1.0.4" package="com.dalicitycard.app"
+          xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/launcher_name" android:supportsRtl="true">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
diff --git a/www/js/main.js b/www/js/main.js
index 4d55357..e0a358f 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -92,18 +92,18 @@ var app = {
             })
         });
         $('#secBtn').click(function() {
-            window.location = "security.html";
-            /*app.checkBefore(function() {
+            //window.location = "security.html";
+            app.checkBefore(function() {
                 app.checkOther(function() {
                     window.location = "security.html";
                 })
-            })*/
+            })
         });
-        $("#doorBtn").click(function(){
+        /*$("#doorBtn").click(function(){
             app.checkBefore(function() {
                 showRet(DOOR_URl);
             })
-        })
+        })*/
         $('#usersec').click(function() {
             app.checkBefore(function() {
                 app.checkOther(function() {
diff --git a/www/js/scan.js b/www/js/scan.js
index f331281..cc50c0b 100644
--- a/www/js/scan.js
+++ b/www/js/scan.js
@@ -33,11 +33,13 @@ var app = {
                     } else {
                         // The scan completed, display the contents of the QR code:
                         QRScanner.destroy();
+                        //$.alert(text, '提示');
                         showRet(text);
                     }
                 }
                 //开始扫描，需要将页面的背景设置成透明
                 QRScanner.show();
+                console.log("QRScanner.scan");
             } else if (status.denied) {
                 // The video preview will remain black, and scanning is disabled. We can
                 // try to ask the user to change their mind, but we'll have to send them
@@ -64,12 +66,12 @@ var app = {
         });
     },
     goPage: function() {
-        //QRScanner.destroy();
         window.location = "main.html"
     }
 };
 app.initialize();
-function showRet1(url){
+var inAppBrowserRef;
+function showRet(url){
   if(isEmpty(url)){
       return;
   }
@@ -99,22 +101,21 @@ function showRet1(url){
        }
      }
   });
+  //ref.show();
 }
 
-function showRet(url) {
+function showRet1(url) {
     if(isEmpty(url)){
         return;
     }
     var userid = window.localStorage.getItem("userid"); 
-    if (url.indexOf("yy.dlsmk.cn")>=0) {
-        if(url.indexOf("?")>0){
-            url=url+'&userid='+userid;
-        }else{
-            url=url+'?userid='+userid;
-        }
+    if(url.indexOf("?")>0){
+        url=url+'&userid='+userid;
+    }else{
+        url=url+'?userid='+userid;
     }
     console.log(url)
-    var inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', {
+    inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', {
         statusbar: {
             color: '#03a9f4ff'
         },
@@ -127,41 +128,82 @@ function showRet(url) {
             showPageTitle: true
         },
         backButton: {
-            image: 'back.png',
-            imagePressed: 'back.png',
+            wwwImage: 'img/back.png',
+            wwwImagePressed: 'img/back.png',
             align: 'left',
             event: 'backPressed'
         },
         closeButton: {
-            image: 'close.png',
-            imagePressed: 'close.png',
+            wwwImage: 'img/close.png',
+            wwwImagePressed: 'img/close.png',
             align: 'left',
             event: 'closePressed'
         },
         backButtonCanClose: true
-    }).addEventListener('loadstart', function(params){
-     if (params.url.indexOf("yy.dlsmk.cn")>=0) {
-       if (params.url.indexOf("userid")<0) {
-           if(params.url.indexOf("?")>0){
-               params.url=params.url+'&userid='+userid;
-           }else{
-               params.url=params.url+'?userid='+userid;
-           }
-           //ref.hide();
-           var neRef = cordova.ThemeableBrowser.open(params.url, '_blank');
-           neRef.addEventListener('closePressed', function(e){
-               neRef.close();
-               window.location = "main.html"
-           });
-       }
-     }
-  });
+    }).addEventListener('backPressed', function(e) {
+        //alert('back pressed');
+    }).addEventListener('closePressed', function(e) {
+        //alert('closePressed pressed');
+        inAppBrowserRef.close();
+        window.location = "main.html"
+    }).addEventListener(cordova.ThemeableBrowser.EVT_ERR, function(e) {
+        console.error(e.message);
+    }).addEventListener(cordova.ThemeableBrowser.EVT_WRN, function(e) {
+        console.log(e.message);
+    }).addEventListener('loadstart', function(params,e){
+      console.log("11111111"+JSON.stringify(params));
+      if (params.url.indexOf("yy.dlsmk.cn")>=0) {
+        if (params.url.indexOf("userid")<0) {
+            if(params.url.indexOf("?")>0){
+                params.url=params.url+'&userid='+userid;
+            }else{
+                params.url=params.url+'?userid='+userid;
+            }
+            inAppBrowserRef.close();
+            inAppBrowserRef = null;
+            openUrl(params.url);
+        }
+      }
+    });
     //inAppBrowserRef.addEventListener('loadstart', loadStartCallBack);
     //inAppBrowserRef.addEventListener('beforeload', beforeloadCallBack);
 }
-function loadStartCallBack(params,callback) {
-    console.log("1",params.url);
-}
-function beforeloadCallBack(params,callback) {
-    console.log("2",params.url);
+
+function openUrl(url){
+      inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', {
+          statusbar: {
+              color: '#03a9f4ff'
+          },
+          toolbar: {
+              height: 44,
+              color: '#03a9f4ff'
+          },
+          title: {
+              color: '#ffffffff',
+              showPageTitle: true
+          },
+          backButton: {
+              wwwImage: 'img/back.png',
+              wwwImagePressed: 'img/back.png',
+              align: 'left',
+              event: 'backPressed'
+          },
+          closeButton: {
+              wwwImage: 'img/close.png',
+              wwwImagePressed: 'img/close.png',
+              align: 'left',
+              event: 'closePressed'
+          },
+          backButtonCanClose: true
+      }).addEventListener('backPressed', function(e) {
+      }).addEventListener('closePressed', function(e) {
+          inAppBrowserRef.close();
+          window.location = "main.html"
+      }).addEventListener(cordova.ThemeableBrowser.EVT_ERR, function(e) {
+          console.error(e.message);
+      }).addEventListener(cordova.ThemeableBrowser.EVT_WRN, function(e) {
+          console.log(e.message);
+      }).addEventListener('loadstart', function(params,e){
+          console.log("333333"+JSON.stringify(params));
+      });
 }
diff --git a/www/main.html b/www/main.html
index e788ea0..3ade7e7 100644
--- a/www/main.html
+++ b/www/main.html
@@ -44,10 +44,10 @@
                             <div class="center-in"><img src="img/icon_securty.png" style="width:28px;height: 28px"></div>
                             <div class="aui-grid-label" style="margin-top:10px;">账户安全</div>
                         </div>
-                        <div class="aui-col-xs-4" id="doorBtn">
+                        <!--<div class="aui-col-xs-4" id="doorBtn">
                             <div class="center-in"><img src="img/icon_door.png" style="width:28px;height: 28px"></div>
                             <div class="aui-grid-label" style="margin-top:10px;">远程开门</div>
-                        </div>
+                        </div>-->
                     </div>
                 </div>
             </section>