diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
index cfd56fe..da63560 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
@@ -6,7 +6,7 @@
import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.br.ar.app.R
-import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding
+import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding
import com.casic.br.ar.app.model.HiddenTroubleModel
import com.casic.br.ar.app.vm.HiddenTroubleViewModel
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
@@ -19,10 +19,10 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.WeakReferenceHandler
-class SceneHiddenTroubleActivity : KotlinBaseActivity(),
+class SceneHiddenTroubleActivity : KotlinBaseActivity(),
Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel
private lateinit var troubleAdapter: NormalRecyclerAdapter
private var sceneCode = ""
@@ -40,7 +40,6 @@
sceneCode = args[1]
- weakReferenceHandler = WeakReferenceHandler(this)
hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java]
getHiddenTroubleByScene()
hiddenTroubleViewModel.troublesResult.observe(this) {
@@ -62,7 +61,7 @@
2024052701 -> {
troubleAdapter = object :
NormalRecyclerAdapter(
- R.layout.item_hidden_electric_box_l, dataBeans
+ R.layout.item_scene_hidden_trouble_l, dataBeans
) {
override fun convertView(
viewHolder: ViewHolder, position: Int,
@@ -89,8 +88,8 @@
return true
}
- override fun initViewBinding(): ActivitySceneHiddenBinding {
- return ActivitySceneHiddenBinding.inflate(layoutInflater)
+ override fun initViewBinding(): ActivitySceneHiddenTroubleBinding {
+ return ActivitySceneHiddenTroubleBinding.inflate(layoutInflater)
}
override fun observeRequestState() {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
index cfd56fe..da63560 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
@@ -6,7 +6,7 @@
import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.br.ar.app.R
-import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding
+import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding
import com.casic.br.ar.app.model.HiddenTroubleModel
import com.casic.br.ar.app.vm.HiddenTroubleViewModel
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
@@ -19,10 +19,10 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.WeakReferenceHandler
-class SceneHiddenTroubleActivity : KotlinBaseActivity(),
+class SceneHiddenTroubleActivity : KotlinBaseActivity(),
Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel
private lateinit var troubleAdapter: NormalRecyclerAdapter
private var sceneCode = ""
@@ -40,7 +40,6 @@
sceneCode = args[1]
- weakReferenceHandler = WeakReferenceHandler(this)
hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java]
getHiddenTroubleByScene()
hiddenTroubleViewModel.troublesResult.observe(this) {
@@ -62,7 +61,7 @@
2024052701 -> {
troubleAdapter = object :
NormalRecyclerAdapter(
- R.layout.item_hidden_electric_box_l, dataBeans
+ R.layout.item_scene_hidden_trouble_l, dataBeans
) {
override fun convertView(
viewHolder: ViewHolder, position: Int,
@@ -89,8 +88,8 @@
return true
}
- override fun initViewBinding(): ActivitySceneHiddenBinding {
- return ActivitySceneHiddenBinding.inflate(layoutInflater)
+ override fun initViewBinding(): ActivitySceneHiddenTroubleBinding {
+ return ActivitySceneHiddenTroubleBinding.inflate(layoutInflater)
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
index c9e20ae..78d3f10 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
@@ -24,7 +24,7 @@
private val context = this
private val marginOffset by lazy { 15.dp2px(this) }
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var standardFileViewModel: StandardFileViewModel
private lateinit var standardFileAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -35,7 +35,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
standardFileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java]
getStandardFileByPage()
standardFileViewModel.fileListResult.observe(this) {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
index cfd56fe..da63560 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
@@ -6,7 +6,7 @@
import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.br.ar.app.R
-import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding
+import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding
import com.casic.br.ar.app.model.HiddenTroubleModel
import com.casic.br.ar.app.vm.HiddenTroubleViewModel
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
@@ -19,10 +19,10 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.WeakReferenceHandler
-class SceneHiddenTroubleActivity : KotlinBaseActivity(),
+class SceneHiddenTroubleActivity : KotlinBaseActivity(),
Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel
private lateinit var troubleAdapter: NormalRecyclerAdapter
private var sceneCode = ""
@@ -40,7 +40,6 @@
sceneCode = args[1]
- weakReferenceHandler = WeakReferenceHandler(this)
hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java]
getHiddenTroubleByScene()
hiddenTroubleViewModel.troublesResult.observe(this) {
@@ -62,7 +61,7 @@
2024052701 -> {
troubleAdapter = object :
NormalRecyclerAdapter(
- R.layout.item_hidden_electric_box_l, dataBeans
+ R.layout.item_scene_hidden_trouble_l, dataBeans
) {
override fun convertView(
viewHolder: ViewHolder, position: Int,
@@ -89,8 +88,8 @@
return true
}
- override fun initViewBinding(): ActivitySceneHiddenBinding {
- return ActivitySceneHiddenBinding.inflate(layoutInflater)
+ override fun initViewBinding(): ActivitySceneHiddenTroubleBinding {
+ return ActivitySceneHiddenTroubleBinding.inflate(layoutInflater)
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
index c9e20ae..78d3f10 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
@@ -24,7 +24,7 @@
private val context = this
private val marginOffset by lazy { 15.dp2px(this) }
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var standardFileViewModel: StandardFileViewModel
private lateinit var standardFileAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -35,7 +35,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
standardFileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java]
getStandardFileByPage()
standardFileViewModel.fileListResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
index 7275040..38c860f 100644
--- a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
+++ b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
@@ -18,9 +18,9 @@
private val gson by lazy { Gson() }
val manifestResult = MutableLiveData()
- fun getCheckManifestByPage(context: Context, keywords: String, offset: Int) = launch({
+ fun getCheckManifestByScene(context: Context, scene: String, offset: Int) = launch({
loadState.value = LoadState.Loading
- val response = RetrofitServiceManager.getCheckManifestByPage(keywords, offset)
+ val response = RetrofitServiceManager.getCheckManifestByScene(scene, offset)
when (response.getResponseCode()) {
200 -> {
loadState.value = LoadState.Success
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
index cfd56fe..da63560 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
@@ -6,7 +6,7 @@
import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.br.ar.app.R
-import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding
+import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding
import com.casic.br.ar.app.model.HiddenTroubleModel
import com.casic.br.ar.app.vm.HiddenTroubleViewModel
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
@@ -19,10 +19,10 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.WeakReferenceHandler
-class SceneHiddenTroubleActivity : KotlinBaseActivity(),
+class SceneHiddenTroubleActivity : KotlinBaseActivity(),
Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel
private lateinit var troubleAdapter: NormalRecyclerAdapter
private var sceneCode = ""
@@ -40,7 +40,6 @@
sceneCode = args[1]
- weakReferenceHandler = WeakReferenceHandler(this)
hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java]
getHiddenTroubleByScene()
hiddenTroubleViewModel.troublesResult.observe(this) {
@@ -62,7 +61,7 @@
2024052701 -> {
troubleAdapter = object :
NormalRecyclerAdapter(
- R.layout.item_hidden_electric_box_l, dataBeans
+ R.layout.item_scene_hidden_trouble_l, dataBeans
) {
override fun convertView(
viewHolder: ViewHolder, position: Int,
@@ -89,8 +88,8 @@
return true
}
- override fun initViewBinding(): ActivitySceneHiddenBinding {
- return ActivitySceneHiddenBinding.inflate(layoutInflater)
+ override fun initViewBinding(): ActivitySceneHiddenTroubleBinding {
+ return ActivitySceneHiddenTroubleBinding.inflate(layoutInflater)
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
index c9e20ae..78d3f10 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
@@ -24,7 +24,7 @@
private val context = this
private val marginOffset by lazy { 15.dp2px(this) }
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var standardFileViewModel: StandardFileViewModel
private lateinit var standardFileAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -35,7 +35,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
standardFileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java]
getStandardFileByPage()
standardFileViewModel.fileListResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
index 7275040..38c860f 100644
--- a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
+++ b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
@@ -18,9 +18,9 @@
private val gson by lazy { Gson() }
val manifestResult = MutableLiveData()
- fun getCheckManifestByPage(context: Context, keywords: String, offset: Int) = launch({
+ fun getCheckManifestByScene(context: Context, scene: String, offset: Int) = launch({
loadState.value = LoadState.Loading
- val response = RetrofitServiceManager.getCheckManifestByPage(keywords, offset)
+ val response = RetrofitServiceManager.getCheckManifestByScene(scene, offset)
when (response.getResponseCode()) {
200 -> {
loadState.value = LoadState.Success
diff --git a/app/src/main/res/layout/activity_scene_check_manifest.xml b/app/src/main/res/layout/activity_scene_check_manifest.xml
new file mode 100644
index 0000000..081846f
--- /dev/null
+++ b/app/src/main/res/layout/activity_scene_check_manifest.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
index cfd56fe..da63560 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
@@ -6,7 +6,7 @@
import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.br.ar.app.R
-import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding
+import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding
import com.casic.br.ar.app.model.HiddenTroubleModel
import com.casic.br.ar.app.vm.HiddenTroubleViewModel
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
@@ -19,10 +19,10 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.WeakReferenceHandler
-class SceneHiddenTroubleActivity : KotlinBaseActivity(),
+class SceneHiddenTroubleActivity : KotlinBaseActivity(),
Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel
private lateinit var troubleAdapter: NormalRecyclerAdapter
private var sceneCode = ""
@@ -40,7 +40,6 @@
sceneCode = args[1]
- weakReferenceHandler = WeakReferenceHandler(this)
hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java]
getHiddenTroubleByScene()
hiddenTroubleViewModel.troublesResult.observe(this) {
@@ -62,7 +61,7 @@
2024052701 -> {
troubleAdapter = object :
NormalRecyclerAdapter(
- R.layout.item_hidden_electric_box_l, dataBeans
+ R.layout.item_scene_hidden_trouble_l, dataBeans
) {
override fun convertView(
viewHolder: ViewHolder, position: Int,
@@ -89,8 +88,8 @@
return true
}
- override fun initViewBinding(): ActivitySceneHiddenBinding {
- return ActivitySceneHiddenBinding.inflate(layoutInflater)
+ override fun initViewBinding(): ActivitySceneHiddenTroubleBinding {
+ return ActivitySceneHiddenTroubleBinding.inflate(layoutInflater)
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
index c9e20ae..78d3f10 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
@@ -24,7 +24,7 @@
private val context = this
private val marginOffset by lazy { 15.dp2px(this) }
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var standardFileViewModel: StandardFileViewModel
private lateinit var standardFileAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -35,7 +35,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
standardFileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java]
getStandardFileByPage()
standardFileViewModel.fileListResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
index 7275040..38c860f 100644
--- a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
+++ b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
@@ -18,9 +18,9 @@
private val gson by lazy { Gson() }
val manifestResult = MutableLiveData()
- fun getCheckManifestByPage(context: Context, keywords: String, offset: Int) = launch({
+ fun getCheckManifestByScene(context: Context, scene: String, offset: Int) = launch({
loadState.value = LoadState.Loading
- val response = RetrofitServiceManager.getCheckManifestByPage(keywords, offset)
+ val response = RetrofitServiceManager.getCheckManifestByScene(scene, offset)
when (response.getResponseCode()) {
200 -> {
loadState.value = LoadState.Success
diff --git a/app/src/main/res/layout/activity_scene_check_manifest.xml b/app/src/main/res/layout/activity_scene_check_manifest.xml
new file mode 100644
index 0000000..081846f
--- /dev/null
+++ b/app/src/main/res/layout/activity_scene_check_manifest.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_scene_hidden.xml b/app/src/main/res/layout/activity_scene_hidden.xml
deleted file mode 100644
index c73575b..0000000
--- a/app/src/main/res/layout/activity_scene_hidden.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
index cfd56fe..da63560 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
@@ -6,7 +6,7 @@
import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.br.ar.app.R
-import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding
+import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding
import com.casic.br.ar.app.model.HiddenTroubleModel
import com.casic.br.ar.app.vm.HiddenTroubleViewModel
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
@@ -19,10 +19,10 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.WeakReferenceHandler
-class SceneHiddenTroubleActivity : KotlinBaseActivity(),
+class SceneHiddenTroubleActivity : KotlinBaseActivity(),
Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel
private lateinit var troubleAdapter: NormalRecyclerAdapter
private var sceneCode = ""
@@ -40,7 +40,6 @@
sceneCode = args[1]
- weakReferenceHandler = WeakReferenceHandler(this)
hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java]
getHiddenTroubleByScene()
hiddenTroubleViewModel.troublesResult.observe(this) {
@@ -62,7 +61,7 @@
2024052701 -> {
troubleAdapter = object :
NormalRecyclerAdapter(
- R.layout.item_hidden_electric_box_l, dataBeans
+ R.layout.item_scene_hidden_trouble_l, dataBeans
) {
override fun convertView(
viewHolder: ViewHolder, position: Int,
@@ -89,8 +88,8 @@
return true
}
- override fun initViewBinding(): ActivitySceneHiddenBinding {
- return ActivitySceneHiddenBinding.inflate(layoutInflater)
+ override fun initViewBinding(): ActivitySceneHiddenTroubleBinding {
+ return ActivitySceneHiddenTroubleBinding.inflate(layoutInflater)
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
index c9e20ae..78d3f10 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/StandardFileActivity.kt
@@ -24,7 +24,7 @@
private val context = this
private val marginOffset by lazy { 15.dp2px(this) }
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var standardFileViewModel: StandardFileViewModel
private lateinit var standardFileAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -35,7 +35,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
standardFileViewModel = ViewModelProvider(this)[StandardFileViewModel::class.java]
getStandardFileByPage()
standardFileViewModel.fileListResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
index 7275040..38c860f 100644
--- a/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
+++ b/app/src/main/java/com/casic/br/ar/app/vm/CheckManifestViewModel.kt
@@ -18,9 +18,9 @@
private val gson by lazy { Gson() }
val manifestResult = MutableLiveData()
- fun getCheckManifestByPage(context: Context, keywords: String, offset: Int) = launch({
+ fun getCheckManifestByScene(context: Context, scene: String, offset: Int) = launch({
loadState.value = LoadState.Loading
- val response = RetrofitServiceManager.getCheckManifestByPage(keywords, offset)
+ val response = RetrofitServiceManager.getCheckManifestByScene(scene, offset)
when (response.getResponseCode()) {
200 -> {
loadState.value = LoadState.Success
diff --git a/app/src/main/res/layout/activity_scene_check_manifest.xml b/app/src/main/res/layout/activity_scene_check_manifest.xml
new file mode 100644
index 0000000..081846f
--- /dev/null
+++ b/app/src/main/res/layout/activity_scene_check_manifest.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_scene_hidden.xml b/app/src/main/res/layout/activity_scene_hidden.xml
deleted file mode 100644
index c73575b..0000000
--- a/app/src/main/res/layout/activity_scene_hidden.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_scene_hidden_trouble.xml b/app/src/main/res/layout/activity_scene_hidden_trouble.xml
new file mode 100644
index 0000000..c73575b
--- /dev/null
+++ b/app/src/main/res/layout/activity_scene_hidden_trouble.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62c4479..7bc10cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
android:name=".view.CheckManifestActivity"
android:screenOrientation="landscape" />
+
rows;
+ private int total;
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public static class RowsModel {
+ private List basisList;
+ private String checkItem;
+ private String checkMethod;
+ private String checkObject;
+ private String checkObjectName;
+ private String checkStandard;
+ private String createTime;
+ private String createUserId;
+ private String createUserName;
+ private String id;
+ private String remark;
+ private String scene;
+ private String sceneName;
+ private String type;
+ private String typeName;
+ private String updateTime;
+ private String updateUserId;
+ private String updateUserName;
+
+ public List getBasisList() {
+ return basisList;
+ }
+
+ public void setBasisList(List basisList) {
+ this.basisList = basisList;
+ }
+
+ public String getCheckItem() {
+ return checkItem;
+ }
+
+ public void setCheckItem(String checkItem) {
+ this.checkItem = checkItem;
+ }
+
+ public String getCheckMethod() {
+ return checkMethod;
+ }
+
+ public void setCheckMethod(String checkMethod) {
+ this.checkMethod = checkMethod;
+ }
+
+ public String getCheckObject() {
+ return checkObject;
+ }
+
+ public void setCheckObject(String checkObject) {
+ this.checkObject = checkObject;
+ }
+
+ public String getCheckObjectName() {
+ return checkObjectName;
+ }
+
+ public void setCheckObjectName(String checkObjectName) {
+ this.checkObjectName = checkObjectName;
+ }
+
+ public String getCheckStandard() {
+ return checkStandard;
+ }
+
+ public void setCheckStandard(String checkStandard) {
+ this.checkStandard = checkStandard;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateUserId() {
+ return createUserId;
+ }
+
+ public void setCreateUserId(String createUserId) {
+ this.createUserId = createUserId;
+ }
+
+ public String getCreateUserName() {
+ return createUserName;
+ }
+
+ public void setCreateUserName(String createUserName) {
+ this.createUserName = createUserName;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getScene() {
+ return scene;
+ }
+
+ public void setScene(String scene) {
+ this.scene = scene;
+ }
+
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateUserId() {
+ return updateUserId;
+ }
+
+ public void setUpdateUserId(String updateUserId) {
+ this.updateUserId = updateUserId;
+ }
+
+ public String getUpdateUserName() {
+ return updateUserName;
+ }
+
+ public void setUpdateUserName(String updateUserName) {
+ this.updateUserName = updateUserName;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
index 8fcb1be..7072988 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitService.kt
@@ -11,7 +11,6 @@
import retrofit2.http.PartMap
import retrofit2.http.Path
import retrofit2.http.Query
-import retrofit2.http.QueryMap
interface RetrofitService {
@@ -84,14 +83,14 @@
): String
/**
- * 获取检查清单
+ * 根据场景获取获取检查清单
*/
- @POST("/meter/file/listPage")
- suspend fun getCheckManifestByPage(
+ @GET("/check-menu/listPage")
+ suspend fun getCheckManifestByScene(
@Header("token") token: String,
- @Body requestBody: RequestBody,
- @QueryMap limit: Map,
- @QueryMap offset: Map
+ @Query("scene") scene: String,
+ @Query("offset") offset: Int,
+ @Query("limit") limit: Int
): String
/**
diff --git a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
index 61975cc..266151a 100644
--- a/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
+++ b/app/src/main/java/com/casic/br/ar/app/retrofit/RetrofitServiceManager.kt
@@ -105,22 +105,11 @@
}
/**
- * 获取检查清单
+ * 根据场景获取获取隐患目录
*/
- suspend fun getCheckManifestByPage(keywords: String, offset: Int): String {
- val param = JsonObject()
- param.addProperty("keywords", keywords)
- val requestBody = param.toString().toRequestBody(
- "application/json;charset=UTF-8".toMediaType()
- )
-
- val limitMap = HashMap()
- limitMap["limit"] = LocaleConstant.PAGE_LIMIT
-
- val offsetMap = HashMap()
- offsetMap["offset"] = offset
- return api.getCheckManifestByPage(
- AuthenticationHelper.token, requestBody, limitMap, offsetMap
+ suspend fun getCheckManifestByScene(scene: String, offset: Int): String {
+ return api.getCheckManifestByScene(
+ AuthenticationHelper.token, scene, offset, LocaleConstant.PAGE_LIMIT
)
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
index 43c418d..dfe37ca 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckHistoryActivity.kt
@@ -21,7 +21,7 @@
class CheckHistoryActivity : KotlinBaseActivity(), Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var checkHistoryViewModel: CheckHistoryViewModel
private lateinit var checkHistoryAdapter: NormalRecyclerAdapter
private var dataBeans: MutableList = ArrayList()
@@ -32,7 +32,6 @@
}
override fun initOnCreate(savedInstanceState: Bundle?) {
- weakReferenceHandler = WeakReferenceHandler(this)
checkHistoryViewModel = ViewModelProvider(this)[CheckHistoryViewModel::class.java]
getCheckHistoryByPage()
checkHistoryViewModel.historyResult.observe(this) {
diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
index 3ffbf15..d8dc383 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/CheckManifestActivity.kt
@@ -12,6 +12,7 @@
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets
import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.Constant
class CheckManifestActivity : KotlinBaseActivity() {
@@ -56,14 +57,8 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- when (t.name) {
- //TODO 未完
-// "配电箱" -> navigatePageTo<>()
-// "调压站" -> navigatePageTo<>()
-// "非居民用户" -> navigatePageTo<>()
-// "建筑消防" -> navigatePageTo<>()
-// "有限空间作业" -> navigatePageTo<>()
- }
+ //传字典值
+ navigatePageTo(arrayListOf(t.name, t.value))
}
})
}
diff --git a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
index 54827c2..ef0fcf7 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/HiddenTroubleActivity.kt
@@ -57,7 +57,7 @@
menuAdapter.setOnItemClickedListener(object :
NormalRecyclerAdapter.OnItemClickedListener {
override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) {
- //穿字典值
+ //传字典值
navigatePageTo(arrayListOf(t.name, t.value))
}
})
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
new file mode 100644
index 0000000..0e41bbd
--- /dev/null
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneCheckManifestActivity.kt
@@ -0,0 +1,95 @@
+package com.casic.br.ar.app.view
+
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import com.casic.br.ar.app.R
+import com.casic.br.ar.app.databinding.ActivitySceneCheckManifestBinding
+import com.casic.br.ar.app.model.CheckManifestModel
+import com.casic.br.ar.app.vm.CheckManifestViewModel
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
+import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.utils.WeakReferenceHandler
+
+class SceneCheckManifestActivity : KotlinBaseActivity(),
+ Handler.Callback {
+
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
+ private lateinit var checkManifestViewModel: CheckManifestViewModel
+ private lateinit var checkManifestAdapter: NormalRecyclerAdapter
+ private var sceneCode = ""
+ private var dataBeans: MutableList = ArrayList()
+ private var page = 1
+
+ override fun initEvent() {
+
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM) as ArrayList
+
+ sceneCode = args[1]
+
+ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java]
+ getCheckManifestByScene()
+ checkManifestViewModel.manifestResult.observe(this) {
+ if (it.code == 200) {
+ binding.titleView.text = "${args[0]}检查清单（共${it.data.total}项）"
+ it.data?.rows?.apply {
+ dataBeans = this
+ weakReferenceHandler.sendEmptyMessage(2024052702)
+ }
+ }
+ }
+ }
+
+ private fun getCheckManifestByScene() {
+ checkManifestViewModel.getCheckManifestByScene(this, sceneCode, page)
+ }
+
+ override fun handleMessage(msg: Message): Boolean {
+ when (msg.what) {
+ 2024052702 -> {
+ checkManifestAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_scene_check_manifest_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: CheckManifestModel.DataModel.RowsModel
+ ) {
+ val baseContent = StringBuffer()
+ item.basisList.forEach {
+ baseContent.append(it.toString())
+ }
+
+ viewHolder.setText(R.id.indexView, "${position + 1}")
+ .setText(R.id.checkObjectView, item.checkObjectName)
+ .setText(R.id.checkItemView, item.checkItem)
+ .setText(R.id.checkStandardView, item.checkStandard)
+ .setText(R.id.checkBaseView, baseContent)
+ }
+ }
+ binding.recyclerView.adapter = checkManifestAdapter
+ }
+ }
+ return true
+ }
+
+ override fun initViewBinding(): ActivitySceneCheckManifestBinding {
+ return ActivitySceneCheckManifestBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ window.decorView.systemUiVisibility = uiOptions
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
index cfd56fe..da63560 100644
--- a/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
+++ b/app/src/main/java/com/casic/br/ar/app/view/SceneHiddenTroubleActivity.kt
@@ -6,7 +6,7 @@
import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.br.ar.app.R
-import com.casic.br.ar.app.databinding.ActivitySceneHiddenBinding
+import com.casic.br.ar.app.databinding.ActivitySceneHiddenTroubleBinding
import com.casic.br.ar.app.model.HiddenTroubleModel
import com.casic.br.ar.app.vm.HiddenTroubleViewModel
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
@@ -19,10 +19,10 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.WeakReferenceHandler
-class SceneHiddenTroubleActivity : KotlinBaseActivity(),
+class SceneHiddenTroubleActivity : KotlinBaseActivity(),
Handler.Callback {
- private lateinit var weakReferenceHandler: WeakReferenceHandler
+ private val weakReferenceHandler by lazy { WeakReferenceHandler(this) }
private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel
private lateinit var troubleAdapter: NormalRecyclerAdapter