代码冲突修改

# Conflicts:
#	lib/pages/home/home_page.dart

lib/http/ApiService.dart

@@ -5,23 +5,24 @@ export 'modules/hidden_danger_api.dart';
 export 'modules/special_work_api.dart';
 
 class ApiService {
+
+  /// 是否是港务局环境
+  static final bool isGWJProduct = true;
   /// 是否正式环境
   static final bool isProduct = true;
 
   /// 登录及其他管理后台接口
-  // static final String basePath = "https://skqhdg.porthebei.com:9007";
-  static final String basePath =
-      isProduct
-          ? "https://gbs-gateway.qhdsafety.com"
-          : "http://192.168.20.100:30140";
+  static final String basePath = isGWJProduct ? "https://skqhdg.porthebei.com:9007" :
+  isProduct
+      ? "https://gbs-gateway.qhdsafety.com"
+      : 'http://192.168.198.8:30140';
 
 
   /// 图片文件服务
-  static final String baseImgPath =
-      isProduct
-          ? "https://jpfz.qhdsafety.com/gbsFileTest/"
-          : "http://192.168.20.240:9787/mnt/"; //内网图片地址
-  // static final String baseImgPath = "https://skqhdg.porthebei.com:9004/file/uploadFiles2/";
+  static final String baseImgPath = isGWJProduct ? "https://skqhdg.porthebei.com:9004/file/uploadFiles2/" :
+  isProduct
+      ? "https://jpfz.qhdsafety.com/gbsFileTest/"
+      : "https://skqhdg.porthebei.com:9004/file/uploadFiles2/"; //内网图片地址
 
 
   static const publicKey =

lib/pages/home/home_page.dart

@@ -1120,7 +1120,7 @@ class HomePageState extends RouteAwareState<HomePage>
     int keyTasksNum = 0;
     int hiddenDangerNum = 0;
     try {
-      if (specialWork['success']) {
+      if (FormUtils.hasValue(specialWork, 'success') && specialWork['success']) {
         List<dynamic> specialWorkList = specialWork['data'] ?? [];
         for (var item in specialWorkList) {
           if (item is Map) {
@@ -1129,14 +1129,14 @@ class HomePageState extends RouteAwareState<HomePage>
           }
         }
       }
-      if (keyTasksWork['success']) {
+      if (FormUtils.hasValue(keyTasksWork, 'success') && keyTasksWork['success']) {
         int zdzysqCount = int.parse(keyTasksWork['data']['zdzysqCount']??0);
         int bjcrqrCount = int.parse(keyTasksWork['data']['bjcrqrCount']??0);
         int yhdzgCount = int.parse(keyTasksWork['data']['yhdzgCount']??0);
         keyTasksNum = bjcrqrCount+yhdzgCount+zdzysqCount;
       }
 
-      if (hiddenDangerWork['success']) {
+      if (FormUtils.hasValue(hiddenDangerWork, 'success') && hiddenDangerWork['success']) {
         List<dynamic> data = hiddenDangerWork['data']?? [] ;
         hiddenDangerNum = data.length;
       }