发布29测试版本。极光推送弹窗，加app版本更新内容等。

android/app/agconnect-services.json

@@ -0,0 +1,110 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"10086000825843698",
+		"product_id":"461323198429007241",
+		"client_id":"1552775666473135936",
+		"client_secret":"47FFD8BD85586C5FEDFB95670D3340A07CD184C8FB31DA8D7CA7F35595081F48",
+		"project_id":"461323198429007241",
+		"app_id":"112528505",
+		"api_key":"DQEDAMXALyk2R40s5BG8HMQqzKxc18SzwA3iPE34czrp931ylX1rClL3wjs1gd+pPFAL3/Gf3b/dV/BslOL+5tqpRw5VjTwn01+KQA==",
+		"package_name":"com.szls.lszlgl"
+	},
+	"oauth_client":{
+		"client_id":"112528505",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"112528505",
+		"package_name":"com.szls.lszlgl"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.szls.lszlgl",
+			"client":{
+				"app_id":"112528505"
+			},
+			"app_info":{
+				"package_name":"com.szls.lszlgl",
+				"app_id":"112528505"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"112528505"
+			}
+		},
+		{
+			"package_name":"com.szls.lszlgl.debug",
+			"client":{
+				"app_id":"112525709"
+			},
+			"app_info":{
+				"package_name":"com.szls.lszlgl.debug",
+				"app_id":"112525709"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"112525709"
+			}
+		}
+	]
+}

android/app/build.gradle

@@ -102,6 +102,7 @@ android {
 
     productFlavors {
         develop {
+           // applicationId "com.szls.lszlgl.debug"
             dimension "default"
             manifestPlaceholders = [
                     APP_NAME     : "国粮质检-测试",
@@ -113,12 +114,13 @@ android {
             applicationIdSuffix ".debug"
         }
         product {
+           // applicationId "com.szls.lszlgl"
             dimension "default"
             manifestPlaceholders = [
                     APP_NAME     : "国粮质检",
                     // 极光 注意测试环境的 packagename 和appkey 均不一样
                     JPUSH_PKGNAME: "com.szls.lszlgl",
-                    JPUSH_APPKEY : "2f42e3db4d0083b0bc5a3f6c", // 正式环境appkey需要再申请
+                    JPUSH_APPKEY : "336425aac947172a06b70cbb", // 正式环境appkey需要再申请
                     JPUSH_CHANNEL: "developer-default"
             ]
         }

lib/config/pics.dart

@@ -90,4 +90,6 @@ const String imgIconQYDQ = 'assets/images/imgIconQYDQ.png';
 const String imgIconQYRY = 'assets/images/imgIconQYRY.png';
 const String imgIconYPDJ = 'assets/images/imgIconYPDJ.png';
 const String imgIconQYSJ = 'assets/images/imgIconQYSJ.png';
-const String imgIconEdit = 'assets/images/imgIconEdit.png';
+const String imgIconEdit = 'assets/images/imgIconEdit.png';
+
+const String imgAppSetIcon = 'assets/images/imgAppSetIcon.png';

lib/page/home/home_page.dart

@@ -84,6 +84,7 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
 
   Widget imageTest(){
     return IconButton(
+        icon: const Icon(Icons.image,color: Colors.white,),
         onPressed: (){
           Navigator.push(context, MaterialPageRoute(builder: (ctx){
             return StockPointsWidget(
@@ -94,7 +95,8 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
                 kHeight: MediaQuery.of(context).size.height - 8 ,
             );
           }));
-        }, icon: const Icon(Icons.image,color: Colors.white,));
+        },
+    );
   }
 
   Widget buildBanner() {

lib/page/qrcode_scan/qrcode_scan_page.dart

@@ -1,9 +1,7 @@
 import 'dart:io';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_task_page.dart';
 import 'package:qr_code_scanner/qr_code_scanner.dart';
 

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -175,7 +175,7 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
                     ),
                     CardWidgets.buildEdit(
                       isDetail,
-                      '使用农药的数量(毫升/每亩地)',
+                      '使用农药的数量\n(毫升/每亩地)',
                       item.synysl?.toString(),
                       backgroundColor: null,
                       inputType: const TextInputType.numberWithOptions(decimal: true),

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -522,6 +522,9 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
           actionsPadding:const EdgeInsets.symmetric(horizontal: 8.0,vertical: 4),
           title: const Text('退出当前界面？',textAlign: TextAlign.center,),
           actionsAlignment: MainAxisAlignment.spaceAround,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(12.0),
+          ),
           actions: <Widget>[
             TextButton(
               child: const Text('取消',style: TextStyle(color: Colors.grey),),

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -368,6 +368,8 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
               item.bdcnhhhzs,
               onChanged: (value) => item.bdcnhhhzs = value,
               backgroundColor: null,
+              leftRatio: 3,
+              rightRatio: 2
             ),
             CardWidgets.buildEdit(
               isDetail,

lib/page/sample_task/sample_task_list_page.dart

@@ -310,7 +310,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage>
         ),
         const SizedBox(width: 4),
         const Text(
-          '扦样任务单号',
+          '样品单号',
           style: TextStyle(color: MyColor.c_333333, fontSize: 15, fontWeight: FontWeight.w500),
         ),
       ],

lib/page/user_center/user_center_page.dart

@@ -225,14 +225,45 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage>
       width: MediaQuery.of(context).size.width,
       child: TextButton(
         onPressed: () {
-          SPUtils.getInstance().remove('accountpwd');
-          UserService.get().logout();
+          quiteLogin();
         },
         child: const Text('退出登录',style: TextStyle(color: Color(0xFF333333),fontSize: 15)),
       ),
     );
   }
 
