From a5d862051462a5fcc2717b405896a6d424002e54 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 22 十二月 2020 15:43:06 +0800
Subject: [PATCH] 1. 调整了数控实体的存储位置； 2. 新增数据表“媒体文件类型别名表”； 3. 修改任意拍模块，将图片分类改为根据场景类型动态生成，同时新增修改分类别名功能； 4. 优化子任务选择界面的任务排序方式，按照“待开始”、“执行中”、“未执行”的顺序进行排序；
---
app/src/main/java/com/ping/greendao/gen/DaoSession.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/ping/greendao/gen/DaoSession.java b/app/src/main/java/com/ping/greendao/gen/DaoSession.java
index a15bf11..5fa92aa 100644
--- a/app/src/main/java/com/ping/greendao/gen/DaoSession.java
+++ b/app/src/main/java/com/ping/greendao/gen/DaoSession.java
@@ -8,31 +8,32 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-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.Evaluation;
-import cn.flightfeather.thirdapp.bean.Evaluationrule;
-import cn.flightfeather.thirdapp.bean.Evaluationsubrule;
-import cn.flightfeather.thirdapp.bean.Gitlist;
-import cn.flightfeather.thirdapp.bean.Gittype;
-import cn.flightfeather.thirdapp.bean.Inspection;
-import cn.flightfeather.thirdapp.bean.Itemevaluation;
-import cn.flightfeather.thirdapp.bean.Mediafile;
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion;
-import cn.flightfeather.thirdapp.bean.Problemlist;
-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.Subtask;
-import cn.flightfeather.thirdapp.bean.Task;
-import cn.flightfeather.thirdapp.bean.Taskvertion;
-import cn.flightfeather.thirdapp.bean.Town;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+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.Evaluation;
+import cn.flightfeather.thirdapp.bean.entity.Evaluationrule;
+import cn.flightfeather.thirdapp.bean.entity.Evaluationsubrule;
+import cn.flightfeather.thirdapp.bean.entity.Gitlist;
+import cn.flightfeather.thirdapp.bean.entity.Gittype;
+import cn.flightfeather.thirdapp.bean.entity.Inspection;
+import cn.flightfeather.thirdapp.bean.entity.Itemevaluation;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.MediaTypeAlias;
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion;
+import cn.flightfeather.thirdapp.bean.entity.Problemlist;
+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.Site;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Task;
+import cn.flightfeather.thirdapp.bean.entity.Taskvertion;
+import cn.flightfeather.thirdapp.bean.entity.Town;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import com.ping.greendao.gen.ChangeAdviceDao;
import com.ping.greendao.gen.ChangeEffectDao;
@@ -48,6 +49,7 @@
import com.ping.greendao.gen.InspectionDao;
import com.ping.greendao.gen.ItemevaluationDao;
import com.ping.greendao.gen.MediafileDao;
+import com.ping.greendao.gen.MediaTypeAliasDao;
import com.ping.greendao.gen.MonitorobjectversionDao;
import com.ping.greendao.gen.ProblemlistDao;
import com.ping.greendao.gen.ProblemtypeDao;
@@ -83,6 +85,7 @@
private final DaoConfig inspectionDaoConfig;
private final DaoConfig itemevaluationDaoConfig;
private final DaoConfig mediafileDaoConfig;
+ private final DaoConfig mediaTypeAliasDaoConfig;
private final DaoConfig monitorobjectversionDaoConfig;
private final DaoConfig problemlistDaoConfig;
private final DaoConfig problemtypeDaoConfig;
@@ -109,6 +112,7 @@
private final InspectionDao inspectionDao;
private final ItemevaluationDao itemevaluationDao;
private final MediafileDao mediafileDao;
+ private final MediaTypeAliasDao mediaTypeAliasDao;
private final MonitorobjectversionDao monitorobjectversionDao;
private final ProblemlistDao problemlistDao;
private final ProblemtypeDao problemtypeDao;
@@ -167,6 +171,9 @@
mediafileDaoConfig = daoConfigMap.get(MediafileDao.class).clone();
mediafileDaoConfig.initIdentityScope(type);
+ mediaTypeAliasDaoConfig = daoConfigMap.get(MediaTypeAliasDao.class).clone();
+ mediaTypeAliasDaoConfig.initIdentityScope(type);
+
monitorobjectversionDaoConfig = daoConfigMap.get(MonitorobjectversionDao.class).clone();
monitorobjectversionDaoConfig.initIdentityScope(type);
@@ -214,6 +221,7 @@
inspectionDao = new InspectionDao(inspectionDaoConfig, this);
itemevaluationDao = new ItemevaluationDao(itemevaluationDaoConfig, this);
mediafileDao = new MediafileDao(mediafileDaoConfig, this);
+ mediaTypeAliasDao = new MediaTypeAliasDao(mediaTypeAliasDaoConfig, this);
monitorobjectversionDao = new MonitorobjectversionDao(monitorobjectversionDaoConfig, this);
problemlistDao = new ProblemlistDao(problemlistDaoConfig, this);
problemtypeDao = new ProblemtypeDao(problemtypeDaoConfig, this);
@@ -240,6 +248,7 @@
registerDao(Inspection.class, inspectionDao);
registerDao(Itemevaluation.class, itemevaluationDao);
registerDao(Mediafile.class, mediafileDao);
+ registerDao(MediaTypeAlias.class, mediaTypeAliasDao);
registerDao(Monitorobjectversion.class, monitorobjectversionDao);
registerDao(Problemlist.class, problemlistDao);
registerDao(Problemtype.class, problemtypeDao);
@@ -268,6 +277,7 @@
inspectionDaoConfig.clearIdentityScope();
itemevaluationDaoConfig.clearIdentityScope();
mediafileDaoConfig.clearIdentityScope();
+ mediaTypeAliasDaoConfig.clearIdentityScope();
monitorobjectversionDaoConfig.clearIdentityScope();
problemlistDaoConfig.clearIdentityScope();
problemtypeDaoConfig.clearIdentityScope();
@@ -337,6 +347,10 @@
return mediafileDao;
}
+ public MediaTypeAliasDao getMediaTypeAliasDao() {
+ return mediaTypeAliasDao;
+ }
+
public MonitorobjectversionDao getMonitorobjectversionDao() {
return monitorobjectversionDao;
}
--
Gitblit v1.9.3