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/cn/flightfeather/thirdapp/adapter/ProblemTypeListAdapter.java | 2
app/src/main/java/com/ping/greendao/gen/DomaincatalogDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/LastSubtaskPack.java | 4
app/src/main/java/com/ping/greendao/gen/CityDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/adapter/TaskListAdapter.java | 13
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Town.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java | 4
app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt | 23
app/src/main/java/cn/flightfeather/thirdapp/adapter/DomainItemListAdapter.java | 2
app/src/main/java/cn/flightfeather/thirdapp/adapter/ScenseListAdapter.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemUpdateActivity.kt | 6
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Mediafile.java | 2
app/src/main/java/cn/flightfeather/thirdapp/httpservice/SubTaskService.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaFileDao.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskPack.java | 4
app/src/main/java/com/ping/greendao/gen/GittypeDao.java | 2
app/src/main/res/drawable/point_bg_enable.xml | 8
app/src/main/java/cn/flightfeather/thirdapp/view/BannerView.kt | 174 +++++
app/src/main/java/cn/flightfeather/thirdapp/module/MainActivity.java | 2
app/src/main/java/cn/flightfeather/thirdapp/httpservice/InitDataService.java | 28
app/src/main/java/cn/flightfeather/thirdapp/activity/TaskActivity.java | 12
app/src/main/java/com/ping/greendao/gen/EvaluationruleDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/adapter/TopClassTaskAdapter.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Site.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/SceneRepository.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskActivity.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/MOVMapActivity.java | 10
app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskActivity.kt | 2
app/src/main/java/com/ping/greendao/gen/ScenseDao.java | 2
app/src/main/res/drawable/point_bg_normal.xml | 8
app/src/main/java/cn/flightfeather/thirdapp/business/widgettype3/HomeFragment_scene.java | 6
app/src/main/java/com/ping/greendao/gen/SiteDao.java | 2
app/src/main/java/com/ping/greendao/gen/ProblemlistDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/business/widgettype2/HomeFragment_comptent.java | 6
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Taskvertion.java | 2
app/src/main/java/com/ping/greendao/gen/TownDao.java | 2
app/src/main/res/drawable/bg_btngroup_2.xml | 8
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Subtask.java | 2
app/src/main/res/layout/item_take_photo.xml | 60 +
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt | 6
app/src/main/java/com/ping/greendao/gen/DaoMaster.java | 7
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceViewModel.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskVo.java | 4
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt | 84 +
app/src/main/java/cn/flightfeather/thirdapp/activity/SiteDetailActivity.java | 10
app/src/main/java/cn/flightfeather/thirdapp/model/event/InspectionEvent.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskVersionService.java | 2
app/src/main/java/com/ping/greendao/gen/SubtaskDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/PromiseActivity.java | 8
app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/SceneType.kt | 22
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluation.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailViewModel.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java | 4
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gitlist.java | 2
app/src/main/java/cn/flightfeather/thirdapp/task/InitDataTask.java | 28
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceActivity.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/GradeActivity.java | 12
app/src/main/java/com/ping/greendao/gen/InspectionDao.java | 2
app/src/main/java/com/ping/greendao/gen/MonitorobjectversionDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/EvaluationRepository.kt | 6
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraViewModel.kt | 122 +++
app/src/main/java/com/ping/greendao/gen/DistrictDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationrule.java | 2
app/src/main/res/layout/dialog_camera_3.xml | 54 +
app/src/main/java/cn/flightfeather/thirdapp/fragment/TaskFragment.java | 8
app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeFragment.java | 2
app/src/main/java/cn/flightfeather/thirdapp/fragment/CardFragment.java | 2
app/src/main/java/cn/flightfeather/thirdapp/httpservice/MonitorObjectVersionService.java | 2
app/src/main/java/cn/flightfeather/thirdapp/adapter/MOVListAdapter.java | 13
app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeAdvice.java | 4
app/src/main/java/com/ping/greendao/gen/ProvinceDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeEffect.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt | 8
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domainitem.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionFragment.kt | 26
app/src/main/java/com/ping/greendao/gen/DaoSession.java | 64 +
app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnalysisOverViewFragment.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt | 6
app/src/main/java/cn/flightfeather/thirdapp/activity/SubTaskMapActivity.java | 4
app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt | 8
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationsubrule.java | 4
app/src/main/java/cn/flightfeather/thirdapp/common/database/GreenDaoDb.java | 2
app/src/main/java/cn/flightfeather/thirdapp/adapter/GitTypeListAdapter.java | 2
app/src/main/res/layout/layout_search.xml | 70 ++
app/src/main/java/cn/flightfeather/thirdapp/httpservice/UserInfoService.java | 2
app/src/main/java/cn/flightfeather/thirdapp/adapter/MediaFileListAdapter.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Scense.java | 2
app/src/main/java/com/ping/greendao/gen/TaskDao.java | 2
app/src/main/java/com/ping/greendao/gen/DomainitemDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domaincatalog.java | 2
app/src/main/res/drawable/point_background.xml | 5
app/src/main/java/cn/flightfeather/thirdapp/fragment/SettingFragment.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/TaskDetailActivity.java | 2
app/src/main/java/com/ping/greendao/gen/TaskvertionDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailActivity.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/task/DownloadAndSetImageTask.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/InspectionRepository.kt | 5
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/District.java | 2
app/src/main/java/com/ping/greendao/gen/MediafileDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/City.java | 2
app/src/main/java/com/ping/greendao/gen/ProblemtypeDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/dao/SceneDao.kt | 2
app/build.gradle | 6
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Monitorobjectversion.java | 2
app/src/main/java/com/ping/greendao/gen/GitlistDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisRankFragment.java | 4
app/src/main/java/com/ping/greendao/gen/EvaluationDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/dao/DomainDao.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Itemevaluation.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt | 9
app/src/main/java/com/ping/greendao/gen/ChangeEffectDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ProblemlistVo.java | 4
app/src/main/java/cn/flightfeather/thirdapp/common/database/DbSource.java | 2
app/src/main/java/com/ping/greendao/gen/UserinfoDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseDetailActivity.java | 14
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeViewModel.kt | 4
app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/PhotoViewerActivity.java | 2
app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskService.java | 4
app/src/main/java/cn/flightfeather/thirdapp/view/SearchView.kt | 82 ++
app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java | 6
app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeDetailActivity.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/dao/ProblemTypeDao.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gittype.java | 4
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Userinfo.java | 2
app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementViewModel.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/EvaluateActivity.java | 2
app/src/main/java/cn/flightfeather/thirdapp/view/MyViewPager.kt | 2
app/src/main/java/com/ping/greendao/gen/ItemevaluationDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitViewModel.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemlist.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ActivityBean.java | 4
app/src/main/java/com/ping/greendao/gen/MediaTypeAliasDao.java | 147 ++++
app/src/main/java/cn/flightfeather/thirdapp/httpservice/InspectionService.java | 18
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/EvaluationsubruleVo.java | 2
app/src/main/java/cn/flightfeather/thirdapp/task/CompressPhotoTask.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java | 4
app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskViewModel.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/httpservice/SiteDetailService.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Inspection.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemtype.java | 2
app/src/main/java/cn/flightfeather/thirdapp/view/ViewPagerAdapter.kt | 36 +
app/src/main/java/cn/flightfeather/thirdapp/adapter/SelectedScenseAdapter.java | 2
app/src/main/java/cn/flightfeather/thirdapp/model/event/SceneEvent.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/MediaTypeAlias.java | 67 ++
app/src/main/java/cn/flightfeather/thirdapp/model/event/ProblemEvent.kt | 2
app/src/main/java/com/ping/greendao/gen/EvaluationsubruleDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/TaskAdjustActivity.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListViewModel.kt | 4
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionViewModel.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisProblemFragment.java | 10
app/src/main/java/cn/flightfeather/thirdapp/module/task/NewMonthTaskMapActivity.kt | 6
app/src/main/java/com/ping/greendao/gen/ChangeAdviceDao.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/DebugTransSiteLatlngActivity.java | 4
app/src/main/java/cn/flightfeather/thirdapp/repository/ProblemRepository.kt | 4
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/AllBoolean.java | 2
app/src/main/java/cn/flightfeather/thirdapp/httpservice/EvaluationService.java | 4
app/src/main/java/cn/flightfeather/thirdapp/httpservice/SettingsService.java | 2
app/src/main/java/cn/flightfeather/thirdapp/view/SlideSideBarView.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeActivity.kt | 4
/dev/null | 26
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/MediafileVo.java | 2
app/src/main/java/cn/flightfeather/thirdapp/activity/NewMonthTaskActivity.java | 16
app/src/main/java/cn/flightfeather/thirdapp/fragment/HomeFragment.java | 8
app/src/main/java/cn/flightfeather/thirdapp/httpservice/ScenseService.java | 4
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/GitlistVo.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/dao/EvaluationDao.kt | 4
app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaTypeAliasDao.kt | 64 ++
app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Task.java | 2
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt | 3
app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java | 14
app/src/main/java/cn/flightfeather/thirdapp/bean/vo/InspectionVo.java | 4
app/src/main/java/cn/flightfeather/thirdapp/util/file/FileUtil.java | 2
app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Province.java | 2
app/src/main/java/cn/flightfeather/thirdapp/repository/CommonRepository.kt | 54 +
app/src/main/java/cn/flightfeather/thirdapp/model/event/TopTaskEvent.kt | 2
app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementActivity.kt | 2
181 files changed, 1,413 insertions(+), 411 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 60497a4..fdba244 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@
applicationId "cn.flightfeather.thirdapp"
minSdkVersion 19
targetSdkVersion 28
- versionCode 23
- versionName "1.1.14.06"
+ versionCode 24
+ versionName "1.1.14.07"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 25
renderscriptSupportModeEnabled true
@@ -45,7 +45,7 @@
}
greendao {
- schemaVersion 11
+ schemaVersion 12
daoPackage 'com.ping.greendao.gen'
targetGenDir 'src/main/java'
}
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/BaseFragment.kt b/app/src/main/java/cn/flightfeather/thirdapp/BaseFragment.kt
deleted file mode 100644
index 291679c..0000000
--- a/app/src/main/java/cn/flightfeather/thirdapp/BaseFragment.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.flightfeather.thirdapp
-
-
-import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-
-/**
- * @author riku
- * 2019.3.29
- */
-abstract class BaseFragment : Fragment() {
-
- protected var rootView: View? = null
- protected var inflater: LayoutInflater? = null
-
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?): View? {
- if (rootView != null) {
- val parentView = rootView?.parent as ViewGroup
- parentView.removeView(rootView)
- } else {
- rootView = inflater.inflate(getLayoutId(), container, false)
- this.inflater = inflater
- initView()
- initData()
- }
- return rootView
- }
-
- protected abstract fun getLayoutId(): Int
-
- protected abstract fun initView()
-
- protected abstract fun initData()
-
-}
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java b/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
index 64f6ced..5eb080e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
@@ -14,7 +14,7 @@
import java.io.File;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import cn.flightfeather.thirdapp.common.net.RetrofitFactory;
import cn.flightfeather.thirdapp.util.crashreport.MyCrashHandler;
import retrofit2.Retrofit;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/DebugTransSiteLatlngActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/DebugTransSiteLatlngActivity.java
index b2b5c34..e5e9633 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/DebugTransSiteLatlngActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/DebugTransSiteLatlngActivity.java
@@ -17,8 +17,8 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Site;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Site;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/EvaluateActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/EvaluateActivity.java
index 4a47e50..ab04416 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/EvaluateActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/EvaluateActivity.java
@@ -11,7 +11,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Itemevaluation;
+import cn.flightfeather.thirdapp.bean.entity.Itemevaluation;
import cn.flightfeather.thirdapp.util.UUIDGenerator;
import okhttp3.ResponseBody;
import retrofit2.Call;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java
index 0685248..104b73a 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java
@@ -31,8 +31,8 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Mediafile;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.bean.vo.GitlistVo;
import cn.flightfeather.thirdapp.task.DownloadAndSetImageTask;
import cn.flightfeather.thirdapp.task.SetImageTask;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/GradeActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/GradeActivity.java
index eb6bcf4..6a982fc 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/GradeActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/GradeActivity.java
@@ -42,12 +42,12 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllListViewAdapter;
-import cn.flightfeather.thirdapp.bean.Evaluation;
-import cn.flightfeather.thirdapp.bean.Evaluationrule;
-import cn.flightfeather.thirdapp.bean.Evaluationsubrule;
-import cn.flightfeather.thirdapp.bean.Itemevaluation;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Subtask;
+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.Itemevaluation;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.bean.vo.EvaluationsubruleVo;
import cn.flightfeather.thirdapp.httpservice.EvaluationService;
import cn.flightfeather.thirdapp.util.Constant;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/MOVMapActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/MOVMapActivity.java
index c1afe61..1619570 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/MOVMapActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/MOVMapActivity.java
@@ -55,11 +55,11 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.MOVListAdapter;
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.Task;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Task;
import cn.flightfeather.thirdapp.bean.vo.TaskVo;
import cn.flightfeather.thirdapp.httpservice.MonitorObjectVersionService;
import cn.flightfeather.thirdapp.httpservice.SubTaskService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/NewMonthTaskActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/NewMonthTaskActivity.java
index 9db82d1..b7795b5 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/NewMonthTaskActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/NewMonthTaskActivity.java
@@ -34,14 +34,14 @@
import cn.carbswang.android.numberpickerview.library.NumberPickerView;
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-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.Province;
-import cn.flightfeather.thirdapp.bean.Task;
-import cn.flightfeather.thirdapp.bean.Town;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+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.Province;
+import cn.flightfeather.thirdapp.bean.entity.Task;
+import cn.flightfeather.thirdapp.bean.entity.Town;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import cn.flightfeather.thirdapp.httpservice.TaskService;
import cn.flightfeather.thirdapp.httpservice.UserInfoService;
import cn.flightfeather.thirdapp.module.task.NewMonthTaskMapActivity;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/PhotoViewerActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/PhotoViewerActivity.java
index 27eb849..9d0a16a 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/PhotoViewerActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/PhotoViewerActivity.java
@@ -23,7 +23,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.CommonPagerAdapter;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java
index c521146..9d963fc 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java
@@ -51,8 +51,8 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Mediafile;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.model.event.ProblemEvent;
import cn.flightfeather.thirdapp.module.base.BaseTakePicActivity;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/PromiseActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/PromiseActivity.java
index 0c0c4ca..d8406e2 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/PromiseActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/PromiseActivity.java
@@ -38,10 +38,10 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.ProblemPromiseListAdapter;
-import cn.flightfeather.thirdapp.bean.AllBoolean;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Inspection;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.vo.AllBoolean;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Inspection;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.httpservice.InspectionService;
import cn.flightfeather.thirdapp.util.Constant;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseDetailActivity.java
index a420c2d..cdc8905 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseDetailActivity.java
@@ -38,13 +38,13 @@
//
//import cn.flightfeather.thirdapp.R;
//import cn.flightfeather.thirdapp.adapter.AllListViewAdapter;
-//import cn.flightfeather.thirdapp.bean.City;
-//import cn.flightfeather.thirdapp.bean.District;
-//import cn.flightfeather.thirdapp.bean.Domainitem;
-//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.City;
+//import cn.flightfeather.thirdapp.bean.entity.District;
+//import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+//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.Town;
//import cn.flightfeather.thirdapp.CommonApplication;
//import cn.flightfeather.thirdapp.httpservice.ScenseService;
//import cn.flightfeather.thirdapp.httpservice.SiteDetailService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java
index b6519b3..c7a3198 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java
@@ -48,13 +48,13 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener;
import cn.flightfeather.thirdapp.adapter.ScenseListAdapter;
-import cn.flightfeather.thirdapp.bean.City;
-import cn.flightfeather.thirdapp.bean.District;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Province;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.Town;
+import cn.flightfeather.thirdapp.bean.entity.City;
+import cn.flightfeather.thirdapp.bean.entity.District;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Province;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Town;
import cn.flightfeather.thirdapp.module.MainActivity;
import cn.flightfeather.thirdapp.task.ObtainBoundaryRunnable;
import cn.flightfeather.thirdapp.util.Area;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/SiteDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/SiteDetailActivity.java
index 1aeb9c2..9ef6dc7 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/SiteDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/SiteDetailActivity.java
@@ -15,11 +15,11 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllListViewAdapter;
-import cn.flightfeather.thirdapp.bean.City;
-import cn.flightfeather.thirdapp.bean.District;
-import cn.flightfeather.thirdapp.bean.Province;
-import cn.flightfeather.thirdapp.bean.Site;
-import cn.flightfeather.thirdapp.bean.Town;
+import cn.flightfeather.thirdapp.bean.entity.City;
+import cn.flightfeather.thirdapp.bean.entity.District;
+import cn.flightfeather.thirdapp.bean.entity.Province;
+import cn.flightfeather.thirdapp.bean.entity.Site;
+import cn.flightfeather.thirdapp.bean.entity.Town;
import cn.flightfeather.thirdapp.httpservice.SiteDetailService;
public class SiteDetailActivity extends AppCompatActivity
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/SubTaskMapActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/SubTaskMapActivity.java
index 87043a2..05a50c6 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/SubTaskMapActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/SubTaskMapActivity.java
@@ -29,8 +29,8 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.util.AmapNavi;
public class SubTaskMapActivity extends AppCompatActivity implements View.OnClickListener {
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskActivity.java
index 9413eb9..bfeb018 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskActivity.java
@@ -42,12 +42,12 @@
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener;
import cn.flightfeather.thirdapp.adapter.TaskListAdapter;
import cn.flightfeather.thirdapp.adapter.TopClassTaskAdapter;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.Task;
-import cn.flightfeather.thirdapp.bean.TaskPack;
-import cn.flightfeather.thirdapp.bean.Taskvertion;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Task;
+import cn.flightfeather.thirdapp.bean.vo.TaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Taskvertion;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import cn.flightfeather.thirdapp.bean.vo.TaskVo;
import cn.flightfeather.thirdapp.httpservice.SubTaskService;
import cn.flightfeather.thirdapp.httpservice.TaskService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskAdjustActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskAdjustActivity.java
index 11b7ded..2dc0427 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskAdjustActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskAdjustActivity.java
@@ -10,7 +10,7 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.TaskListAdapter;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.util.Constant;
public class TaskAdjustActivity extends AppCompatActivity implements View.OnClickListener{
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskDetailActivity.java
index 12b2fb1..0d62191 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/TaskDetailActivity.java
@@ -6,7 +6,7 @@
import android.widget.TextView;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.util.Constant;
import cn.flightfeather.thirdapp.util.DateFormatter;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java
index 557bb66..9a3717e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java
@@ -25,7 +25,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.MediaFileListAdapter;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.task.CompressPhotoTask;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/DomainItemListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/DomainItemListAdapter.java
index 0401a9d..37191b1 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/DomainItemListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/DomainItemListAdapter.java
@@ -10,7 +10,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
/**
* Created by note_ff_1602 on 2018/1/24.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/GitTypeListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/GitTypeListAdapter.java
index 3f7ce73..821513a 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/GitTypeListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/GitTypeListAdapter.java
@@ -10,7 +10,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Gittype;
+import cn.flightfeather.thirdapp.bean.entity.Gittype;
/**
* Created by note_ff_1602 on 2018/2/10.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/MOVListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/MOVListAdapter.java
index 2f6738a..a03d386 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/MOVListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/MOVListAdapter.java
@@ -11,7 +11,7 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.activity.MOVMapActivity;
-import cn.flightfeather.thirdapp.bean.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
/**
* Created by linli on 2018/1/25.
@@ -39,7 +39,8 @@
@Override
public void onBindViewHolder(final ScenseListViewHolder holder, final int position) {
- final Scense info = mDataList.get(position);
+ int pos = holder.getAdapterPosition();
+ final Scense info = mDataList.get(pos);
holder.tv_scenseName.setText(info.getName());
holder.tv_no.setText(String.valueOf(info.getDisplayID()));
if (context.getmCurrentMode() == MOVMapActivity.MODE_ADD_SUBTASK) {
@@ -61,8 +62,8 @@
public void onClick(View v) {
int monitorNum = info.getMonitorNum() - 1;
if (monitorNum == 0) {
- context.setmCurrentPosition(position);
- context.updateMarkers(context.getmMarkerList().get(position), info);
+ context.setmCurrentPosition(pos);
+ context.updateMarkers(context.getmMarkerList().get(pos), info);
} else {
info.setMonitorNum(monitorNum);
context.updateScenseDesc();
@@ -78,8 +79,8 @@
public void onClick(View v) {
int num = info.getMonitorNum();
if (num == 0) {
- context.setmCurrentPosition(position);
- context.updateMarkers(context.getmMarkerList().get(position), info);
+ context.setmCurrentPosition(pos);
+ context.updateMarkers(context.getmMarkerList().get(pos), info);
} else {
info.setMonitorNum(num + 1);
context.updateScenseDesc();
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/MediaFileListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/MediaFileListAdapter.java
index e89df19..7003109 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/MediaFileListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/MediaFileListAdapter.java
@@ -10,7 +10,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
/**
* Created by note_ff_1602 on 2018/1/27.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
index 33b1f8f..9e6a2c8 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
@@ -15,7 +15,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.task.DownloadAndSetImageTask;
/**
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java
index b56583b..faab7d4 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java
@@ -31,9 +31,9 @@
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity;
import cn.flightfeather.thirdapp.activity.PromiseActivity;
import cn.flightfeather.thirdapp.activity.SignActivity;
-import cn.flightfeather.thirdapp.bean.AllBoolean;
-import cn.flightfeather.thirdapp.bean.Inspection;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.vo.AllBoolean;
+import cn.flightfeather.thirdapp.bean.entity.Inspection;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.httpservice.InspectionService;
import cn.flightfeather.thirdapp.task.DownloadAndSetImageTask;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemTypeListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemTypeListAdapter.java
index adac23f..d466262 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemTypeListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemTypeListAdapter.java
@@ -10,7 +10,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Problemtype;
+import cn.flightfeather.thirdapp.bean.entity.Problemtype;
/**
* Created by note_ff_1602 on 2018/1/24.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ScenseListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ScenseListAdapter.java
index c0793d2..1059359 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ScenseListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ScenseListAdapter.java
@@ -10,7 +10,7 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.activity.ScenseMapActivity;
-import cn.flightfeather.thirdapp.bean.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
/**
* Created by linli on 2018/1/25.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/SelectedScenseAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/SelectedScenseAdapter.java
index 8e9e76a..303cd96 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/SelectedScenseAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/SelectedScenseAdapter.java
@@ -11,7 +11,7 @@
//
//import cn.flightfeather.thirdapp.R;
//import cn.flightfeather.thirdapp.activity.MonitorObjectVersionMap;
-//import cn.flightfeather.thirdapp.bean.Scense;
+//import cn.flightfeather.thirdapp.bean.entity.Scense;
//
///**
// * Created by linli on 2018/3/8.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/TaskListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/TaskListAdapter.java
index a4ad7a4..5670e4e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/TaskListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/TaskListAdapter.java
@@ -14,7 +14,7 @@
import java.util.Objects;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.util.Constant;
import cn.flightfeather.thirdapp.util.DialogUtil2;
import cn.flightfeather.thirdapp.util.Domain;
@@ -69,9 +69,10 @@
@Override
public void onBindViewHolder(TaskListHolder holder, final int position) {
+ int pos = holder.getAdapterPosition();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm", Locale.getDefault());
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("MM鏈坉d鏃�", Locale.getDefault());
- Subtask subTask = subTaskList.get(position);
+ Subtask subTask = subTaskList.get(pos);
switch (holder.getItemViewType()) {
case ITEM_VIEW_TYPE_HEAD:
Date date1 = subTask.getPlanstarttime();
@@ -91,8 +92,8 @@
holder.mtv_time.setText(planStartTime);
//瀵规槸鍚︽樉绀烘棩鏈熺殑鍒ゆ柇
- if (position>0){
- Subtask subTaskBefore = subTaskList.get(position-1);
+ if (pos>0){
+ Subtask subTaskBefore = subTaskList.get(pos-1);
Calendar calendarBefore = Calendar.getInstance();
calendarBefore.setTime(subTaskBefore.getPlanstarttime());
calendarBefore.set(Calendar.HOUR_OF_DAY,0);
@@ -136,7 +137,7 @@
@Override
public void onClick(View v) {
if (onSwipeItemClickListener != null) {
- onSwipeItemClickListener.click(position);
+ onSwipeItemClickListener.click(pos);
}
}
});
@@ -146,7 +147,7 @@
@Override
public boolean onLongClick(View v) {
DialogUtil2.INSTANCE.showAlertDialog(context, "纭鏄惁鍒犻櫎浠诲姟?", dialog -> {
- onDeleteListener.delete(position);
+ onDeleteListener.delete(pos);
dialog.dismiss();
return Unit.INSTANCE;
}, dialog -> {
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/TopClassTaskAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/TopClassTaskAdapter.java
index e68bd96..ccee5df 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/TopClassTaskAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/TopClassTaskAdapter.java
@@ -12,7 +12,7 @@
import java.util.Locale;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Task;
+import cn.flightfeather.thirdapp.bean.entity.Task;
import cn.flightfeather.thirdapp.util.Constant;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/ChangeAdvice.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeAdvice.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/ChangeAdvice.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeAdvice.java
index 52df07a..417255e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/ChangeAdvice.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeAdvice.java
@@ -1,11 +1,11 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
+import org.greenrobot.greendao.annotation.Generated;
import org.greenrobot.greendao.annotation.Id;
import org.greenrobot.greendao.annotation.Property;
import java.util.Date;
-import org.greenrobot.greendao.annotation.Generated;
/**
* @author riku
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/ChangeEffect.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeEffect.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/ChangeEffect.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeEffect.java
index ac9aee8..2e29a2b 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/ChangeEffect.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/ChangeEffect.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/City.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/City.java
similarity index 96%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/City.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/City.java
index 0c859ad..6c3ea52 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/City.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/City.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/District.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/District.java
similarity index 97%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/District.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/District.java
index b862d52..da65760 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/District.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/District.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Domaincatalog.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domaincatalog.java
similarity index 96%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Domaincatalog.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domaincatalog.java
index e0ff728..71f9895 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Domaincatalog.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domaincatalog.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Domainitem.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domainitem.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Domainitem.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domainitem.java
index f6ccf72..cb167c0 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Domainitem.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Domainitem.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluation.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluation.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluation.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluation.java
index 9be0ae2..1085d2b 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluation.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluation.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluationrule.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationrule.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluationrule.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationrule.java
index 3b4d771..324ada8 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluationrule.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationrule.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluationsubrule.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationsubrule.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluationsubrule.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationsubrule.java
index ff0538d..d0320d5 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Evaluationsubrule.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Evaluationsubrule.java
@@ -1,11 +1,11 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
+import org.greenrobot.greendao.annotation.Generated;
import org.greenrobot.greendao.annotation.Id;
import org.greenrobot.greendao.annotation.Property;
import java.util.Date;
-import org.greenrobot.greendao.annotation.Generated;
/**
* Created by note_ff_1602 on 2017/12/26.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Gitlist.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gitlist.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Gitlist.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gitlist.java
index 6e338e7..3facbdc 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Gitlist.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gitlist.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Gittype.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gittype.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Gittype.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gittype.java
index a151f66..d079d64 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Gittype.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Gittype.java
@@ -1,11 +1,11 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
+import org.greenrobot.greendao.annotation.Generated;
import org.greenrobot.greendao.annotation.Id;
import org.greenrobot.greendao.annotation.Property;
import java.util.Date;
-import org.greenrobot.greendao.annotation.Generated;
/**
* Created by note_ff_1602 on 2017/12/26.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Inspection.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Inspection.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Inspection.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Inspection.java
index b57f941..49a7075 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Inspection.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Inspection.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Itemevaluation.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Itemevaluation.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Itemevaluation.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Itemevaluation.java
index b738280..43f3c99 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Itemevaluation.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Itemevaluation.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/MediaTypeAlias.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/MediaTypeAlias.java
new file mode 100644
index 0000000..dcd8706
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/MediaTypeAlias.java
@@ -0,0 +1,67 @@
+package cn.flightfeather.thirdapp.bean.entity;
+
+import org.greenrobot.greendao.annotation.Entity;
+import org.greenrobot.greendao.annotation.Id;
+import org.greenrobot.greendao.annotation.Property;
+import org.greenrobot.greendao.annotation.Generated;
+
+/**
+ * @author riku
+ * Date: 2020/12/21
+ * 濯掍綋鏂囦欢绫诲瀷鍒悕
+ */
+@Entity
+public class MediaTypeAlias {
+ @Id(autoincrement = true)
+ private long id;
+ @Property
+ private int sceneTypeId;
+ @Property
+ private int typeId;
+ @Property
+ private String typeName;
+ @Property
+ private String alias;
+ @Generated(hash = 1531076614)
+ public MediaTypeAlias(long id, int sceneTypeId, int typeId, String typeName,
+ String alias) {
+ this.id = id;
+ this.sceneTypeId = sceneTypeId;
+ this.typeId = typeId;
+ this.typeName = typeName;
+ this.alias = alias;
+ }
+ @Generated(hash = 849869520)
+ public MediaTypeAlias() {
+ }
+ public long getId() {
+ return this.id;
+ }
+ public void setId(long id) {
+ this.id = id;
+ }
+ public int getSceneTypeId() {
+ return this.sceneTypeId;
+ }
+ public void setSceneTypeId(int sceneTypeId) {
+ this.sceneTypeId = sceneTypeId;
+ }
+ public int getTypeId() {
+ return this.typeId;
+ }
+ public void setTypeId(int typeId) {
+ this.typeId = typeId;
+ }
+ public String getTypeName() {
+ return this.typeName;
+ }
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+ public String getAlias() {
+ return this.alias;
+ }
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+}
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Mediafile.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Mediafile.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Mediafile.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Mediafile.java
index c8ab206..8aab632 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Mediafile.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Mediafile.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Monitorobjectversion.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Monitorobjectversion.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Monitorobjectversion.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Monitorobjectversion.java
index 0aafd54..424d588 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Monitorobjectversion.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Monitorobjectversion.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Problemlist.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemlist.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Problemlist.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemlist.java
index e8b0bc0..a2f5c49 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Problemlist.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemlist.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Problemtype.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemtype.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Problemtype.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemtype.java
index eea752e..75cf1a2 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Problemtype.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Problemtype.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Province.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Province.java
similarity index 96%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Province.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Province.java
index b4d3cb9..883399b 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Province.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Province.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Scense.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Scense.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Scense.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Scense.java
index d8baeaa..28e7e1e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Scense.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Scense.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Site.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Site.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Site.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Site.java
index ff035e2..93cc701 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Site.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Site.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Subtask.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Subtask.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Subtask.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Subtask.java
index 648ef3e..8b06268 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Subtask.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Subtask.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Task.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Task.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Task.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Task.java
index 46fbf56..0f86271 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Task.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Task.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Taskvertion.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Taskvertion.java
similarity index 99%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Taskvertion.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Taskvertion.java
index 8a52184..fee3783 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Taskvertion.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Taskvertion.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Town.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Town.java
similarity index 97%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Town.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Town.java
index 0d7995c..808d216 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Town.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Town.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/Userinfo.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Userinfo.java
similarity index 98%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/Userinfo.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Userinfo.java
index d173be7..f4530d7 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/Userinfo.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/entity/Userinfo.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.entity;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/ActivityBean.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ActivityBean.java
similarity index 80%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/ActivityBean.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ActivityBean.java
index 9af0b24..3e02d3e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/ActivityBean.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ActivityBean.java
@@ -1,6 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
-
-import android.os.Parcelable;
+package cn.flightfeather.thirdapp.bean.vo;
import java.io.Serializable;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/AllBoolean.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/AllBoolean.java
similarity index 83%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/AllBoolean.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/vo/AllBoolean.java
index a51e8d7..9dc450c 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/AllBoolean.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/AllBoolean.java
@@ -1,4 +1,4 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.vo;
/**
* Created by note_ff_1602 on 2018/3/7.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/EvaluationsubruleVo.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/EvaluationsubruleVo.java
index 99fb88f..9196616 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/EvaluationsubruleVo.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/EvaluationsubruleVo.java
@@ -2,7 +2,7 @@
import java.util.Date;
-import cn.flightfeather.thirdapp.bean.Itemevaluation;
+import cn.flightfeather.thirdapp.bean.entity.Itemevaluation;
public class EvaluationsubruleVo {
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/GitlistVo.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/GitlistVo.java
index e7abae6..3297f7e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/GitlistVo.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/GitlistVo.java
@@ -4,7 +4,7 @@
import java.util.Date;
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
/**
* Created by note_ff_1602 on 2017/12/26.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/InspectionVo.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/InspectionVo.java
index 94c5297..f8e6d84 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/InspectionVo.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/InspectionVo.java
@@ -3,8 +3,8 @@
import java.util.Date;
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Inspection;
-import cn.flightfeather.thirdapp.bean.Itemevaluation;
+import cn.flightfeather.thirdapp.bean.entity.Inspection;
+import cn.flightfeather.thirdapp.bean.entity.Itemevaluation;
/**
* Created by note_ff_1602 on 2017/12/26.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/LastSubtaskPack.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/LastSubtaskPack.java
similarity index 85%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/LastSubtaskPack.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/vo/LastSubtaskPack.java
index c15d9f4..9a08a6f 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/LastSubtaskPack.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/LastSubtaskPack.java
@@ -1,8 +1,8 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.vo;
import java.util.List;
-import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
/**
* Created by note_ff_1602 on 2018/1/26.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/MediafileVo.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/MediafileVo.java
index 7489d66..ff39b43 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/MediafileVo.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/MediafileVo.java
@@ -3,7 +3,7 @@
import java.io.File;
import java.util.Date;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.util.CommonUtils;
import cn.flightfeather.thirdapp.util.UUIDGenerator;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ProblemlistVo.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ProblemlistVo.java
index b1e9abd..5b80cb3 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ProblemlistVo.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/ProblemlistVo.java
@@ -4,8 +4,8 @@
import java.util.Date;
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Mediafile;
-import cn.flightfeather.thirdapp.bean.Problemlist;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Problemlist;
/**
* Created by note_ff_1602 on 2017/12/26.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/TaskPack.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskPack.java
similarity index 84%
rename from app/src/main/java/cn/flightfeather/thirdapp/bean/TaskPack.java
rename to app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskPack.java
index 693de6f..b606536 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/TaskPack.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskPack.java
@@ -1,8 +1,6 @@
-package cn.flightfeather.thirdapp.bean;
+package cn.flightfeather.thirdapp.bean.vo;
import java.util.List;
-
-import cn.flightfeather.thirdapp.bean.vo.TaskVo;
/**
* Created by note_ff_1602 on 2018/1/12.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskVo.java b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskVo.java
index 676b6d4..d0f5564 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskVo.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/bean/vo/TaskVo.java
@@ -4,8 +4,8 @@
import java.util.Date;
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.Task;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Task;
/**
* Created by note_ff_1602 on 2018/1/12.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype1/Inspection2Fragment.kt b/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype1/Inspection2Fragment.kt
deleted file mode 100644
index 610df95..0000000
--- a/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype1/Inspection2Fragment.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.flightfeather.thirdapp.business.widgettype1
-
-import cn.flightfeather.thirdapp.BaseFragment
-import cn.flightfeather.thirdapp.R
-
-/**
- * @author riku
- * 2019.3.29
- */
-class Inspection2Fragment : BaseFragment() {
-
- override fun getLayoutId(): Int = R.layout.fragment_inspection2
-
- override fun initView() {
-
- }
-
- override fun initData() {
-
- }
-
- companion object {
- @JvmStatic
- fun newInstance() = Inspection2Fragment()
- }
-}
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype2/HomeFragment_comptent.java b/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype2/HomeFragment_comptent.java
index a6b85fb..51c4980 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype2/HomeFragment_comptent.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype2/HomeFragment_comptent.java
@@ -48,9 +48,9 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllListViewAdapter;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.TaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.vo.TaskPack;
import cn.flightfeather.thirdapp.bean.vo.AreaVo;
import cn.flightfeather.thirdapp.bean.vo.ChargeInfoVo;
import cn.flightfeather.thirdapp.bean.vo.InspectionVo;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype3/HomeFragment_scene.java b/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype3/HomeFragment_scene.java
index 8bb6eca..33cdab4 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype3/HomeFragment_scene.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/business/widgettype3/HomeFragment_scene.java
@@ -42,9 +42,9 @@
import butterknife.Unbinder;
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.bean.vo.InspectionInfoVo;
import cn.flightfeather.thirdapp.bean.vo.InspectionVo;
import cn.flightfeather.thirdapp.bean.vo.RankVo;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/common/database/DbSource.java b/app/src/main/java/cn/flightfeather/thirdapp/common/database/DbSource.java
index 177e7e9..c4c535b 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/common/database/DbSource.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/common/database/DbSource.java
@@ -2,7 +2,7 @@
import java.util.List;
-import cn.flightfeather.thirdapp.bean.ChangeAdvice;
+import cn.flightfeather.thirdapp.bean.entity.ChangeAdvice;
import io.reactivex.Observable;
/**
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/common/database/GreenDaoDb.java b/app/src/main/java/cn/flightfeather/thirdapp/common/database/GreenDaoDb.java
index 3ae4df1..8337f75 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/common/database/GreenDaoDb.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/common/database/GreenDaoDb.java
@@ -14,7 +14,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.CommonApplication;
-import cn.flightfeather.thirdapp.bean.ChangeAdvice;
+import cn.flightfeather.thirdapp.bean.entity.ChangeAdvice;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnalysisOverViewFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnalysisOverViewFragment.java
index 9018429..acfb8fc 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnalysisOverViewFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnalysisOverViewFragment.java
@@ -35,7 +35,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter;
-import cn.flightfeather.thirdapp.bean.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
import cn.flightfeather.thirdapp.bean.vo.RankVo;
import cn.flightfeather.thirdapp.bean.vo.StatisticsVo;
import cn.flightfeather.thirdapp.bean.vo.TaskFrequencyVo;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisProblemFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisProblemFragment.java
index 274c176..9a9f196 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisProblemFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisProblemFragment.java
@@ -59,11 +59,11 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllListViewAdapter;
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter;
-import cn.flightfeather.thirdapp.bean.City;
-import cn.flightfeather.thirdapp.bean.District;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Province;
-import cn.flightfeather.thirdapp.bean.Town;
+import cn.flightfeather.thirdapp.bean.entity.City;
+import cn.flightfeather.thirdapp.bean.entity.District;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Province;
+import cn.flightfeather.thirdapp.bean.entity.Town;
import cn.flightfeather.thirdapp.bean.vo.AreaVo;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.httpservice.ProblemListService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisRankFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisRankFragment.java
index 7c1a47c..9ea6a35 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisRankFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/dataanalysis/AnysisRankFragment.java
@@ -29,8 +29,8 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllListViewAdapter;
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Evaluation;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Evaluation;
import cn.flightfeather.thirdapp.bean.vo.TaskVo;
import cn.flightfeather.thirdapp.httpservice.EvaluationService;
import cn.flightfeather.thirdapp.httpservice.TaskService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/fragment/CardFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/fragment/CardFragment.java
index 29e0fde..3324057 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/fragment/CardFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/fragment/CardFragment.java
@@ -27,7 +27,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.activity.LoginActivity;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import cn.flightfeather.thirdapp.module.MainActivity;
import retrofit2.Call;
import retrofit2.Callback;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/fragment/HomeFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/fragment/HomeFragment.java
index 993e48c..5d4bd81 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/fragment/HomeFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/fragment/HomeFragment.java
@@ -39,10 +39,10 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Evaluation;
-import cn.flightfeather.thirdapp.bean.LastSubtaskPack;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.TaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Evaluation;
+import cn.flightfeather.thirdapp.bean.vo.LastSubtaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.vo.TaskPack;
import cn.flightfeather.thirdapp.bean.vo.InspectionVo;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.bean.vo.TaskVo;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/fragment/SettingFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/fragment/SettingFragment.java
index d204f63..909714e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/fragment/SettingFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/fragment/SettingFragment.java
@@ -18,7 +18,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.activity.LoginActivity;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import cn.flightfeather.thirdapp.httpservice.SettingsService;
import cn.flightfeather.thirdapp.util.GlobalConfig;
import cn.flightfeather.thirdapp.view.SettingCommItemView;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/fragment/TaskFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/fragment/TaskFragment.java
index 6f01392..6384756 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/fragment/TaskFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/fragment/TaskFragment.java
@@ -33,10 +33,10 @@
import cn.flightfeather.thirdapp.activity.TaskActivity;
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener;
import cn.flightfeather.thirdapp.adapter.TaskListAdapter;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.TaskPack;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.vo.TaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import cn.flightfeather.thirdapp.bean.vo.TaskVo;
import cn.flightfeather.thirdapp.httpservice.SubTaskService;
import cn.flightfeather.thirdapp.httpservice.TaskService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/EvaluationService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/EvaluationService.java
index d9cce4f..5648165 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/EvaluationService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/EvaluationService.java
@@ -2,8 +2,8 @@
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Evaluation;
-import cn.flightfeather.thirdapp.bean.Itemevaluation;
+import cn.flightfeather.thirdapp.bean.entity.Evaluation;
+import cn.flightfeather.thirdapp.bean.entity.Itemevaluation;
import io.reactivex.Observable;
import okhttp3.ResponseBody;
import retrofit2.Call;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InitDataService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InitDataService.java
index 97e9117..5ab6463 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InitDataService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InitDataService.java
@@ -2,20 +2,20 @@
import java.util.List;
-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.Site;
+import cn.flightfeather.thirdapp.bean.entity.Town;
import retrofit2.Call;
import retrofit2.http.GET;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InspectionService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InspectionService.java
index 9aa0175..9a6a772 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InspectionService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/InspectionService.java
@@ -2,15 +2,15 @@
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Gitlist;
-import cn.flightfeather.thirdapp.bean.Inspection;
-import cn.flightfeather.thirdapp.bean.LastSubtaskPack;
-import cn.flightfeather.thirdapp.bean.Mediafile;
-import cn.flightfeather.thirdapp.bean.Problemlist;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Site;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.TaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Gitlist;
+import cn.flightfeather.thirdapp.bean.entity.Inspection;
+import cn.flightfeather.thirdapp.bean.vo.LastSubtaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Problemlist;
+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.vo.TaskPack;
import cn.flightfeather.thirdapp.bean.vo.GitlistVo;
import cn.flightfeather.thirdapp.bean.vo.InspectionInfoVo;
import cn.flightfeather.thirdapp.bean.vo.InspectionVo;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/MonitorObjectVersionService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/MonitorObjectVersionService.java
index 3b265a4..611b633 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/MonitorObjectVersionService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/MonitorObjectVersionService.java
@@ -2,7 +2,7 @@
import java.util.ArrayList;
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion;
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.http.Body;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/ScenseService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/ScenseService.java
index 26017b8..3faa557 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/ScenseService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/ScenseService.java
@@ -2,8 +2,8 @@
import java.util.ArrayList;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Task;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Task;
import io.reactivex.Observable;
import okhttp3.ResponseBody;
import retrofit2.Call;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SettingsService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SettingsService.java
index 37a32af..d54bcbe 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SettingsService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SettingsService.java
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.httpservice;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.http.Body;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SiteDetailService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SiteDetailService.java
index 2fbd7d2..2d685cd 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SiteDetailService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SiteDetailService.java
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.httpservice;
-import cn.flightfeather.thirdapp.bean.Site;
+import cn.flightfeather.thirdapp.bean.entity.Site;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.http.Body;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SubTaskService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SubTaskService.java
index bd65d1d..ca729a1 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SubTaskService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/SubTaskService.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.http.Body;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskService.java
index 0be491a..981f1f8 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskService.java
@@ -3,8 +3,8 @@
import java.util.ArrayList;
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Task;
-import cn.flightfeather.thirdapp.bean.TaskPack;
+import cn.flightfeather.thirdapp.bean.entity.Task;
+import cn.flightfeather.thirdapp.bean.vo.TaskPack;
import cn.flightfeather.thirdapp.bean.vo.DayTaskProgressVo;
import cn.flightfeather.thirdapp.bean.vo.RankVo;
import cn.flightfeather.thirdapp.bean.vo.TaskFrequencyVo;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskVersionService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskVersionService.java
index 85f1e66..c448767 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskVersionService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/TaskVersionService.java
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.httpservice;
-import cn.flightfeather.thirdapp.bean.Taskvertion;
+import cn.flightfeather.thirdapp.bean.entity.Taskvertion;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.http.Body;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/UserInfoService.java b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/UserInfoService.java
index be286bc..5319329 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/httpservice/UserInfoService.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/httpservice/UserInfoService.java
@@ -2,7 +2,7 @@
import java.util.List;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Path;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
index 19817ac..dfca918 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/MediaFileType.kt
@@ -13,7 +13,26 @@
RoutineRecord(5, "甯歌璁板綍"),
Signature(6, "绛惧瓧"),
-
Nameplate(7, "閾墝"),
- Others(99,"鍏朵粬")
+
+ TYPE_1(51, "鎵╁睍绫讳竴"),
+ TYPE_2(52, "鎵╁睍绫讳簩"),
+ TYPE_3(53, "鎵╁睍绫讳笁"),
+ TYPE_4(54, "鎵╁睍绫诲洓"),
+ TYPE_5(55, "鎵╁睍绫讳簲"),
+ TYPE_6(56, "鎵╁睍绫诲叚"),
+ TYPE_7(57, "鎵╁睍绫讳竷"),
+ TYPE_8(58, "鎵╁睍绫诲叓"),
+ TYPE_9(59, "鎵╁睍绫讳節"),
+ TYPE_10(60, "鎵╁睍绫诲崄"),
+
+ Others(99,"鍏朵粬");
+
+ companion object {
+ fun getList(sceneTypeId: Int) = when (sceneTypeId) {
+ // FIXME: 2020/12/21 姝ゅ5浠ｈ〃椁愰ギ浼佷笟绫诲瀷锛屽悗缁簲璇ユ坊鍔犳灇涓剧被绛夎鑼冧唬鐮�
+ 5 -> listOf(RoutineRecord, TYPE_1, TYPE_2, TYPE_3, TYPE_4, TYPE_5, TYPE_6, TYPE_7, TYPE_8, TYPE_9, TYPE_10)
+ else -> listOf(RoutineRecord, MonitorDevice, Nameplate)
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/SceneType.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/SceneType.kt
new file mode 100644
index 0000000..5329335
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/enumreation/SceneType.kt
@@ -0,0 +1,22 @@
+package cn.flightfeather.thirdapp.model.enumreation
+
+/**
+ * @author riku
+ * Date: 2020/12/22
+ */
+enum class SceneType(val value: Int, val des: String) {
+ Construction(1, "宸ュ湴"),
+ Wharf(2, "鐮佸ご"),
+ MixingPlant(3, "鎼呮媽绔�"),
+ Industrial(4, "宸ヤ笟浼佷笟"),
+ Restaurant(5, "椁愰ギ浼佷笟"),
+ VehicleRepair(6, "姹戒慨"),
+ SCENE_TYPE7(7, "闄嶅皹鐐�"),
+ SCENE_TYPE8(8, "绌烘皵璐ㄩ噺鐩戞祴鐐�"),
+ SCENE_TYPE9(9, "閬撹矾鎵皹鐩戞祴鐐�"),
+ SCENE_TYPE10(10, "閬撹矾"),
+ SCENE_TYPE11(11, "娌虫祦鏂潰"),
+ SCENE_TYPE12(12, "宸ヤ笟鍥尯"),
+ SCENE_TYPE13(13, "鏃犲浐瀹氬満鏅�"),
+ StorageYard(14, "鍫嗗満");
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/event/InspectionEvent.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/event/InspectionEvent.kt
index b00ca2c..daf58d7 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/model/event/InspectionEvent.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/event/InspectionEvent.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.model.event
-import cn.flightfeather.thirdapp.bean.Inspection
+import cn.flightfeather.thirdapp.bean.entity.Inspection
/**
* @author riku
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/event/ProblemEvent.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/event/ProblemEvent.kt
index e0c1f10..b7e36cb 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/model/event/ProblemEvent.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/event/ProblemEvent.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.model.event
-import cn.flightfeather.thirdapp.bean.Problemlist
+import cn.flightfeather.thirdapp.bean.entity.Problemlist
/**
* @author riku
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/event/SceneEvent.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/event/SceneEvent.kt
index a2e8e84..350525d 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/model/event/SceneEvent.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/event/SceneEvent.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.model.event
-import cn.flightfeather.thirdapp.bean.Scense
+import cn.flightfeather.thirdapp.bean.entity.Scense
/**
* @author riku
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/model/event/TopTaskEvent.kt b/app/src/main/java/cn/flightfeather/thirdapp/model/event/TopTaskEvent.kt
index fa1db2f..5ad8b92 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/model/event/TopTaskEvent.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/model/event/TopTaskEvent.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.model.event
-import cn.flightfeather.thirdapp.bean.Task
+import cn.flightfeather.thirdapp.bean.entity.Task
/**
* @author riku
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/MainActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/module/MainActivity.java
index 4bb5073..eb540c4 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/MainActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/MainActivity.java
@@ -20,7 +20,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.business.widgettype2.HomeFragment_comptent;
import cn.flightfeather.thirdapp.business.widgettype3.HomeFragment_scene;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt
index 47a2a08..cce3bee 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt
@@ -9,9 +9,9 @@
import cn.flightfeather.thirdapp.activity.ProblemDetailActivity
import cn.flightfeather.thirdapp.adapter.ProblemListAdapter
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener
-import cn.flightfeather.thirdapp.bean.Inspection
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Inspection
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.model.event.ProblemEvent
import cn.flightfeather.thirdapp.module.base.BaseActivity
import kotlinx.android.synthetic.main.dialog_problem_list.*
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListViewModel.kt
index a1f72a9..3fc957d 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListViewModel.kt
@@ -1,8 +1,8 @@
package cn.flightfeather.thirdapp.module.inspection
import android.arch.lifecycle.MutableLiveData
-import cn.flightfeather.thirdapp.bean.LastSubtaskPack
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.vo.LastSubtaskPack
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.common.net.ResultCallBack2
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
index 3cde748..32ca2de 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
@@ -3,7 +3,6 @@
import android.app.Activity
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
-import android.content.DialogInterface
import android.content.Intent
import android.net.Uri
import android.os.Bundle
@@ -20,9 +19,9 @@
import cn.flightfeather.thirdapp.activity.ProblemDetailActivity
import cn.flightfeather.thirdapp.activity.PromiseActivity
import cn.flightfeather.thirdapp.adapter.IconsPageAdapter
-import cn.flightfeather.thirdapp.bean.Mediafile
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.model.event.InspectionEvent
import cn.flightfeather.thirdapp.model.event.ProblemEvent
@@ -625,7 +624,7 @@
val l1 = LatLng(lat, lng)
val l2 = LatLng(last[1], last[0])
val distance = AMapUtils.calculateLineDistance(l1, l2)
- if (distance >= 1) {
+ if (distance >= 1 && distance < 1000 && lat != 0.0 && lng != 0.0) {
extension1 = "${extension1};${lng},${lat}"
//閬撹矾鐩戞祴鐐瑰拰閬撹矾绫诲瀷鐨勫満鏅紝鐩存帴灞曠ず杞ㄨ抗锛涘叾浣欏満鏅彧鏈夌鐞嗗憳鍜屾斂搴滈儴闂ㄥ彲浠ユ煡鐪�
if (
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt
index fc26e00..b027539 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailViewModel.kt
@@ -1,9 +1,9 @@
package cn.flightfeather.thirdapp.module.inspection
import android.arch.lifecycle.MutableLiveData
-import cn.flightfeather.thirdapp.bean.Inspection
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Inspection
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.InspectionVo
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionFragment.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionFragment.kt
index 918bed6..9ba2f16 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionFragment.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionFragment.kt
@@ -15,13 +15,12 @@
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.activity.UploadMediaFilesActivity
import cn.flightfeather.thirdapp.adapter.TaskListAdapter
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.DayTaskProgressVo
import cn.flightfeather.thirdapp.module.base.BaseFragment
import cn.flightfeather.thirdapp.util.DateFormatter
import cn.flightfeather.thirdapp.util.DialogUtil
-import cn.flightfeather.thirdapp.util.slideswaphelper.PlusItemSlideCallback
-import cn.flightfeather.thirdapp.util.slideswaphelper.WItemTouchHelperPlus
+import cn.flightfeather.thirdapp.util.Domain
import com.haibin.calendarview.Calendar
import com.haibin.calendarview.CalendarView
import kotlinx.android.synthetic.main.fragment_inspection2.*
@@ -47,7 +46,7 @@
//褰撳墠閫変腑鐨勬棩鏈�
private var curDate = Date()
- lateinit var subTaskListAdapter: TaskListAdapter
+ private lateinit var subTaskListAdapter: TaskListAdapter
private var loadingDialog: Dialog? = null
@@ -84,10 +83,10 @@
viewModel.dayTaskList.observe(this, Observer {
// 2019/7/29 鍦ㄦ棩鍘嗕笂娣诲姞鏍囪鐐�
it?.let {
- closeLoading()
curDayTaskList = it
addScheme(it)
refreshText(it)
+// closeLoading()
}
})
@@ -126,7 +125,6 @@
}
private fun refreshSubTaskList(newSubTaskList: ArrayList<Subtask> = arrayListOf(), taskDate:Date) {
- closeLoading()
curSubTaskList.clear()
with(curDayTaskList) breaking@{
forEach {
@@ -153,8 +151,16 @@
extension3 = "0"
})
}
- curSubTaskList.addAll(newSubTaskList)
+ curSubTaskList.addAll(newSubTaskList.sortedBy {
+ when (it.status) {
+ Domain.TASK_STATUS_WAITING -> 1
+ Domain.TASK_STATUS_RUNNING -> 2
+ Domain.TASK_STATUS_FINISHED -> 3
+ else -> -1
+ }
+ })
subTaskListAdapter.notifyDataSetChanged()
+ closeLoading()
}
/**
* 鍒濆鍖栨棩鍘嗘帶浠�
@@ -316,9 +322,9 @@
}
}
- Handler().postDelayed({
- closeLoading()
- }, 5000)
+// Handler().postDelayed({
+// closeLoading()
+// }, 10000)
}
private fun closeLoading() {
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionViewModel.kt
index 598af79..86e61d8 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionViewModel.kt
@@ -2,7 +2,7 @@
import android.arch.lifecycle.MutableLiveData
import cn.flightfeather.thirdapp.CommonApplication
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.DayTaskProgressVo
import cn.flightfeather.thirdapp.bean.vo.TaskVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt
index 674d3b6..f6e86cb 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt
@@ -1,5 +1,6 @@
package cn.flightfeather.thirdapp.module.inspection
+import android.annotation.SuppressLint
import android.app.Activity
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
@@ -8,15 +9,18 @@
import android.os.Environment
import android.support.v7.widget.GridLayoutManager
import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity
import cn.flightfeather.thirdapp.adapter.PhotoListAdapter
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener
-import cn.flightfeather.thirdapp.bean.Inspection
-import cn.flightfeather.thirdapp.bean.Mediafile
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Inspection
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.model.enumreation.MediaFileType
import cn.flightfeather.thirdapp.module.base.BaseActivity
import cn.flightfeather.thirdapp.module.base.BaseTakePicActivity
@@ -26,7 +30,10 @@
import cn.flightfeather.thirdapp.util.UUIDGenerator
import cn.flightfeather.thirdapp.util.file.FileUtil
import cn.flightfeather.thirdapp.util.photo.PhotoUtil
+import cn.flightfeather.thirdapp.view.SearchView
import kotlinx.android.synthetic.main.dialog_camera.*
+import kotlinx.android.synthetic.main.dialog_camera.fab_problem_list_close
+import kotlinx.android.synthetic.main.dialog_camera_3.*
import org.jetbrains.anko.toast
import java.io.File
import java.io.IOException
@@ -37,7 +44,7 @@
const val BUSINESS_TYPE_CAMERA = 5
class MenuCameraActivity : BaseActivity() {
- override fun getLayoutId(): Int = R.layout.dialog_camera
+ override fun getLayoutId(): Int = R.layout.dialog_camera_3
//椤甸潰鏀寔鐨勬媿鎽勫浘鐗囩被鍨�
private val typeList = listOf(MediaFileType.RoutineRecord, MediaFileType.Nameplate, MediaFileType.MonitorDevice)
@@ -46,6 +53,8 @@
private var currentType = MediaFileType.RoutineRecord
lateinit var viewModel: MenuCameraViewModel
+
+ private val viewList = mutableListOf<View>()
var subTask: Subtask? = null
var inspection: Inspection? = null
@@ -66,7 +75,11 @@
initUI()
initObserver()
- inspection?.guid?.let { viewModel.getMediaFile(it) }
+ inspection?.guid?.let {guid ->
+ scene?.typeid?.let { typeId ->
+ viewModel.getMediaFile(guid, typeId.toInt())
+ }
+ }
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -106,19 +119,34 @@
}
private fun initUI() {
- typeList.forEach {
- getDataSet(it).run {
- initRecyclerView(first.value, second, it)
- }
- }
+// typeList.forEach {
+// getDataSet(it).run {
+// initRecyclerView(first.value, second, it)
+// }
+// }
fab_problem_list_close.setOnClickListener {
finish()
}
}
- private fun initRecyclerView(dataList: MutableList<Mediafile>?, recyclerView: RecyclerView, type: MediaFileType) {
- if (dataList==null) return
- recyclerView.run {
+ @SuppressLint("SetTextI18n")
+ private fun initRecyclerView(dataList: List<Mediafile>?, type: MediaFileType, alias: String?) {
+ if (dataList == null) return
+ val view = LayoutInflater.from(this).inflate(R.layout.item_take_photo, null)
+ val searchView = view.findViewById<SearchView>(R.id.search_view)
+ val title = view.findViewById<TextView>(R.id.txt_title)
+ searchView.onConfirm = { str ->
+ scene?.typeid?.let {
+ viewModel.updateAlias(it.toInt(), type, str) { alias ->
+ title.text = if (alias.isBlank()) type.des else "${alias}(${type.des})"
+ }
+ }
+ }
+ title.text = if (alias.isNullOrBlank()) type.des else "${alias}(${type.des})"
+ view.findViewById<ImageView>(R.id.img_edit).setOnClickListener {
+ searchView.show(type.des, alias ?: "")
+ }
+ view.findViewById<RecyclerView>(R.id.rv_photo_list).run {
layoutManager = GridLayoutManager(this@MenuCameraActivity, 4)
adapter = PhotoListAdapter(dataList, this@MenuCameraActivity)
addOnItemTouchListener(RecyclerItemClickListener(this@MenuCameraActivity, this, object : RecyclerItemClickListener.OnItemClickListener {
@@ -154,21 +182,31 @@
}))
}
+
+ viewList.add(view)
}
private fun initObserver() {
- typeList.forEach {
- getDataSet(it).run {
- first.observe(this@MenuCameraActivity, Observer {list->
- list?.let {
- second.adapter?.notifyDataSetChanged()
- }
- })
+ viewModel.fileList.observe(this, Observer {
+ it?.forEach { m ->
+ initRecyclerView(m.dataList, m.type ?: MediaFileType.Others, m.alias)
}
- }
+ if (viewList.isNotEmpty()) {
+ banner.dataList = viewList
+ }
+ })
+// typeList.forEach {
+// getDataSet(it).run {
+// first.observe(this@MenuCameraActivity, Observer {list->
+// list?.let {
+// second.adapter?.notifyDataSetChanged()
+// }
+// })
+// }
+// }
}
- private fun putMediaFile(path: String, fileName: String, calendar: Calendar):Mediafile {
+ private fun putMediaFile(path: String, fileName: String, calendar: Calendar): Mediafile {
val mediaFile = Mediafile()
mediaFile.guid = UUIDGenerator.generate16ShortUUID()
mediaFile.iguid = inspection?.guid
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraViewModel.kt
index 8d93bcd..323d502 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraViewModel.kt
@@ -1,12 +1,17 @@
package cn.flightfeather.thirdapp.module.inspection
import android.arch.lifecycle.MutableLiveData
-import cn.flightfeather.thirdapp.bean.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.model.enumreation.MediaFileType
+import cn.flightfeather.thirdapp.model.enumreation.SceneType
import cn.flightfeather.thirdapp.module.base.BaseViewModel
+import cn.flightfeather.thirdapp.repository.CommonRepository
import cn.flightfeather.thirdapp.repository.InspectionRepository
import cn.flightfeather.thirdapp.repository.ProblemRepository
+import org.jetbrains.anko.collections.forEachByIndex
+import org.jetbrains.anko.collections.forEachWithIndex
+import org.jetbrains.anko.toast
/**
* @author riku
@@ -14,8 +19,15 @@
*/
class MenuCameraViewModel : BaseViewModel() {
+ class MediaData {
+ var type: MediaFileType? = null
+ var alias: String? = null
+ var dataList = ArrayList<Mediafile>()
+ }
+
private val inspectionRepository = InspectionRepository()
private val problemRepository = ProblemRepository()
+ private val commonRepository = CommonRepository()
//甯歌璁板綍鍥剧墖
val routineRecordList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }
@@ -23,6 +35,9 @@
val nameplateList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }
//鐩戞祴璁惧鍥剧墖
val monitorDeviceList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }
+
+ val fileList = MutableLiveData<MutableList<MediaData>>().apply { value = mutableListOf() }
+ private var loadedCount = 0
private val dataSet = listOf(
Pair(MediaFileType.RoutineRecord, routineRecordList),
@@ -33,25 +48,48 @@
/**
* 鑾峰彇浠绘剰鎷嶇収鍥剧墖
*/
- fun getMediaFile(inspectionId: String) {
- dataSet.forEach {p ->
- inspectionRepository.getMediaFile(inspectionId, p.first.value, object : ResultCallBack<ArrayList<Mediafile>> {
- override fun onSuccess(result: ArrayList<Mediafile>?) {
- result?.let {
- p.second.value?.run {
- clear()
- add(0, Mediafile())//鍦ㄥ垪琛ㄥご娣诲姞鍥剧墖鎷嶆憚鎸夐挳
- addAll(it)
+ fun getMediaFile(inspectionId: String, sceneTypeId: Int) {
+ commonRepository.getMediaFileTypes(sceneTypeId, object : ResultCallBack<List<MediaFileType>> {
+ override fun onSuccess(types: List<MediaFileType>?) {
+ fileList.value?.clear()
+ loadedCount = 0
+ types?.forEachWithIndex { i, type ->
+ inspectionRepository.getMediaFile(inspectionId, type.value, object : ResultCallBack<ArrayList<Mediafile>> {
+ override fun onSuccess(result: ArrayList<Mediafile>?) {
+ commonRepository.getAlias(sceneTypeId, type, object : ResultCallBack<String> {
+ override fun onSuccess(alias: String?) {
+ result?.let {
+ fileList.value?.add(MediaData().apply {
+ this.type = type
+ this.alias = if (alias.isNullOrBlank()) null else alias
+ dataList = it
+ dataList.add(0, Mediafile())
+ })
+ onMediaFileGet(types.size, sceneTypeId)
+ }
+ }
+
+ override fun onFailure() {
+ }
+ })
}
- p.second.value = p.second.value
- }
+
+ override fun onFailure() {
+
+ }
+
+ })
}
+ }
- override fun onFailure() {
+ override fun onFailure() {
- }
+ }
+ })
- })
+
+ dataSet.forEach { p ->
+
}
}
@@ -70,4 +108,58 @@
})
}
+
+ fun updateAlias(sceneTypeId: Int, mediaFileType: MediaFileType, alias: String, s: (s: String) -> Unit) {
+ commonRepository.updateAlias(sceneTypeId, mediaFileType, alias, object : ResultCallBack<Boolean> {
+ override fun onSuccess(result: Boolean?) {
+ application.toast("淇敼鎴愬姛")
+ s(alias)
+ }
+
+ override fun onFailure() {
+ application.toast("淇敼澶辫触")
+ }
+ })
+ }
+
+ private fun onMediaFileGet(total: Int, sceneTypeId: Int) {
+ loadedCount++
+ if (loadedCount == total) {
+ val list = fileList.value?.sortedBy {
+ it.type?.value
+ }?.toMutableList() ?: mutableListOf()
+ if (sceneTypeId == SceneType.Construction.value
+ || sceneTypeId == SceneType.Wharf.value
+ || sceneTypeId == SceneType.MixingPlant.value
+ || sceneTypeId == SceneType.StorageYard.value) {
+ fileList.value?.clear()
+ for (i in list.indices) {
+ if (list[i].type == MediaFileType.RoutineRecord) {
+ fileList.value?.add(list[i])
+ list.removeAt(i)
+ break
+ }
+ }
+ for (i in list.indices) {
+ if (list[i].type == MediaFileType.MonitorDevice) {
+ fileList.value?.add(list[i])
+ list.removeAt(i)
+ break
+ }
+ }
+ for (i in list.indices) {
+ if (list[i].type == MediaFileType.Nameplate) {
+ fileList.value?.add(list[i])
+ list.removeAt(i)
+ break
+ }
+ }
+ fileList.value?.addAll(list)
+ fileList.value = fileList.value
+ } else {
+ fileList.value = list
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceActivity.kt
index 0e6fda9..b128573 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceActivity.kt
@@ -12,7 +12,7 @@
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.adapter.DomainItemListAdapter
import cn.flightfeather.thirdapp.adapter.ProblemTypeListAdapter
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.model.event.ProblemEvent
import cn.flightfeather.thirdapp.module.base.BaseTakePicActivity
import cn.flightfeather.thirdapp.util.DateFormatter
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceViewModel.kt
index 9042490..5966184 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuEvidenceViewModel.kt
@@ -1,7 +1,7 @@
package cn.flightfeather.thirdapp.module.inspection
import android.arch.lifecycle.MutableLiveData
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.model.event.ProblemEvent
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeActivity.kt
index 15915ef..f61fd44 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeActivity.kt
@@ -14,8 +14,8 @@
import android.widget.TextView
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.EvaluationsubruleVo
import cn.flightfeather.thirdapp.module.base.BaseActivity
import cn.flightfeather.thirdapp.util.Constant
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeViewModel.kt
index 51bce3f..4e85559 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuGradeViewModel.kt
@@ -1,16 +1,14 @@
package cn.flightfeather.thirdapp.module.inspection
import android.arch.lifecycle.MutableLiveData
-import android.util.Log
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.bean.vo.EvaluationsubruleVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.module.base.BaseViewModel
import cn.flightfeather.thirdapp.repository.EvaluationRepository
import cn.flightfeather.thirdapp.util.UUIDGenerator
import okhttp3.ResponseBody
-import org.greenrobot.eventbus.EventBus
import java.util.*
import kotlin.collections.ArrayList
import kotlin.math.abs
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
index 915986e..13b2905 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
@@ -16,7 +16,7 @@
import cn.flightfeather.thirdapp.adapter.GitListAdapter
import cn.flightfeather.thirdapp.adapter.GitTypeListAdapter
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.common.database.DbFactory
import cn.flightfeather.thirdapp.common.net.RetrofitFactory
import cn.flightfeather.thirdapp.httpservice.InspectionService
@@ -26,7 +26,6 @@
import cn.flightfeather.thirdapp.util.UUIDGenerator
import cn.flightfeather.thirdapp.util.file.FileUtil
import com.ping.greendao.gen.GittypeDao
-import kotlinx.android.synthetic.main.dialog_camera.*
import kotlinx.android.synthetic.main.dialog_camera.fab_problem_list_close
import kotlinx.android.synthetic.main.dialog_camera.iv_new_photo
import kotlinx.android.synthetic.main.dialog_camera.tv_title
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitViewModel.kt
index 60cb19f..8806eb2 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitViewModel.kt
@@ -1,7 +1,7 @@
package cn.flightfeather.thirdapp.module.inspection
import android.arch.lifecycle.MutableLiveData
-import cn.flightfeather.thirdapp.bean.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
import cn.flightfeather.thirdapp.bean.vo.GitlistVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.module.base.BaseViewModel
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemUpdateActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemUpdateActivity.kt
index a71fdfa..2767749 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemUpdateActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemUpdateActivity.kt
@@ -6,9 +6,9 @@
import android.os.Environment
import android.view.View
import android.widget.AdapterView
-import cn.flightfeather.thirdapp.bean.Domainitem
-import cn.flightfeather.thirdapp.bean.Mediafile
-import cn.flightfeather.thirdapp.bean.Problemtype
+import cn.flightfeather.thirdapp.bean.entity.Domainitem
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Problemtype
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.module.base.VIEW_PHOTO
import kotlinx.android.synthetic.main.dialog_take_evidence.*
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java
index 717f2c7..623d75b 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java
@@ -31,8 +31,8 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
import cn.flightfeather.thirdapp.bean.vo.ProblemCategoryVo;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.httpservice.ProblemListService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeDetailActivity.java
index 8d3e486..00a12d1 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeDetailActivity.java
@@ -45,7 +45,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.bean.vo.MediafileVo;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.httpservice.ProblemListService;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeFragment.java
index a0845c3..936d1bb 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeFragment.java
@@ -33,7 +33,7 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity;
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.util.Constant;
import cn.flightfeather.thirdapp.util.DateFormatter;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementActivity.kt
index ede9418..7fa0016 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementActivity.kt
@@ -7,7 +7,7 @@
import android.widget.AdapterView
import android.widget.ArrayAdapter
import cn.flightfeather.thirdapp.R
-import cn.flightfeather.thirdapp.bean.Scense
+import cn.flightfeather.thirdapp.bean.entity.Scense
import kotlinx.android.synthetic.main.layout_search_bar.*
import java.util.*
import kotlin.collections.ArrayList
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementViewModel.kt
index 57b0fbe..e3717a5 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/MonthTaskManagementViewModel.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.module.task
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import okhttp3.ResponseBody
import org.jetbrains.anko.toast
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewMonthTaskMapActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewMonthTaskMapActivity.kt
index 5d31f61..a7a9c59 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewMonthTaskMapActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewMonthTaskMapActivity.kt
@@ -9,9 +9,9 @@
import android.widget.ArrayAdapter
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Task
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Task
import cn.flightfeather.thirdapp.bean.vo.TaskVo
import cn.flightfeather.thirdapp.model.event.TopTaskEvent
import cn.flightfeather.thirdapp.util.Constant
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskActivity.kt
index 7ad4aa8..a06306c 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskActivity.kt
@@ -11,7 +11,7 @@
import android.widget.*
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter
-import cn.flightfeather.thirdapp.bean.Scense
+import cn.flightfeather.thirdapp.bean.entity.Scense
import cn.flightfeather.thirdapp.module.base.BaseMapActivity
import cn.flightfeather.thirdapp.module.base.GROUP_POINT
import cn.flightfeather.thirdapp.util.Constant
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt
index 7d00dd7..ea869ad 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt
@@ -5,10 +5,10 @@
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
import cn.flightfeather.thirdapp.CommonApplication
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
-import cn.flightfeather.thirdapp.bean.Task
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Task
import cn.flightfeather.thirdapp.bean.vo.TaskVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.model.event.TopTaskEvent
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskActivity.kt
index 3de5399..e7f4004 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskActivity.kt
@@ -3,7 +3,7 @@
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import cn.flightfeather.thirdapp.R
-import cn.flightfeather.thirdapp.bean.Task
+import cn.flightfeather.thirdapp.bean.entity.Task
import cn.flightfeather.thirdapp.module.base.BaseMapActivity
import cn.flightfeather.thirdapp.util.Constant
import cn.flightfeather.thirdapp.util.Domain
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskViewModel.kt
index 70d7287..afd3dfc 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewTopTaskViewModel.kt
@@ -2,7 +2,7 @@
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
-import cn.flightfeather.thirdapp.bean.Scense
+import cn.flightfeather.thirdapp.bean.entity.Scense
/**
* @author riku
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailActivity.kt
index 7209478..331cad7 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailActivity.kt
@@ -11,7 +11,7 @@
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.activity.MapActivity
import cn.flightfeather.thirdapp.adapter.AllListViewAdapter
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.model.event.SceneEvent
import cn.flightfeather.thirdapp.module.base.BaseActivity
import cn.flightfeather.thirdapp.util.Domain
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailViewModel.kt
index 992d030..2a2ad76 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/SceneDetailViewModel.kt
@@ -1,7 +1,7 @@
package cn.flightfeather.thirdapp.module.task
import android.arch.lifecycle.MutableLiveData
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.model.event.SceneEvent
import cn.flightfeather.thirdapp.module.base.BaseViewModel
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/CommonRepository.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/CommonRepository.kt
index 86e494b..40e8692 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/CommonRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/CommonRepository.kt
@@ -1,12 +1,16 @@
package cn.flightfeather.thirdapp.repository
import cn.flightfeather.thirdapp.common.net.ResultCallBack
+import cn.flightfeather.thirdapp.common.net.ResultObserver
import cn.flightfeather.thirdapp.common.net.RetrofitFactory
import cn.flightfeather.thirdapp.httpservice.CommonService
+import cn.flightfeather.thirdapp.model.enumreation.MediaFileType
+import cn.flightfeather.thirdapp.repository.dao.MediaTypeAliasDao
import io.reactivex.schedulers.Schedulers
import okhttp3.MediaType
import okhttp3.MultipartBody
import okhttp3.RequestBody
+import retrofit2.Response
import java.io.File
/**
@@ -14,6 +18,7 @@
* Date: 2020/4/23
*/
class CommonRepository {
+ private val mediaTypeAliasDao = MediaTypeAliasDao()
fun upLoadCrashInfo(accountName: String, file: File, resultCallBack: ResultCallBack<Boolean>) {
val builder = MultipartBody.Builder()
@@ -34,4 +39,53 @@
resultCallBack.onFailure()
})
}
+
+
+ /**
+ * 鑾峰彇鈥滀换鎰忔媿鈥濇ā鍧楀睍绀虹殑鍥剧墖绫诲瀷
+ */
+ fun getMediaFileTypes(sceneTypeId: Int, resultCallBack: ResultCallBack<List<MediaFileType>>) {
+ resultCallBack.onSuccess(MediaFileType.getList(sceneTypeId))
+ }
+
+ /**
+ * 鑾峰彇濯掍綋鏂囦欢绫诲瀷鐨勫埆鍚�
+ * @param sceneTypeId 鍦烘櫙id
+ * @param mediaFileType 濯掍綋鏂囦欢绫诲瀷id
+ */
+ fun getAlias(sceneTypeId: Int, mediaFileType: MediaFileType, resultCallBack: ResultCallBack<String>) {
+ val dbService = mediaTypeAliasDao.getAlias(sceneTypeId, mediaFileType)
+ .map { Response.success(it) }
+
+ RetrofitFactory.executeResult(dbService, object : ResultObserver<String>() {
+ override fun onSuccess(result: String?) {
+ resultCallBack.onSuccess(result)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
+ }
+
+ /**
+ * 鏇存柊濯掍綋鏂囦欢绫诲瀷鐨勫埆鍚�
+ * @param sceneTypeId 鍦烘櫙id
+ * @param mediaFileType 濯掍綋鏂囦欢绫诲瀷id
+ * @param alias 鍒悕
+ */
+ fun updateAlias(sceneTypeId: Int, mediaFileType: MediaFileType, alias: String, resultCallBack: ResultCallBack<Boolean>) {
+ val dbService = mediaTypeAliasDao.updateAlias(sceneTypeId, mediaFileType, alias)
+ .map { Response.success(it) }
+
+ RetrofitFactory.executeResult(dbService, object : ResultObserver<Boolean>() {
+ override fun onSuccess(result: Boolean?) {
+ resultCallBack.onSuccess(result)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/EvaluationRepository.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/EvaluationRepository.kt
index 342de3c..e476c24 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/EvaluationRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/EvaluationRepository.kt
@@ -1,8 +1,8 @@
package cn.flightfeather.thirdapp.repository
-import cn.flightfeather.thirdapp.bean.Evaluation
-import cn.flightfeather.thirdapp.bean.Evaluationrule
-import cn.flightfeather.thirdapp.bean.Itemevaluation
+import cn.flightfeather.thirdapp.bean.entity.Evaluation
+import cn.flightfeather.thirdapp.bean.entity.Evaluationrule
+import cn.flightfeather.thirdapp.bean.entity.Itemevaluation
import cn.flightfeather.thirdapp.bean.vo.EvaluationsubruleVo
import cn.flightfeather.thirdapp.common.net.ResponseBodyCallBack
import cn.flightfeather.thirdapp.common.net.ResultCallBack
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/InspectionRepository.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/InspectionRepository.kt
index c398343..b67a06b 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/InspectionRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/InspectionRepository.kt
@@ -1,6 +1,9 @@
package cn.flightfeather.thirdapp.repository
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.Inspection
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.*
import cn.flightfeather.thirdapp.common.net.ResponseBodyCallBack
import cn.flightfeather.thirdapp.common.net.ResultCallBack
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/ProblemRepository.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/ProblemRepository.kt
index 6663754..95d70ed 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/ProblemRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/ProblemRepository.kt
@@ -2,7 +2,7 @@
import android.annotation.SuppressLint
import android.os.Environment
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.common.net.*
import cn.flightfeather.thirdapp.httpservice.InspectionService
@@ -153,7 +153,7 @@
/**
* 涓嬭浇闂鍥剧墖
*/
- fun downloadMediaFile(mediaFile:Mediafile, resultCallBack: ResultCallBack<File>) {
+ fun downloadMediaFile(mediaFile: Mediafile, resultCallBack: ResultCallBack<File>) {
val url: String = mediaFile.extension1 + mediaFile.guid + ".jpg"
retrofitImage.create(MediaFileService::class.java).downloadImage(url)
.enqueue(object : Callback<ResponseBody> {
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/SceneRepository.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/SceneRepository.kt
index 4af18f4..cf0f5df 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/SceneRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/SceneRepository.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.repository
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.common.net.ResponseBodyCallBack
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.common.net.ResultObserver
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt
index 72d168b..59aa38d 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/TaskRepository.kt
@@ -1,9 +1,9 @@
package cn.flightfeather.thirdapp.repository
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
-import cn.flightfeather.thirdapp.bean.Task
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Task
import cn.flightfeather.thirdapp.bean.vo.TaskVo
import cn.flightfeather.thirdapp.common.net.ResponseBodyCallBack
import cn.flightfeather.thirdapp.common.net.ResultCallBack
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/DomainDao.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/DomainDao.kt
index b2221a8..0bf0dca 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/DomainDao.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/DomainDao.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.repository.dao
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.common.database.DbFactory
import cn.flightfeather.thirdapp.util.Domain
import com.ping.greendao.gen.DomainitemDao
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/EvaluationDao.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/EvaluationDao.kt
index 6a6befa..13616d1 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/EvaluationDao.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/EvaluationDao.kt
@@ -1,7 +1,7 @@
package cn.flightfeather.thirdapp.repository.dao
-import cn.flightfeather.thirdapp.bean.Evaluationrule
-import cn.flightfeather.thirdapp.bean.Evaluationsubrule
+import cn.flightfeather.thirdapp.bean.entity.Evaluationrule
+import cn.flightfeather.thirdapp.bean.entity.Evaluationsubrule
import cn.flightfeather.thirdapp.common.database.DbFactory
import com.ping.greendao.gen.EvaluationruleDao
import com.ping.greendao.gen.EvaluationsubruleDao
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaFileDao.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaFileDao.kt
index ed00c3e..e9b7ff7 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaFileDao.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaFileDao.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.repository.dao
-import cn.flightfeather.thirdapp.bean.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
import cn.flightfeather.thirdapp.common.database.DbFactory
import com.ping.greendao.gen.MediafileDao
import io.reactivex.Observable
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaTypeAliasDao.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaTypeAliasDao.kt
new file mode 100644
index 0000000..5ddce7b
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/MediaTypeAliasDao.kt
@@ -0,0 +1,64 @@
+package cn.flightfeather.thirdapp.repository.dao
+
+import cn.flightfeather.thirdapp.bean.entity.MediaTypeAlias
+import cn.flightfeather.thirdapp.common.database.DbFactory
+import cn.flightfeather.thirdapp.model.enumreation.MediaFileType
+import com.ping.greendao.gen.MediaTypeAliasDao
+import io.reactivex.Observable
+
+/**
+ * @author riku
+ * Date: 2020/12/21
+ */
+class MediaTypeAliasDao {
+
+ /**
+ * 鑾峰彇濯掍綋鏂囦欢绫诲瀷鐨勬湰鍦板埆鍚�
+ * @param sceneTypeId 鍦烘櫙id
+ * @param mediaFileType 濯掍綋鏂囦欢绫诲瀷id
+ */
+ fun getAlias(sceneTypeId: Int, mediaFileType: MediaFileType): Observable<String> {
+ return DbFactory.getGreenDaoObservable().map {
+ it.mediaTypeAliasDao.queryBuilder().where(
+ MediaTypeAliasDao.Properties.SceneTypeId.eq(sceneTypeId),
+ MediaTypeAliasDao.Properties.TypeId.eq(mediaFileType.value)
+ ).list()
+ }.map {
+ if (it.isEmpty()) {
+ ""
+ } else {
+ it[0].alias
+ }
+ }
+ }
+
+ /**
+ * 鏇存柊濯掍綋鏂囦欢绫诲瀷鐨勬湰鍦板埆鍚�
+ * @param sceneTypeId 鍦烘櫙id
+ * @param mediaFileType 濯掍綋鏂囦欢绫诲瀷id
+ * @param alias 鍒悕
+ */
+ fun updateAlias(sceneTypeId: Int, mediaFileType: MediaFileType, alias: String): Observable<Boolean> {
+ return DbFactory.getGreenDaoObservable().map {
+ val result = it.mediaTypeAliasDao.queryBuilder().where(
+ MediaTypeAliasDao.Properties.SceneTypeId.eq(sceneTypeId),
+ MediaTypeAliasDao.Properties.TypeId.eq(mediaFileType.value)
+ ).list()
+ if (result.isEmpty()) {
+ it.mediaTypeAliasDao.insert(MediaTypeAlias().apply {
+ this.sceneTypeId = sceneTypeId
+ this.typeId = mediaFileType.value
+ this.typeName = mediaFileType.des
+ this.alias = alias
+ })
+
+ true
+ } else {
+ result[0].alias = alias
+ it.mediaTypeAliasDao.update(result[0])
+
+ true
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/ProblemTypeDao.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/ProblemTypeDao.kt
index 0c493df..38eee7e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/ProblemTypeDao.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/ProblemTypeDao.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.repository.dao
-import cn.flightfeather.thirdapp.bean.ChangeAdvice
+import cn.flightfeather.thirdapp.bean.entity.ChangeAdvice
import cn.flightfeather.thirdapp.common.database.DbFactory
import com.ping.greendao.gen.ChangeAdviceDao
import io.reactivex.Observable
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/SceneDao.kt b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/SceneDao.kt
index 4f3747c..b68ed58 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/SceneDao.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/repository/dao/SceneDao.kt
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.repository.dao
-import cn.flightfeather.thirdapp.bean.Scense
+import cn.flightfeather.thirdapp.bean.entity.Scense
import cn.flightfeather.thirdapp.common.database.DbFactory
import com.ping.greendao.gen.ScenseDao
import io.reactivex.Observable
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/task/CompressPhotoTask.java b/app/src/main/java/cn/flightfeather/thirdapp/task/CompressPhotoTask.java
index b46568f..e53a1bd 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/task/CompressPhotoTask.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/task/CompressPhotoTask.java
@@ -13,7 +13,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.activity.UploadMediaFilesActivity;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.util.photo.OnCompressListener;
/**
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/task/DownloadAndSetImageTask.java b/app/src/main/java/cn/flightfeather/thirdapp/task/DownloadAndSetImageTask.java
index 31530e9..2873411 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/task/DownloadAndSetImageTask.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/task/DownloadAndSetImageTask.java
@@ -14,7 +14,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
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..1558c00 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,20 @@
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.Site;
+import cn.flightfeather.thirdapp.bean.entity.Town;
import cn.flightfeather.thirdapp.httpservice.InitDataService;
import retrofit2.Call;
import retrofit2.Callback;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java b/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java
index b23500b..2f318e7 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/CommonUtils.java
@@ -11,7 +11,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
/**
* Created by linli on 2018/1/25.
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/file/FileUtil.java b/app/src/main/java/cn/flightfeather/thirdapp/util/file/FileUtil.java
index aca4ceb..9604d84 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/file/FileUtil.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/file/FileUtil.java
@@ -15,7 +15,7 @@
import java.io.IOException;
import java.io.InputStream;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
public class FileUtil {
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java b/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java
index 6f61359..6251ddb 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java
@@ -26,7 +26,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.httpservice.UploadService;
import cn.flightfeather.thirdapp.module.common.CameraActivity;
import cn.flightfeather.thirdapp.task.CompressPhotoTask;
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/view/BannerView.kt b/app/src/main/java/cn/flightfeather/thirdapp/view/BannerView.kt
new file mode 100644
index 0000000..8bdb81d
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdapp/view/BannerView.kt
@@ -0,0 +1,174 @@
+package cn.flightfeather.thirdapp.view
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Color
+import android.support.v4.content.ContextCompat
+import android.support.v4.view.ViewPager
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
+import android.widget.TextView
+import cn.flightfeather.thirdapp.R
+import cn.flightfeather.thirdapp.util.dp
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import org.jetbrains.anko.alignParentBottom
+import org.jetbrains.anko.alignParentEnd
+import org.jetbrains.anko.backgroundResource
+
+
+/**
+ * @author riku
+ * Date: 2019/5/20
+ * 杞挱ViewPager
+ */
+class BannerView : RelativeLayout {
+
+ constructor(context: Context) : super(context){
+ mContext = context
+ }
+
+ constructor(context: Context, attrs: AttributeSet?) : super(context, attrs){
+ mContext = context
+ }
+
+ constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr){
+ mContext = context
+ }
+
+
+ private var mContext: Context? = null
+ private val viewPager = MyViewPager(context)
+ private val dots = LinearLayout(context)
+ private val index = LinearLayout(context)
+ private var currentIndex: TextView? = null
+ private var curPos = 0
+ private var lastPos = 0
+ var isAlive = true
+ set(value) {
+ field = value
+ if (value) initObservable()
+ }
+
+ var dataList = listOf<View>()
+ set(value) {
+ field = value
+ initViewPager()
+ initDots()
+ initIndex()
+// initObservable()
+ }
+
+ fun refresh() {
+ viewPager.adapter?.notifyDataSetChanged()
+ }
+
+ private fun initObservable() {
+ Observable.create<Boolean> {
+ while (isAlive) {
+ Thread.sleep(3000)
+ it.onNext(true)
+ }
+ it.onComplete()
+ }.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).doOnNext {
+ if (curPos == dataList.size - 1) {
+ curPos = 0
+ viewPager.setCurrentItem(0, false)
+ } else {
+ curPos++
+ viewPager.setCurrentItem(curPos, true)
+ }
+ }.subscribe()
+ }
+
+ private fun initViewPager(){
+ val viewPagerParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+ viewPager.adapter = ViewPagerAdapter(dataList)
+ viewPager.currentItem = 0
+ viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+ override fun onPageScrollStateChanged(p0: Int) {
+
+ }
+
+ override fun onPageScrolled(p0: Int, p1: Float, p2: Int) {
+
+ }
+
+ @SuppressLint("SetTextI18n")
+ override fun onPageSelected(p0: Int) {
+ val newPos = p0 % dataList.size
+ dots.getChildAt(lastPos).isEnabled = false
+ dots.getChildAt(newPos).isEnabled = true
+ lastPos = newPos
+
+ (index.getChildAt(0) as TextView).text = "${p0 + 1}"
+ }
+
+ })
+ addView(viewPager, viewPagerParams)
+ }
+
+ private fun initDots() {
+ val dotsParams = LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+ dotsParams.alignParentBottom()
+
+ dots.apply {
+ setPadding(4.dp, 4.dp, 4.dp, 4.dp)
+ orientation = LinearLayout.HORIZONTAL
+ gravity = Gravity.CENTER
+ }.layoutParams = dotsParams
+ repeat(dataList.size) {
+ val dot = View(context)
+ dot.backgroundResource = R.drawable.point_background
+ val params = LinearLayout.LayoutParams(8.dp, 8.dp)
+ params.leftMargin = 4.dp
+ dot.layoutParams = params
+ dot.isEnabled = false
+ dots.addView(dot)
+ }
+ if (dataList.isNotEmpty()) {
+ dots.getChildAt(0).isEnabled = true
+ }
+
+ addView(dots)
+ }
+
+ private fun initIndex() {
+ val indexParams = LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+ indexParams.alignParentBottom()
+ indexParams.alignParentEnd()
+
+ index.apply {
+ setPadding(4.dp, 4.dp, 4.dp, 4.dp)
+ setBackgroundColor(ContextCompat.getColor(context, R.color.gray))
+ orientation = LinearLayout.HORIZONTAL
+ gravity = Gravity.CENTER
+ }.layoutParams = indexParams
+
+ val textParams = LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
+ currentIndex = TextView(context).apply {
+ text = "1"
+ setTextColor(Color.WHITE)
+ }
+ val divider = TextView(context).apply {
+ text = "/"
+ setTextColor(Color.WHITE)
+ }
+ val totalIndex = TextView(context).apply {
+ text = dataList.size.toString()
+ setTextColor(Color.WHITE)
+ }
+ index.addView(currentIndex, textParams)
+ index.addView(divider, textParams)
+ index.addView(totalIndex, textParams)
+
+ addView(index)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/view/MyViewPager.kt b/app/src/main/java/cn/flightfeather/thirdapp/view/MyViewPager.kt
index 775dc5a..6dc42ba 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/view/MyViewPager.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/view/MyViewPager.kt
@@ -12,7 +12,7 @@
* java.lang.IllegalArgumentException: pointerIndex out of range pointerIndex=-1 pointerCount=1
* 缁ф壙ViewPager 瑙ｅ喅
*/
-class MyViewPager(context: Context, attrs: AttributeSet?) : ViewPager(context, attrs) {
+class MyViewPager(context: Context, attrs: AttributeSet? = null) : ViewPager(context, attrs) {
override fun onTouchEvent(ev: MotionEvent?): Boolean {
try {
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/view/SearchView.kt b/app/src/main/java/cn/flightfeather/thirdapp/view/SearchView.kt
new file mode 100644
index 0000000..d071d3e
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdapp/view/SearchView.kt
@@ -0,0 +1,82 @@
+package cn.flightfeather.thirdapp.view
+
+import android.content.Context
+import android.inputmethodservice.InputMethodService
+import android.support.v4.content.ContextCompat
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import cn.flightfeather.thirdapp.R
+
+/**
+ * @author riku
+ * Date: 2020/12/22
+ */
+class SearchView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) {
+
+ constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+
+ constructor(context: Context) : this(context, null, 0)
+
+ private lateinit var e: EditText
+
+ private val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+
+ var onConfirm: (str: String) -> Unit = { _ -> }
+
+ init {
+ initView()
+ }
+
+ private fun initView() {
+ val view = LayoutInflater.from(context).inflate(R.layout.layout_search, this)
+ e = view.findViewById(R.id.edt_content)
+ val c = view.findViewById<ImageView>(R.id.img_clear)
+ val y = view.findViewById<TextView>(R.id.txt_confirm)
+ val n = view.findViewById<TextView>(R.id.txt_cancel)
+ e.addTextChangedListener(object : TextWatcher {
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
+ override fun afterTextChanged(s: Editable?) {
+ if (s.isNullOrBlank()) {
+ c.visibility = View.GONE
+// y.visibility = View.GONE
+// n.visibility = View.VISIBLE
+ } else {
+ c.visibility = View.VISIBLE
+// y.visibility = View.VISIBLE
+// n.visibility = View.GONE
+ }
+
+ }
+ })
+ c.setOnClickListener {
+ e.setText("")
+ }
+ y.setOnClickListener {
+ this.visibility = View.GONE
+ imm.hideSoftInputFromWindow(windowToken, 0)
+ onConfirm(e.text.toString())
+ }
+ n.setOnClickListener {
+ e.setText("")
+ imm.hideSoftInputFromWindow(windowToken, 0)
+ this.visibility = View.GONE
+ }
+ }
+
+ fun show(hint: String = "", default: String = "") {
+ this.visibility = View.VISIBLE
+ e.hint = hint
+ e.setText(default)
+ e.requestFocus()
+ imm.showSoftInput(e, InputMethodManager.SHOW_IMPLICIT);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/view/SlideSideBarView.kt b/app/src/main/java/cn/flightfeather/thirdapp/view/SlideSideBarView.kt
index cc0c974..57c8b3f 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/view/SlideSideBarView.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/view/SlideSideBarView.kt
@@ -18,7 +18,7 @@
import android.widget.TextView
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter
-import cn.flightfeather.thirdapp.bean.Scense
+import cn.flightfeather.thirdapp.bean.entity.Scense
import cn.flightfeather.thirdapp.util.DialogUtil
/**
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/view/ViewPagerAdapter.kt b/app/src/main/java/cn/flightfeather/thirdapp/view/ViewPagerAdapter.kt
new file mode 100644
index 0000000..8aa7f3b
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdapp/view/ViewPagerAdapter.kt
@@ -0,0 +1,36 @@
+package cn.flightfeather.thirdapp.view
+
+import android.support.v4.view.PagerAdapter
+import android.view.View
+import android.view.ViewGroup
+
+/**
+ * @author riku
+ * Date: 2020/6/22
+ */
+class ViewPagerAdapter(private val dataList: List<View>, private val titleList: List<String> = emptyList()) : PagerAdapter() {
+ override fun isViewFromObject(p0: View, p1: Any): Boolean {
+ return p0 == p1
+ }
+
+ override fun getCount(): Int {
+ return dataList.size
+ }
+
+ override fun instantiateItem(container: ViewGroup, position: Int): Any {
+ container.addView(dataList[position % dataList.size])
+ return dataList[position % dataList.size]
+ }
+
+ override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+ container.removeView(dataList[position % dataList.size])
+ }
+
+ override fun getPageTitle(position: Int): CharSequence? {
+ if (position < titleList.size) {
+ return titleList[position]
+ } else {
+ return super.getPageTitle(position)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ping/greendao/gen/ChangeAdviceDao.java b/app/src/main/java/com/ping/greendao/gen/ChangeAdviceDao.java
index 82c2cf9..ec3002d 100644
--- a/app/src/main/java/com/ping/greendao/gen/ChangeAdviceDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/ChangeAdviceDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.ChangeAdvice;
+import cn.flightfeather.thirdapp.bean.entity.ChangeAdvice;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/ChangeEffectDao.java b/app/src/main/java/com/ping/greendao/gen/ChangeEffectDao.java
index 2de9425..eb4fecd 100644
--- a/app/src/main/java/com/ping/greendao/gen/ChangeEffectDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/ChangeEffectDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.ChangeEffect;
+import cn.flightfeather.thirdapp.bean.entity.ChangeEffect;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/CityDao.java b/app/src/main/java/com/ping/greendao/gen/CityDao.java
index 6e46d49..8ab1b9f 100644
--- a/app/src/main/java/com/ping/greendao/gen/CityDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/CityDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.City;
+import cn.flightfeather.thirdapp.bean.entity.City;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/DaoMaster.java b/app/src/main/java/com/ping/greendao/gen/DaoMaster.java
index f6480c9..6b68579 100644
--- a/app/src/main/java/com/ping/greendao/gen/DaoMaster.java
+++ b/app/src/main/java/com/ping/greendao/gen/DaoMaster.java
@@ -14,10 +14,10 @@
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
- * Master of DAO (schema version 11): knows all DAOs.
+ * Master of DAO (schema version 12): knows all DAOs.
*/
public class DaoMaster extends AbstractDaoMaster {
- public static final int SCHEMA_VERSION = 11;
+ public static final int SCHEMA_VERSION = 12;
/** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) {
@@ -35,6 +35,7 @@
InspectionDao.createTable(db, ifNotExists);
ItemevaluationDao.createTable(db, ifNotExists);
MediafileDao.createTable(db, ifNotExists);
+ MediaTypeAliasDao.createTable(db, ifNotExists);
MonitorobjectversionDao.createTable(db, ifNotExists);
ProblemlistDao.createTable(db, ifNotExists);
ProblemtypeDao.createTable(db, ifNotExists);
@@ -64,6 +65,7 @@
InspectionDao.dropTable(db, ifExists);
ItemevaluationDao.dropTable(db, ifExists);
MediafileDao.dropTable(db, ifExists);
+ MediaTypeAliasDao.dropTable(db, ifExists);
MonitorobjectversionDao.dropTable(db, ifExists);
ProblemlistDao.dropTable(db, ifExists);
ProblemtypeDao.dropTable(db, ifExists);
@@ -107,6 +109,7 @@
registerDaoClass(InspectionDao.class);
registerDaoClass(ItemevaluationDao.class);
registerDaoClass(MediafileDao.class);
+ registerDaoClass(MediaTypeAliasDao.class);
registerDaoClass(MonitorobjectversionDao.class);
registerDaoClass(ProblemlistDao.class);
registerDaoClass(ProblemtypeDao.class);
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;
}
diff --git a/app/src/main/java/com/ping/greendao/gen/DistrictDao.java b/app/src/main/java/com/ping/greendao/gen/DistrictDao.java
index 4b0a642..7148ccf 100644
--- a/app/src/main/java/com/ping/greendao/gen/DistrictDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/DistrictDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.District;
+import cn.flightfeather.thirdapp.bean.entity.District;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/DomaincatalogDao.java b/app/src/main/java/com/ping/greendao/gen/DomaincatalogDao.java
index e10297b..05c1b5b 100644
--- a/app/src/main/java/com/ping/greendao/gen/DomaincatalogDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/DomaincatalogDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Domaincatalog;
+import cn.flightfeather.thirdapp.bean.entity.Domaincatalog;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/DomainitemDao.java b/app/src/main/java/com/ping/greendao/gen/DomainitemDao.java
index b0e2e6c..ca3a01b 100644
--- a/app/src/main/java/com/ping/greendao/gen/DomainitemDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/DomainitemDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/EvaluationDao.java b/app/src/main/java/com/ping/greendao/gen/EvaluationDao.java
index 0d130db..5a7d6f5 100644
--- a/app/src/main/java/com/ping/greendao/gen/EvaluationDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/EvaluationDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Evaluation;
+import cn.flightfeather.thirdapp.bean.entity.Evaluation;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/EvaluationruleDao.java b/app/src/main/java/com/ping/greendao/gen/EvaluationruleDao.java
index 30b97ad..73dad2e 100644
--- a/app/src/main/java/com/ping/greendao/gen/EvaluationruleDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/EvaluationruleDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Evaluationrule;
+import cn.flightfeather.thirdapp.bean.entity.Evaluationrule;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/EvaluationsubruleDao.java b/app/src/main/java/com/ping/greendao/gen/EvaluationsubruleDao.java
index b5a73d8..cdf18f6 100644
--- a/app/src/main/java/com/ping/greendao/gen/EvaluationsubruleDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/EvaluationsubruleDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Evaluationsubrule;
+import cn.flightfeather.thirdapp.bean.entity.Evaluationsubrule;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/GitlistDao.java b/app/src/main/java/com/ping/greendao/gen/GitlistDao.java
index 93e54dd..a6d9cf1 100644
--- a/app/src/main/java/com/ping/greendao/gen/GitlistDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/GitlistDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Gitlist;
+import cn.flightfeather.thirdapp.bean.entity.Gitlist;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/GittypeDao.java b/app/src/main/java/com/ping/greendao/gen/GittypeDao.java
index f9c218b..5b6941a 100644
--- a/app/src/main/java/com/ping/greendao/gen/GittypeDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/GittypeDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Gittype;
+import cn.flightfeather.thirdapp.bean.entity.Gittype;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/InspectionDao.java b/app/src/main/java/com/ping/greendao/gen/InspectionDao.java
index e55f79a..d530d19 100644
--- a/app/src/main/java/com/ping/greendao/gen/InspectionDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/InspectionDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Inspection;
+import cn.flightfeather.thirdapp.bean.entity.Inspection;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/ItemevaluationDao.java b/app/src/main/java/com/ping/greendao/gen/ItemevaluationDao.java
index 6244dd8..dcce2df 100644
--- a/app/src/main/java/com/ping/greendao/gen/ItemevaluationDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/ItemevaluationDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Itemevaluation;
+import cn.flightfeather.thirdapp.bean.entity.Itemevaluation;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/MediaTypeAliasDao.java b/app/src/main/java/com/ping/greendao/gen/MediaTypeAliasDao.java
new file mode 100644
index 0000000..ed9b1ce
--- /dev/null
+++ b/app/src/main/java/com/ping/greendao/gen/MediaTypeAliasDao.java
@@ -0,0 +1,147 @@
+package com.ping.greendao.gen;
+
+import android.database.Cursor;
+import android.database.sqlite.SQLiteStatement;
+
+import org.greenrobot.greendao.AbstractDao;
+import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
+import org.greenrobot.greendao.database.Database;
+import org.greenrobot.greendao.database.DatabaseStatement;
+
+import cn.flightfeather.thirdapp.bean.entity.MediaTypeAlias;
+
+// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
+/**
+ * DAO for table "MEDIA_TYPE_ALIAS".
+*/
+public class MediaTypeAliasDao extends AbstractDao<MediaTypeAlias, Long> {
+
+ public static final String TABLENAME = "MEDIA_TYPE_ALIAS";
+
+ /**
+ * Properties of entity MediaTypeAlias.<br/>
+ * Can be used for QueryBuilder and for referencing column names.
+ */
+ public static class Properties {
+ public final static Property Id = new Property(0, long.class, "id", true, "_id");
+ public final static Property SceneTypeId = new Property(1, int.class, "sceneTypeId", false, "SCENE_TYPE_ID");
+ public final static Property TypeId = new Property(2, int.class, "typeId", false, "TYPE_ID");
+ public final static Property TypeName = new Property(3, String.class, "typeName", false, "TYPE_NAME");
+ public final static Property Alias = new Property(4, String.class, "alias", false, "ALIAS");
+ }
+
+
+ public MediaTypeAliasDao(DaoConfig config) {
+ super(config);
+ }
+
+ public MediaTypeAliasDao(DaoConfig config, DaoSession daoSession) {
+ super(config, daoSession);
+ }
+
+ /** Creates the underlying database table. */
+ public static void createTable(Database db, boolean ifNotExists) {
+ String constraint = ifNotExists? "IF NOT EXISTS ": "";
+ db.execSQL("CREATE TABLE " + constraint + "\"MEDIA_TYPE_ALIAS\" (" + //
+ "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL ," + // 0: id
+ "\"SCENE_TYPE_ID\" INTEGER NOT NULL ," + // 1: sceneTypeId
+ "\"TYPE_ID\" INTEGER NOT NULL ," + // 2: typeId
+ "\"TYPE_NAME\" TEXT," + // 3: typeName
+ "\"ALIAS\" TEXT);"); // 4: alias
+ }
+
+ /** Drops the underlying database table. */
+ public static void dropTable(Database db, boolean ifExists) {
+ String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"MEDIA_TYPE_ALIAS\"";
+ db.execSQL(sql);
+ }
+
+ @Override
+ protected final void bindValues(DatabaseStatement stmt, MediaTypeAlias entity) {
+ stmt.clearBindings();
+ stmt.bindLong(1, entity.getId());
+ stmt.bindLong(2, entity.getSceneTypeId());
+ stmt.bindLong(3, entity.getTypeId());
+
+ String typeName = entity.getTypeName();
+ if (typeName != null) {
+ stmt.bindString(4, typeName);
+ }
+
+ String alias = entity.getAlias();
+ if (alias != null) {
+ stmt.bindString(5, alias);
+ }
+ }
+
+ @Override
+ protected final void bindValues(SQLiteStatement stmt, MediaTypeAlias entity) {
+ stmt.clearBindings();
+ stmt.bindLong(1, entity.getId());
+ stmt.bindLong(2, entity.getSceneTypeId());
+ stmt.bindLong(3, entity.getTypeId());
+
+ String typeName = entity.getTypeName();
+ if (typeName != null) {
+ stmt.bindString(4, typeName);
+ }
+
+ String alias = entity.getAlias();
+ if (alias != null) {
+ stmt.bindString(5, alias);
+ }
+ }
+
+ @Override
+ public Long readKey(Cursor cursor, int offset) {
+ return cursor.getLong(offset + 0);
+ }
+
+ @Override
+ public MediaTypeAlias readEntity(Cursor cursor, int offset) {
+ MediaTypeAlias entity = new MediaTypeAlias( //
+ cursor.getLong(offset + 0), // id
+ cursor.getInt(offset + 1), // sceneTypeId
+ cursor.getInt(offset + 2), // typeId
+ cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // typeName
+ cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4) // alias
+ );
+ return entity;
+ }
+
+ @Override
+ public void readEntity(Cursor cursor, MediaTypeAlias entity, int offset) {
+ entity.setId(cursor.getLong(offset + 0));
+ entity.setSceneTypeId(cursor.getInt(offset + 1));
+ entity.setTypeId(cursor.getInt(offset + 2));
+ entity.setTypeName(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
+ entity.setAlias(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4));
+ }
+
+ @Override
+ protected final Long updateKeyAfterInsert(MediaTypeAlias entity, long rowId) {
+ entity.setId(rowId);
+ return rowId;
+ }
+
+ @Override
+ public Long getKey(MediaTypeAlias entity) {
+ if(entity != null) {
+ return entity.getId();
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public boolean hasKey(MediaTypeAlias entity) {
+ throw new UnsupportedOperationException("Unsupported for entities with a non-null key");
+ }
+
+ @Override
+ protected final boolean isEntityUpdateable() {
+ return true;
+ }
+
+}
diff --git a/app/src/main/java/com/ping/greendao/gen/MediafileDao.java b/app/src/main/java/com/ping/greendao/gen/MediafileDao.java
index 8bb92f3..865605a 100644
--- a/app/src/main/java/com/ping/greendao/gen/MediafileDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/MediafileDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/MonitorobjectversionDao.java b/app/src/main/java/com/ping/greendao/gen/MonitorobjectversionDao.java
index 7de32b0..8b9a126 100644
--- a/app/src/main/java/com/ping/greendao/gen/MonitorobjectversionDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/MonitorobjectversionDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion;
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/ProblemlistDao.java b/app/src/main/java/com/ping/greendao/gen/ProblemlistDao.java
index 36d78c3..12f651a 100644
--- a/app/src/main/java/com/ping/greendao/gen/ProblemlistDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/ProblemlistDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Problemlist;
+import cn.flightfeather.thirdapp.bean.entity.Problemlist;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/ProblemtypeDao.java b/app/src/main/java/com/ping/greendao/gen/ProblemtypeDao.java
index a63ed50..834b12d 100644
--- a/app/src/main/java/com/ping/greendao/gen/ProblemtypeDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/ProblemtypeDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Problemtype;
+import cn.flightfeather.thirdapp.bean.entity.Problemtype;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/ProvinceDao.java b/app/src/main/java/com/ping/greendao/gen/ProvinceDao.java
index 22b4f45..9cd5f91 100644
--- a/app/src/main/java/com/ping/greendao/gen/ProvinceDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/ProvinceDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Province;
+import cn.flightfeather.thirdapp.bean.entity.Province;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/ScenseDao.java b/app/src/main/java/com/ping/greendao/gen/ScenseDao.java
index 49cd5f8..d65282d 100644
--- a/app/src/main/java/com/ping/greendao/gen/ScenseDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/ScenseDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/SiteDao.java b/app/src/main/java/com/ping/greendao/gen/SiteDao.java
index 8008b65..33da180 100644
--- a/app/src/main/java/com/ping/greendao/gen/SiteDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/SiteDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Site;
+import cn.flightfeather.thirdapp.bean.entity.Site;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/SubtaskDao.java b/app/src/main/java/com/ping/greendao/gen/SubtaskDao.java
index 455b0c3..9def17d 100644
--- a/app/src/main/java/com/ping/greendao/gen/SubtaskDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/SubtaskDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/TaskDao.java b/app/src/main/java/com/ping/greendao/gen/TaskDao.java
index 17ddd16..a3d054a 100644
--- a/app/src/main/java/com/ping/greendao/gen/TaskDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/TaskDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Task;
+import cn.flightfeather.thirdapp.bean.entity.Task;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/TaskvertionDao.java b/app/src/main/java/com/ping/greendao/gen/TaskvertionDao.java
index 2025d46..ff25925 100644
--- a/app/src/main/java/com/ping/greendao/gen/TaskvertionDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/TaskvertionDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Taskvertion;
+import cn.flightfeather.thirdapp.bean.entity.Taskvertion;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/TownDao.java b/app/src/main/java/com/ping/greendao/gen/TownDao.java
index 680b741..ef29105 100644
--- a/app/src/main/java/com/ping/greendao/gen/TownDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/TownDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Town;
+import cn.flightfeather.thirdapp.bean.entity.Town;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/ping/greendao/gen/UserinfoDao.java b/app/src/main/java/com/ping/greendao/gen/UserinfoDao.java
index 6c1ea80..8665633 100644
--- a/app/src/main/java/com/ping/greendao/gen/UserinfoDao.java
+++ b/app/src/main/java/com/ping/greendao/gen/UserinfoDao.java
@@ -9,7 +9,7 @@
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/res/drawable/bg_btngroup_2.xml b/app/src/main/res/drawable/bg_btngroup_2.xml
new file mode 100644
index 0000000..5a51652
--- /dev/null
+++ b/app/src/main/res/drawable/bg_btngroup_2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <!-- 濉厖棰滆壊 -->
+ <solid android:color="@color/white"/>
+ <corners android:radius="@dimen/dimen2"/>
+ <stroke android:width="1px" android:color="#22000000"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/point_background.xml b/app/src/main/res/drawable/point_background.xml
new file mode 100644
index 0000000..67099b5
--- /dev/null
+++ b/app/src/main/res/drawable/point_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/point_bg_enable" android:state_enabled="true"/>
+ <item android:drawable="@drawable/point_bg_normal" android:state_enabled="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/point_bg_enable.xml b/app/src/main/res/drawable/point_bg_enable.xml
new file mode 100644
index 0000000..e4c588d
--- /dev/null
+++ b/app/src/main/res/drawable/point_bg_enable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="oval">
+
+ <corners android:radius="3dp"/>
+ <solid android:color="@color/colorPrimary"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/point_bg_normal.xml b/app/src/main/res/drawable/point_bg_normal.xml
new file mode 100644
index 0000000..bbbd758
--- /dev/null
+++ b/app/src/main/res/drawable/point_bg_normal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="oval">
+
+ <corners android:radius="3dp"/>
+ <solid android:color="#55000000"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_camera_3.xml b/app/src/main/res/layout/dialog_camera_3.xml
new file mode 100644
index 0000000..7396632
--- /dev/null
+++ b/app/src/main/res/layout/dialog_camera_3.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <android.support.v7.widget.CardView
+ android:id="@+id/cv_dialog_problem_list_main"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="30dp"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
+ android:layout_marginBottom="40dp"
+ app:cardCornerRadius="6dp"
+ app:cardElevation="7dp">
+ <LinearLayout
+ android:id="@+id/ll_dialog_problem_list_main"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="12dp"
+ android:paddingBottom="16dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="18dp"
+ android:textColor="@color/primary_text"
+ android:text="鐓х墖鍒楄〃"/>
+
+ <cn.flightfeather.thirdapp.view.BannerView
+ android:id="@+id/banner"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="@dimen/fab_margin"/>
+
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
+ <android.support.design.widget.FloatingActionButton
+ android:src="@drawable/icon_close_white"
+ android:id="@+id/fab_problem_list_close"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:fabSize="normal"
+ app:elevation="8dp"
+ app:layout_anchor="@id/cv_dialog_problem_list_main"
+ app:layout_anchorGravity="bottom|center"
+ />
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_take_photo.xml b/app/src/main/res/layout/item_take_photo.xml
new file mode 100644
index 0000000..d0ebe29
--- /dev/null
+++ b/app/src/main/res/layout/item_take_photo.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <TextView
+ android:id="@+id/txt_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/img_edit"
+ app:layout_constraintBottom_toBottomOf="@id/img_edit"
+ android:enabled="true"
+ android:textSize="@dimen/textSize_14"
+ android:textColor="@color/black"
+ tools:text="甯歌"/>
+
+ <ImageView
+ android:id="@+id/img_edit"
+ android:layout_width="@dimen/title_icon_size_2"
+ android:layout_height="@dimen/title_icon_size_2"
+ android:paddingStart="@dimen/dimen6"
+ android:paddingTop="@dimen/dimen6"
+ android:paddingBottom="@dimen/dimen6"
+ android:src="@drawable/icon_patrol_edit"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/txt_title"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1"/>
+
+ <cn.flightfeather.thirdapp.view.SearchView
+ android:id="@+id/search_view"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toTopOf="@id/img_edit"
+ app:layout_constraintBottom_toBottomOf="@id/img_edit"
+ android:elevation="@dimen/dimen2"
+ android:visibility="gone"
+ tools:ignore="UnusedAttribute" />
+
+ <android.support.constraint.Barrier
+ android:id="@+id/barrier_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:barrierDirection="bottom"
+ app:constraint_referenced_ids="txt_title, img_edit"/>
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/rv_photo_list"
+ android:layout_marginTop="@dimen/dimen2"
+ android:paddingBottom="8dp"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toBottomOf="@id/barrier_1"
+ app:layout_constraintBottom_toBottomOf="parent">
+ </android.support.v7.widget.RecyclerView>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_search.xml b/app/src/main/res/layout/layout_search.xml
new file mode 100644
index 0000000..8a7493d
--- /dev/null
+++ b/app/src/main/res/layout/layout_search.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:adnroid="http://schemas.android.com/tools"
+ android:background="@drawable/bg_btngroup_2">
+
+ <EditText
+ android:id="@+id/edt_content"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:background="@color/transparent"
+ android:textSize="@dimen/textSize_14"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/img_clear"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"/>
+
+ <ImageView
+ android:id="@+id/img_clear"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:src="@drawable/ic_close_white_24dp"
+ android:background="@drawable/point_bg_normal"
+ android:layout_margin="@dimen/dimen6"
+ android:padding="@dimen/dimen2"
+ android:visibility="gone"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/barrier_1"/>
+
+ <android.support.constraint.Barrier
+ android:id="@+id/barrier_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:constraint_referenced_ids="txt_confirm, txt_cancel"
+ app:barrierDirection="start"/>
+
+ <TextView
+ android:id="@+id/txt_confirm"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:text="@string/confirm"
+ android:textColor="@color/colorPrimary"
+ android:textSize="@dimen/textSize_14"
+ android:gravity="center"
+ android:visibility="visible"
+ android:paddingStart="@dimen/dimen8"
+ android:paddingEnd="@dimen/dimen8"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"/>
+
+ <TextView
+ android:id="@+id/txt_cancel"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:text="@string/cancel"
+ android:textColor="@color/gray"
+ android:textSize="@dimen/textSize_14"
+ android:gravity="center"
+ android:paddingStart="@dimen/dimen8"
+ android:paddingEnd="@dimen/dimen8"
+ app:layout_constraintEnd_toStartOf="@id/txt_confirm"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.9.3