更新版本1.0.20，自主上传app

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.ionicframework.sgZongLi" version="1.0.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.ionicframework.sgZongLi" version="1.0.20" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SG综礼</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
@@ -99,5 +99,4 @@
     <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="^4.0.0" />
-    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
 </widget>

prod.sh

@@ -13,9 +13,10 @@ echo '{
 
 #sed -e "s@1@$cversion_old@g" -i version.json
 
-ionic cordova build android --prod
+# ionic cordova build android --prod
 
-mv  ./platforms/android/app/build/outputs/apk/debug/app-debug.apk  ./sgApp.apk
+# mv  ./platforms/android/app/build/outputs/apk/debug/app-debug.apk  ./sgApp.apk
+mv  ./app-debug.apk  ./sgApp.apk
 
 scp -r ./sgApp.apk root@192.168.20.16:/usr/app
 

src/providers/user-data.ts

@@ -187,7 +187,7 @@ export class UserData {
       from(this.nativeHttp.post(`${environment.APP_SERVE_URL}/production/sample/factory/pCode`,
         data,
         headers)).pipe(
-          finalize(() => { })
+          finalize(() => loading.dismiss() )
         ).subscribe(async data => {
           if (JSON.parse(data.data).code == 1) {
             const toast = await this.toastCtrl.create({
@@ -223,7 +223,7 @@ export class UserData {
       from(this.nativeHttp.post(`${environment.APP_SERVE_URL}/production/sample/factory/details/`,
         data,
         headers)).pipe(
-          finalize(() => { })
+          finalize(() => loading.dismiss())
         ).subscribe(async data => {
           let message = ''
           if (JSON.parse(data.data).code == 1) {
@@ -356,14 +356,14 @@ export class UserData {
   // 获取样品单QA详情
   async getSampleQAlog(sdpId: Number): Promise<any> {
     const token = await this.getToken();
-    // let loading = await this.loadingCtrl.create();
-    // await loading.present();
+    let loading = await this.loadingCtrl.create();
+    await loading.present();
     this.nativeHttp.setDataSerializer('json');
     const headers = { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json;charset=UTF-8' };
     return new Promise((resolve, reject) => {
       from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/production/samples/mobile/qalog/${sdpId}`, {},
         headers)).pipe(
-          finalize(() => { })
+          finalize(() => loading.dismiss())
         ).subscribe(async data => {
           resolve(data.data);
         }, async err => {