ios发布的环境变更

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="online.hubeidiyi" version="2.3.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.witium.muchang" version="2.3.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>牧场云</name>
     <description>牧场物业管理系统</description>
-    <author email="van_chen@foxmail.com" href="http://hubeidiyi.online/">Van.chen</author>
+    <author email="van_chen@foxmail.com" href="http://muchang.witium.com/">Van.chen</author>
     <content src="index.html" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
@@ -52,16 +52,13 @@
         <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
         <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
         <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
-        <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
+        <icon height="120" src="resources/ios/icon/icon-601@2.png" width="120" />
         <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
         <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
         <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
         <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
         <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
         <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
-        <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
-        <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
-        <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
         <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
         <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
@@ -75,13 +72,11 @@
         <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
         <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
         <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
-        <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
     </platform>
     <plugin name="cordova-plugin-whitelist" spec="1.3.3" />
     <plugin name="cordova-plugin-statusbar" spec="2.4.2" />
     <plugin name="cordova-plugin-device" spec="2.0.2" />
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
-    <plugin name="cordova-plugin-ionic-webview" spec="^3.0.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
     <plugin name="cordova-plugin-appminimize" spec="1.0.1" />
     <engine name="android" spec="7.1.4" />

package.json

@@ -34,7 +34,7 @@
     "cordova-plugin-badge": "0.8.8",
     "cordova-plugin-device": "2.0.2",
     "cordova-plugin-ionic-keyboard": "^2.0.5",
-    "cordova-plugin-ionic-webview": "^3.0.0",
+    "cordova-plugin-ionic-webview": "^4.1.0",
     "cordova-plugin-local-notification": "0.9.0-beta.2",
     "cordova-plugin-screen-orientation": "^3.0.1",
     "cordova-plugin-splashscreen": "5.0.2",
@@ -80,11 +80,13 @@
       "cordova-plugin-statusbar": {},
       "cordova-plugin-device": {},
       "cordova-plugin-splashscreen": {},
-      "cordova-plugin-ionic-webview": {},
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-appminimize": {},
       "cordova-plugin-screen-orientation": {},
-      "cordova-plugin-local-notification": {}
+      "cordova-plugin-local-notification": {},
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      }
     },
     "platforms": [
       "android",

src/app/login/login.page.html

@@ -12,6 +12,11 @@
       <div class="labelForInput"><i class="vo v-mima"></i></div>
       <ion-input type="password" [(ngModel)]="req.ps" mode="ios" class="input"></ion-input>
     </div>
+    <div class="inputLine">
+      <ion-checkbox  color="primary" [(ngModel)]="saveMimaCheck"></ion-checkbox>
+      <ion-label class="input" style="margin-left: 15px;vertical-align: center;font-size: 23px;color: #777;padding-bottom: 13px">记住密码</ion-label>
+    </div>
+
     <!--<ion-button mode="ios" color="primary" style="background-color: #28c9bd;color: #ffffff;border: 1px solid #ffffff;" expand="block" class="loginBtn" (click)="login()">Login</ion-button>-->
     <div Button class="loginBtn" [disabled]="!req.ps || !req.name" (click)="login()" [type]="'primary'" style="letter-spacing: 2px">立即登录</div>
   </div>

src/app/login/login.page.ts

@@ -13,12 +13,21 @@ import {Load} from '../service/load';
 })
 export class LoginPage implements OnInit {
     req = {name: '', ps: ''};
+    saveMimaCheck = false;
 
     constructor(private tf: Transfer, private api: Api, private load: Load, private mqtt: Mqtt) {
     }
 
     ngOnInit() {
         this.load.offLoad();
+
+        if (window.localStorage.getItem('muchangUsername') != null) {
+            this.req.name = window.localStorage.getItem('muchangUsername');
+        }
+
+        if (window.localStorage.getItem('muchangPassword') != null) {
+            this.req.ps = window.localStorage.getItem('muchangPassword');
+        }
     }
 
     login() {
@@ -26,11 +35,17 @@ export class LoginPage implements OnInit {
             userName: this.req.name,
             password: this.req.ps
         };
+
         this.api.login.login([req, (data) => {
             if (data.code === 1) {
                 window.localStorage.setItem('token', data.message);
                 this.tf.transfer({url: '/index'});
                 this.mqtt.getUserInfo();
+
+                if(this.saveMimaCheck === true) {
+                    window.localStorage.setItem('muchangUsername', this.req.name);
+                    window.localStorage.setItem('muchangPassword', this.req.ps);
+                }
             } else {
                 this.api.presentMsgToast(data && data.message ? data.message : '登录失败');
             }

src/app/mine/mine.page.html

@@ -34,7 +34,7 @@
     <div Button class="button" (click)="loginOut()" [type]="'primary'" style="letter-spacing: 2px">退出登录</div>
   </div>
   <div style="position: fixed;bottom: 20px;display: inline-block;width: 100%;text-align: center;color: #666666;font-size: 14px;">
-    版本信息: v2.3.0
+    版本信息: v2.3.1
   </div>
 </div>
 

src/app/mine/mine.page.ts

@@ -32,6 +32,8 @@ export class MinePage implements OnInit {
         this.api.login.logout(['', (data) => {
             if (data) {
                 window.localStorage.removeItem('token');
+                window.localStorage.removeItem('muchangUsername');
+                window.localStorage.removeItem('muchangPassword');
                 this.tf.transfer({url: '/login'});
             } else {
                 this.api.presentMsgToast(data && data.message ? data.message : '登录失败');

src/environments/environment.ts

@@ -3,14 +3,18 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-  production: false,
+  // production: false,
   // url: 'http://pasture.witium.com.cn/api', // 对外访问测试网地址
   // url: 'http://cloud-test.witium.com:8096', // 测试
   // url: 'http://172.16.1.53:8097', // cy
   // url: 'http://172.16.1.52:8096', // zz
-  url: 'http://172.16.1.13:8096', // 测试
-  mqttUrl: '172.16.1.24',
+  // url: 'http://172.16.1.13:8096', // 测试
+  // mqttUrl: '172.16.1.24',
   // mqttUrl: '120.27.235.39'
+  production: true,
+  url: 'http://pasture.witium.com/api', // 对外访问测试网地址
+  // url: 'http://172.16.1.13:8096', // 测试
+  mqttUrl: '120.27.235.39'
 };
 
 /*