+  void quiteLogin(){
+    showDialog<void>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          titlePadding: const EdgeInsets.fromLTRB(8, 26, 8, 4),
+          actionsPadding:const EdgeInsets.symmetric(horizontal: 8.0,vertical: 4),
+          title: const Text('确定退出登录？',textAlign: TextAlign.center,),
+          actionsAlignment: MainAxisAlignment.spaceAround,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(12.0),
+          ),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('取消',style: TextStyle(color: Colors.grey),),
+              onPressed: () {
+                Navigator.pop(context);
+              },
+            ),
+            TextButton(
+              child: const Text('退出',style: TextStyle(color: MyColor.c_28A3ED,fontWeight: FontWeight.bold),),
+              onPressed: () {
+                SPUtils.getInstance().remove('accountpwd');
+                UserService.get().logout();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
   @override
   bool get wantKeepAlive => true;
 }

lib/service/jgpush_service.dart

@@ -1,6 +1,10 @@
 
+import 'package:flutter/material.dart';
 import 'package:jpush_flutter/jpush_flutter.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/config/app_config.dart';
+import 'package:lszlgl/config/colors.dart';
+import 'package:lszlgl/main.dart';
 
 class JGPushService{
   static final JPush jPush = JPush();
@@ -9,7 +13,7 @@ class JGPushService{
   static Future<void> jgInit(AppEnvironment env) async{
     jPush.setup(
       // 极光推送 正式环境appkey需要再申请
-      appKey: env == AppEnvironment.product ? '2f42e3db4d0083b0bc5a3f6c' : '2f42e3db4d0083b0bc5a3f6c',
+      appKey: env == AppEnvironment.product ? '336425aac947172a06b70cbb' : '2f42e3db4d0083b0bc5a3f6c',
       channel: 'developer-default',
       production: env == AppEnvironment.product ? true : false,
       debug: env == AppEnvironment.develop ? true : false
@@ -18,15 +22,39 @@ class JGPushService{
     jPush.addEventHandler(
       // 接收通知回调方法。
       onReceiveNotification: (Map<String, dynamic> message) async {
-        print("flutter onReceiveNotification: $message");
+        logger.d("极光消息：onReceiveNotification: $message");
       },
       // 点击通知回调方法。
       onOpenNotification: (Map<String, dynamic> message) async {
-        print("flutter onOpenNotification: $message");
+       // print("flutter onOpenNotification: $message");
+        logger.d('极光消息：$message');
+        MyNavigator.showDialog(
+          tag: 'jsPop',
+          builder: (ctx){
+          return AlertDialog(
+            titlePadding: const EdgeInsets.fromLTRB(8, 26, 8, 4),
+            actionsPadding:const EdgeInsets.symmetric(horizontal: 8.0,vertical: 4),
+            actionsAlignment: MainAxisAlignment.spaceAround,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(12.0),
+            ),
+            title: Text(message['title'] ,textAlign: TextAlign.center,style: const TextStyle(fontWeight: FontWeight.bold),),
+            content: Text(message['alert'],),
+            actions: <Widget>[
+              TextButton(
+                child: const Text('知道了',style: TextStyle(color: MyColor.c_28A3ED,fontWeight: FontWeight.bold),),
+                onPressed: () {
+                  MyNavigator.dismiss(tag: 'jsPop');
+                },
+              ),
+            ],
+          );
+        },);
+
       },
       // 接收自定义消息回调方法。
       onReceiveMessage: (Map<String, dynamic> message) async {
-        print("flutter onReceiveMessage: $message");
+        logger.d("极光消息： onReceiveMessage: $message");
       },
     );
   }

lib/service/upgrade_service.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:install_plugin/install_plugin.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/config/app_config.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:path_provider/path_provider.dart';
@@ -10,7 +11,6 @@ import 'package:permission_handler/permission_handler.dart';
 
 import '../main.dart';
 import '../network/my_api.dart';
-import '../router/my_navigator.dart';
 import '../widget/upgrade_dialog.dart';
 
 class UpgradeService {
@@ -92,8 +92,8 @@ class UpgradeService {
               tag: 'pop',
               builder: (ctx) {
                 return Container(
-                  margin: const EdgeInsets.symmetric(horizontal: 24),
-                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+                  margin: const EdgeInsets.symmetric(horizontal: 12),
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
                   decoration: const BoxDecoration(
                     color: Colors.white,
                     borderRadius: BorderRadius.all(Radius.circular(8)),
@@ -102,17 +102,37 @@ class UpgradeService {
                     mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
+                      Image.asset(
+                        imgAppSetIcon,
+                        width: 80,
+                        height: 80,
+                      ),
+                      const SizedBox(height: 12),
+                      const Align(
+                          child: Text(
+                        '国粮质检',
+                        style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
+                      )),
+                      const SizedBox(height: 2),
+                      Align(
+                        child: Text(
+                          '版本 ${AppConfig.packageInfo.version}',
+                          style: const TextStyle(fontSize: 15,color: Colors.grey),
+                        ),
+                      ),
+                      const SizedBox(height: 32),
                       const Text(
                         '当前版本更新内容：',
-                        style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
+                        style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
                       ),
-                      const SizedBox(height: 12),
+                      const SizedBox(height: 10),
                       Text(UpgradeService.getContentsString(contents) ?? ''),
                       const SizedBox(height: 22),
                       MyButton(
                         '知道了',
                         radius: 8,
-
+                        gradient:
+                            const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
                         onTap: () {
                           MyNavigator.dismiss(tag: 'pop');
                         },

lib/widget/stock_points_widget.dart

@@ -48,7 +48,7 @@ class _StockPointsWidgetState extends BaseLifecycleState<StockPointsWidget> {
   }
 
   void getStockPoints() async {
-    var res = await MyApi.get(baseUrl: 'http://sx67bj.natappfree.cc').stockPoints(
+    var res = await MyApi.get().stockPoints(
         width: widget.width,
         length: widget.length,
         height: widget.height,

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.28+28
+version: 0.0.29+29
 
 environment:
   sdk: '>=3.1.5 <4.0.0'

web/index.html

@@ -34,26 +34,27 @@
 
   <script>
     // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
+  {{flutter_service_worker_version}}
   </script>
   <!-- This script adds the flutter initialization JS code -->
   <script src="flutter.js" defer></script>
 </head>
 <body>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
+<!--  <script>-->
+<!--    window.addEventListener('load', function(ev) {-->
+<!--      // Download main.dart.js-->
+<!--      _flutter.loader.loadEntrypoint({-->
+<!--        serviceWorker: {-->
+<!--          serviceWorkerVersion: serviceWorkerVersion,-->
+<!--        },-->
+<!--        onEntrypointLoaded: function(engineInitializer) {-->
+<!--          engineInitializer.initializeEngine().then(function(appRunner) {-->
+<!--            appRunner.runApp();-->
+<!--          });-->
+<!--        }-->
+<!--      });-->
+<!--    });-->
+<!--  </script>-->
+<script src="flutter_bootstrap.js" async></script>
 </body>
 </html>