8.6

lib/net/api_service.dart

@@ -673,7 +673,10 @@ class ApiService {
         params: {},
         isList: true,
         onSuccessList: onSuccess,
-        onError: onError);
+        onError:(code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///添加电梯
@@ -685,8 +688,14 @@ class ApiService {
       "projectId": projectId,
       "lift": lift
     };
-    await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.lift_add,
-        params: data, onSuccess: onSuccess, onError: onError);
+    await DioUtils().requestNetwork<bool>(
+        Method.post, ApiUrl.lift_add,
+        params: data,
+        onSuccess: onSuccess,
+        onError:(code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///编辑电梯
@@ -698,8 +707,14 @@ class ApiService {
       "projectId": projectId,
       "lift": lift
     };
-    await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.lift_modify,
-        params: data, onSuccess: onSuccess, onError: onError);
+    await DioUtils().requestNetwork<bool>(
+        Method.post, ApiUrl.lift_modify,
+        params: data,
+        onSuccess: onSuccess,
+        onError:(code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///获取消息中心列表
@@ -711,7 +726,11 @@ class ApiService {
     };
     await DioUtils().requestNetwork<TeamItem>(
         Method.post, ApiUrl.notification_list,
-        params: data, onSuccessList: onSuccess, onError: onError);
+        objectFromJson: (res) => TeamItem.fromJsonMap(res),
+        params: data, onSuccessList: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///已加入的团队列表
@@ -723,11 +742,11 @@ class ApiService {
     };
     await DioUtils().requestNetwork<TeamItem>(
         Method.post, ApiUrl.mtcompany_ownList,
-        params: data,
-        isList: true,
         objectFromJson: (res) => TeamItem.fromJsonMap(res),
-        onSuccessList: onSuccess,
-        onError: onError);
+        params: data, isList: true, onSuccessList: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///搜索团队列表
@@ -740,7 +759,11 @@ class ApiService {
     };
     await DioUtils().requestNetwork<TeamEntity>(
         Method.post, ApiUrl.mtcompany_list,
-        params: data, onSuccess: onSuccess, onError: onError);
+        objectFromJson: (res) => TeamEntity.fromJsonMap(res),
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///团队创建
@@ -756,7 +779,12 @@ class ApiService {
     };
     await DioUtils().requestNetwork<TeamEntity>(
         Method.post, ApiUrl.mtcompany_createTeam,
-        params: data, onSuccess: onSuccess, onError: onError);
+        objectFromJson: (res) => TeamEntity.fromJsonMap(res),
+        params: data, onSuccess: onSuccess, onError
+        : (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///切换团队
@@ -766,9 +794,13 @@ class ApiService {
       "companyId": companyId,
       "userId": SpUtil.getString(Constant.userId)
     };
-    await DioUtils().requestNetwork<TeamCurrentEntity>(
+    await DioUtils().requestNetwork<UserEntity>(
         Method.post, ApiUrl.mtcompany_changeTeam,
-        params: data, onSuccess: onSuccess, onError: onError);
+        objectFromJson: (res) => UserEntity.fromJsonMap(res),
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///申请加入团队
@@ -781,7 +813,11 @@ class ApiService {
     };
     await DioUtils().requestNetwork<TeamEntity>(
         Method.post, ApiUrl.mtcompany_applyTeam,
-        params: data, onSuccess: onSuccess, onError: onError);
+        objectFromJson: (res) => TeamEntity.fromJsonMap(res),
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   
@@ -796,9 +832,10 @@ class ApiService {
     await DioUtils().requestNetwork<TeamUserEntity>(
         Method.post, ApiUrl.mtcompany_userList,
         objectFromJson: (res) => TeamUserEntity.fromJsonMap(res),
-        params: data,
-        onSuccess: onSuccess,
-        onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   /**
@@ -961,7 +998,10 @@ class ApiService {
         objectFromJson: (res) => MaintenanceLastEntity.fromJsonMap(res),
         params: data,
         onSuccess: onSuccess,
-        onError: onError);
+        onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///保养项目
@@ -978,7 +1018,10 @@ class ApiService {
         params: data,
         isList: true,
         onSuccessList: onSuccess,
-        onError: onError);
+        onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///保养项目
@@ -1075,7 +1118,10 @@ class ApiService {
         objectFromJson: (res) => RepairListEntity.fromJsonMap(res),
         params: data,
         onSuccess: onSuccess,
-        onError: onError);
+        onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///新增急修
@@ -1110,7 +1156,10 @@ class ApiService {
       "takingTime": takingTime,
     };
     await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.repair_taking,
-        params: data, onSuccess: onSuccess, onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///到达
@@ -1118,7 +1167,10 @@ class ApiService {
       {Function onSuccess, Function(int code, String msg) onError}) async {
     var data = {"id": id, "arriveTime": arriveTime, "position": position};
     await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.repair_arrive,
-        params: data, onSuccess: onSuccess, onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///停梯
@@ -1126,7 +1178,10 @@ class ApiService {
       {Function onSuccess, Function(int code, String msg) onError}) async {
     var data = {"id": id, "stopDate": stopDate, "safetyConfirm": safetyConfirm};
     await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.repair_stop,
-        params: data, onSuccess: onSuccess, onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///获取急修故障
@@ -1139,7 +1194,10 @@ class ApiService {
         params: data,
         isList: true,
         onSuccessList: onSuccess,
-        onError: onError);
+        onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///保存急修单
@@ -1170,10 +1228,12 @@ class ApiService {
       "faultNature": faultNature,
       "faultDuty": faultDuty,
     };
-    print(data);
     await DioUtils().requestNetwork<bool>(
         Method.post, ApiUrl.repair_repairOrder,
-        params: data, onSuccess: onSuccess, onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///获取急修单
@@ -1183,9 +1243,10 @@ class ApiService {
     await DioUtils().requestNetwork<RepairItem>(
         Method.post, ApiUrl.repair_detail,
         objectFromJson: (res) => RepairItem.fromJsonMap(res),
-        params: data,
-        onSuccess: onSuccess,
-        onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///急修评价
@@ -1200,8 +1261,12 @@ class ApiService {
       "starLevel": starLevel,
       "imgUrl": imgUrl,
     };
-    await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.repair_evaluate,
-        params: data, onSuccess: onSuccess, onError: onError);
+    await DioUtils().requestNetwork<bool>(
+        Method.post, ApiUrl.repair_evaluate,
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+      loginExpire(code);
+      onError(code,msg);
+    });
   }
 
   ///年检列表
@@ -1218,7 +1283,10 @@ class ApiService {
         objectFromJson: (res) => YearlyListEntity.fromJsonMap(res),
         params: data,
         onSuccess: onSuccess,
-        onError: onError);
+        onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///年检列表
@@ -1266,7 +1334,10 @@ class ApiService {
       "selfcheckReportImg": "${imgUrl}"
     };
     await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.yearly_selfcheck,
-        params: data, onSuccess: onSuccess, onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///上传检验结果
@@ -1278,7 +1349,10 @@ class ApiService {
       "checkResultImg": "${imgUrl}"
     };
     await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.yearly_check,
-        params: data, onSuccess: onSuccess, onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///上传检验结果
@@ -1290,7 +1364,10 @@ class ApiService {
       "annualInspectionImg": "${imgUrl2}"
     };
     await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.yearly_finish,
-        params: data, onSuccess: onSuccess, onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///年检统计
@@ -1313,12 +1390,12 @@ class ApiService {
       "title": title,
       "district": city
     };
-    await DioUtils().requestNetwork<NewsCommEntity>(
-        Method.post, ApiUrl.news_list,
+    await DioUtils().requestNetwork<NewsCommEntity>(Method.post, ApiUrl.news_list,
         objectFromJson: (res) => NewsCommEntity.fromJsonMap(res),
-        params: data,
-        onSuccess: onSuccess,
-        onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   Future newsDetail(id,
@@ -1326,12 +1403,12 @@ class ApiService {
     var data = {
       "id": id,
     };
-    await DioUtils().requestNetwork<NewsDetailItem>(
-        Method.post, ApiUrl.news_detail,
+    await DioUtils().requestNetwork<NewsDetailItem>(Method.post, ApiUrl.news_detail,
         objectFromJson: (res) => NewsDetailItem.fromJsonMap(res),
-        params: data,
-        onSuccess: onSuccess,
-        onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
   Future newsZan(id,
       {Function onSuccess, Function(int code, String msg) onError}) async {
@@ -1355,12 +1432,12 @@ class ApiService {
       "userId": int.parse(SpUtil.getString(Constant.userId)),
       "clockTime": clockTime,
     };
-    await DioUtils().requestNetwork<SignListEntity>(
-        Method.post, ApiUrl.sign_list,
+    await DioUtils().requestNetwork<SignListEntity>(Method.post, ApiUrl.sign_list,
         objectFromJson: (res) => SignListEntity.fromJsonMap(res),
-        params: data,
-        onSuccess: onSuccess,
-        onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   Future signConfig(
@@ -1368,12 +1445,12 @@ class ApiService {
     var data = {
       "mtCompanyId": SpUtil.getString(Constant.companyId),
     };
-    await DioUtils().requestNetwork<SignConfigItem>(
-        Method.post, ApiUrl.sign_config,
+    await DioUtils().requestNetwork<SignConfigItem>(Method.post, ApiUrl.sign_config,
         objectFromJson: (res) => SignConfigItem.fromJsonMap(res),
-        params: data,
-        onSuccess: onSuccess,
-        onError: onError);
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   Future signAdd(coordinate, address, type,
@@ -1385,12 +1462,11 @@ class ApiService {
       "address": address,
       "type": type
     };
-    await DioUtils().requestNetwork<SignConfigItem>(
-        Method.post, ApiUrl.sign_add,
-        objectFromJson: (res) => SignConfigItem.fromJsonMap(res),
-        params: data,
-        onSuccess: onSuccess,
-        onError: onError);
+    await DioUtils().requestNetwork<bool>(Method.post, ApiUrl.sign_add,
+        params: data, onSuccess: onSuccess, onError: (code,msg){
+          loginExpire(code);
+          onError(code,msg);
+        });
   }
 
   ///大修统计

lib/net/dio_utils.dart

@@ -45,7 +45,8 @@ class DioUtils {
       // baseUrl: "http://192.168.31.112:20226",
       // baseUrl: "http://lift.whlhcx.com",
 //      baseUrl: "http://111.47.6.224:10227",
-      baseUrl: "http://111.47.6.224:20227",
+//      baseUrl: "http://111.47.6.224:20227",
+        baseUrl: "https://app.edtyun.com:8443"
       // baseUrl: "http://221.234.44.30:10227",
 //      baseUrl: "http://192.168.1.16",
 //      contentType: ContentType('application', 'x-www-form-urlencoded', charset: 'utf-8'),