From e27f54aa7e10836e2741dc590559e1039fbade78 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 七月 2021 15:06:41 +0800
Subject: [PATCH] 1. 创建子任务时，执行用户默认为当前登录用户或执行组中的第一人 2. 修复部分企业类型问题图标错误 3. 新增场景账户自动生成功能
---
app/src/main/java/cn/flightfeather/thirdapp/task/InitDataTask.java | 71 +++++++----------------------------
1 files changed, 15 insertions(+), 56 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/task/InitDataTask.java b/app/src/main/java/cn/flightfeather/thirdapp/task/InitDataTask.java
index dcd4812..7d492ec 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/task/InitDataTask.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/task/InitDataTask.java
@@ -24,20 +24,19 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.activity.SplashActivity;
-import cn.flightfeather.thirdapp.bean.ChangeAdvice;
-import cn.flightfeather.thirdapp.bean.ChangeEffect;
-import cn.flightfeather.thirdapp.bean.City;
-import cn.flightfeather.thirdapp.bean.District;
-import cn.flightfeather.thirdapp.bean.Domaincatalog;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Evaluationrule;
-import cn.flightfeather.thirdapp.bean.Evaluationsubrule;
-import cn.flightfeather.thirdapp.bean.Gittype;
-import cn.flightfeather.thirdapp.bean.Problemtype;
-import cn.flightfeather.thirdapp.bean.Province;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Site;
-import cn.flightfeather.thirdapp.bean.Town;
+import cn.flightfeather.thirdapp.bean.entity.ChangeAdvice;
+import cn.flightfeather.thirdapp.bean.entity.ChangeEffect;
+import cn.flightfeather.thirdapp.bean.entity.City;
+import cn.flightfeather.thirdapp.bean.entity.District;
+import cn.flightfeather.thirdapp.bean.entity.Domaincatalog;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Evaluationrule;
+import cn.flightfeather.thirdapp.bean.entity.Evaluationsubrule;
+import cn.flightfeather.thirdapp.bean.entity.Gittype;
+import cn.flightfeather.thirdapp.bean.entity.Problemtype;
+import cn.flightfeather.thirdapp.bean.entity.Province;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Town;
import cn.flightfeather.thirdapp.httpservice.InitDataService;
import retrofit2.Call;
import retrofit2.Callback;
@@ -89,7 +88,7 @@
initDataService = retrofit.create(InitDataService.class);
daoSession = application.getDaoSession();
scenseDao = daoSession.getScenseDao();
- siteDao = daoSession.getSiteDao();
+// siteDao = daoSession.getSiteDao();
domaincatalogDao = daoSession.getDomaincatalogDao();
domainitemDao = daoSession.getDomainitemDao();
evaluationruleDao = daoSession.getEvaluationruleDao();
@@ -125,7 +124,7 @@
scenseDao.insertInTx(scenseList);
System.out.println("Scense:Success");
if (firstLoad){
- loadSite();
+ loadDoainCatalog();
}
}else if (response.errorBody()!=null){
if (!requestAgain){
@@ -148,46 +147,6 @@
handler.sendEmptyMessage(SplashActivity.SHOW_ERROR);
}
System.out.println("Scense:"+t.toString());
- }
- });
- }
- //鍔犺浇鍏ㄩ儴宸ュ湴璇︽儏
- private void loadSite(){
- Call<List<Site>> loadAllSite = initDataService.loadAllSite();
- loadAllSite.enqueue(new Callback<List<Site>>() {
- @Override
- public void onResponse(Call<List<Site>> call, Response<List<Site>> response) {
- if (response.body()!=null){
- requestAgain = false;
- List<Site> siteList = response.body();
- siteDao.deleteAll();
- siteDao.insertInTx(siteList);
- System.out.println("Site:Success");
- if (firstLoad){
- loadDoainCatalog();
- }
- }else if (response.errorBody()!=null){
- if (!requestAgain){
- requestAgain = true;
- loadSite();
- }else {
- handler.sendEmptyMessage(SplashActivity.SHOW_ERROR);
- Toast.makeText(application, "鑾峰彇宸ュ湴璇︽儏鏁版嵁澶辫触", Toast.LENGTH_SHORT).show();
- }
- System.out.println("Site:"+response.errorBody().toString());
- }
- }
-
- @Override
- public void onFailure(Call<List<Site>> call, Throwable t) {
- if (!requestAgain){
- requestAgain = true;
- loadSite();
- }else {
- showNetErrorToast();
- handler.sendEmptyMessage(SplashActivity.SHOW_ERROR);
- }
- System.out.println("Site:"+t.toString());
}
});
}
--
Gitblit v1.9.3