diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java index bca3cff..71f6740 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java @@ -65,13 +65,26 @@ } public static class RowsModel { + private String borderPointCount; private String createTime; + private String deptFullName; + private String deptId; + private String deptName; + private List deviceList; + private String finishTime; + private String groupDeviceCode; + private String groupDeviceId; private String id; private String imageUrl; + private String locationTime; + private List pointLocation; + private String pointLocationJson; private String projectState; private String projectStateName; private String registerTime; + private String startTime; private String updateTime; + private String valid; private String workPerson; private String workPersonDeptId; private String workPersonDeptName; @@ -80,6 +93,16 @@ private String workRoad; private String workSiteDesc; private String workTitle; + private String workType; + private String workTypeName; + + public String getBorderPointCount() { + return borderPointCount; + } + + public void setBorderPointCount(String borderPointCount) { + this.borderPointCount = borderPointCount; + } public String getCreateTime() { return createTime; @@ -89,6 +112,62 @@ this.createTime = createTime; } + public String getDeptFullName() { + return deptFullName; + } + + public void setDeptFullName(String deptFullName) { + this.deptFullName = deptFullName; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDeviceList() { + return deviceList; + } + + public void setDeviceList(List deviceList) { + this.deviceList = deviceList; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getGroupDeviceCode() { + return groupDeviceCode; + } + + public void setGroupDeviceCode(String groupDeviceCode) { + this.groupDeviceCode = groupDeviceCode; + } + + public String getGroupDeviceId() { + return groupDeviceId; + } + + public void setGroupDeviceId(String groupDeviceId) { + this.groupDeviceId = groupDeviceId; + } + public String getId() { return id; } @@ -105,6 +184,30 @@ this.imageUrl = imageUrl; } + public String getLocationTime() { + return locationTime; + } + + public void setLocationTime(String locationTime) { + this.locationTime = locationTime; + } + + public List getPointLocation() { + return pointLocation; + } + + public void setPointLocation(List pointLocation) { + this.pointLocation = pointLocation; + } + + public String getPointLocationJson() { + return pointLocationJson; + } + + public void setPointLocationJson(String pointLocationJson) { + this.pointLocationJson = pointLocationJson; + } + public String getProjectState() { return projectState; } @@ -129,6 +232,14 @@ this.registerTime = registerTime; } + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + public String getUpdateTime() { return updateTime; } @@ -137,6 +248,14 @@ this.updateTime = updateTime; } + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + public String getWorkPerson() { return workPerson; } @@ -200,6 +319,43 @@ public void setWorkTitle(String workTitle) { this.workTitle = workTitle; } + + public String getWorkType() { + return workType; + } + + public void setWorkType(String workType) { + this.workType = workType; + } + + public String getWorkTypeName() { + return workTypeName; + } + + public void setWorkTypeName(String workTypeName) { + this.workTypeName = workTypeName; + } + + public static class PointLocationModel { + private String lng; + private String lat; + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + } } } } diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java index bca3cff..71f6740 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java @@ -65,13 +65,26 @@ } public static class RowsModel { + private String borderPointCount; private String createTime; + private String deptFullName; + private String deptId; + private String deptName; + private List deviceList; + private String finishTime; + private String groupDeviceCode; + private String groupDeviceId; private String id; private String imageUrl; + private String locationTime; + private List pointLocation; + private String pointLocationJson; private String projectState; private String projectStateName; private String registerTime; + private String startTime; private String updateTime; + private String valid; private String workPerson; private String workPersonDeptId; private String workPersonDeptName; @@ -80,6 +93,16 @@ private String workRoad; private String workSiteDesc; private String workTitle; + private String workType; + private String workTypeName; + + public String getBorderPointCount() { + return borderPointCount; + } + + public void setBorderPointCount(String borderPointCount) { + this.borderPointCount = borderPointCount; + } public String getCreateTime() { return createTime; @@ -89,6 +112,62 @@ this.createTime = createTime; } + public String getDeptFullName() { + return deptFullName; + } + + public void setDeptFullName(String deptFullName) { + this.deptFullName = deptFullName; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDeviceList() { + return deviceList; + } + + public void setDeviceList(List deviceList) { + this.deviceList = deviceList; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getGroupDeviceCode() { + return groupDeviceCode; + } + + public void setGroupDeviceCode(String groupDeviceCode) { + this.groupDeviceCode = groupDeviceCode; + } + + public String getGroupDeviceId() { + return groupDeviceId; + } + + public void setGroupDeviceId(String groupDeviceId) { + this.groupDeviceId = groupDeviceId; + } + public String getId() { return id; } @@ -105,6 +184,30 @@ this.imageUrl = imageUrl; } + public String getLocationTime() { + return locationTime; + } + + public void setLocationTime(String locationTime) { + this.locationTime = locationTime; + } + + public List getPointLocation() { + return pointLocation; + } + + public void setPointLocation(List pointLocation) { + this.pointLocation = pointLocation; + } + + public String getPointLocationJson() { + return pointLocationJson; + } + + public void setPointLocationJson(String pointLocationJson) { + this.pointLocationJson = pointLocationJson; + } + public String getProjectState() { return projectState; } @@ -129,6 +232,14 @@ this.registerTime = registerTime; } + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + public String getUpdateTime() { return updateTime; } @@ -137,6 +248,14 @@ this.updateTime = updateTime; } + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + public String getWorkPerson() { return workPerson; } @@ -200,6 +319,43 @@ public void setWorkTitle(String workTitle) { this.workTitle = workTitle; } + + public String getWorkType() { + return workType; + } + + public void setWorkType(String workType) { + this.workType = workType; + } + + public String getWorkTypeName() { + return workTypeName; + } + + public void setWorkTypeName(String workTypeName) { + this.workTypeName = workTypeName; + } + + public static class PointLocationModel { + private String lng; + private String lat; + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + } } } } diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 523adce..d855ac6 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -50,7 +50,7 @@ /** * 实施中列表 */ - @GET("/site/listPage") + @GET("/v3/site/listPage") suspend fun getProjectListByPage( @Header("token") token: String, @Query("keywords") keywords: String, diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java index bca3cff..71f6740 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java @@ -65,13 +65,26 @@ } public static class RowsModel { + private String borderPointCount; private String createTime; + private String deptFullName; + private String deptId; + private String deptName; + private List deviceList; + private String finishTime; + private String groupDeviceCode; + private String groupDeviceId; private String id; private String imageUrl; + private String locationTime; + private List pointLocation; + private String pointLocationJson; private String projectState; private String projectStateName; private String registerTime; + private String startTime; private String updateTime; + private String valid; private String workPerson; private String workPersonDeptId; private String workPersonDeptName; @@ -80,6 +93,16 @@ private String workRoad; private String workSiteDesc; private String workTitle; + private String workType; + private String workTypeName; + + public String getBorderPointCount() { + return borderPointCount; + } + + public void setBorderPointCount(String borderPointCount) { + this.borderPointCount = borderPointCount; + } public String getCreateTime() { return createTime; @@ -89,6 +112,62 @@ this.createTime = createTime; } + public String getDeptFullName() { + return deptFullName; + } + + public void setDeptFullName(String deptFullName) { + this.deptFullName = deptFullName; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDeviceList() { + return deviceList; + } + + public void setDeviceList(List deviceList) { + this.deviceList = deviceList; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getGroupDeviceCode() { + return groupDeviceCode; + } + + public void setGroupDeviceCode(String groupDeviceCode) { + this.groupDeviceCode = groupDeviceCode; + } + + public String getGroupDeviceId() { + return groupDeviceId; + } + + public void setGroupDeviceId(String groupDeviceId) { + this.groupDeviceId = groupDeviceId; + } + public String getId() { return id; } @@ -105,6 +184,30 @@ this.imageUrl = imageUrl; } + public String getLocationTime() { + return locationTime; + } + + public void setLocationTime(String locationTime) { + this.locationTime = locationTime; + } + + public List getPointLocation() { + return pointLocation; + } + + public void setPointLocation(List pointLocation) { + this.pointLocation = pointLocation; + } + + public String getPointLocationJson() { + return pointLocationJson; + } + + public void setPointLocationJson(String pointLocationJson) { + this.pointLocationJson = pointLocationJson; + } + public String getProjectState() { return projectState; } @@ -129,6 +232,14 @@ this.registerTime = registerTime; } + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + public String getUpdateTime() { return updateTime; } @@ -137,6 +248,14 @@ this.updateTime = updateTime; } + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + public String getWorkPerson() { return workPerson; } @@ -200,6 +319,43 @@ public void setWorkTitle(String workTitle) { this.workTitle = workTitle; } + + public String getWorkType() { + return workType; + } + + public void setWorkType(String workType) { + this.workType = workType; + } + + public String getWorkTypeName() { + return workTypeName; + } + + public void setWorkTypeName(String workTypeName) { + this.workTypeName = workTypeName; + } + + public static class PointLocationModel { + private String lng; + private String lat; + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + } } } } diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 523adce..d855ac6 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -50,7 +50,7 @@ /** * 实施中列表 */ - @GET("/site/listPage") + @GET("/v3/site/listPage") suspend fun getProjectListByPage( @Header("token") token: String, @Query("keywords") keywords: String, diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index a3dc2fa..300a75b 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -64,6 +64,7 @@ isLoadMore = false if (dataRows.isEmpty()) { "到底了，别拉了".show(this) + return@observe } alarmAdapter.loadMore(dataRows) } diff --git a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java index bca3cff..71f6740 100644 --- a/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java +++ b/app/src/main/java/com/casic/br/operationsite/model/WorkSiteListModel.java @@ -65,13 +65,26 @@ } public static class RowsModel { + private String borderPointCount; private String createTime; + private String deptFullName; + private String deptId; + private String deptName; + private List deviceList; + private String finishTime; + private String groupDeviceCode; + private String groupDeviceId; private String id; private String imageUrl; + private String locationTime; + private List pointLocation; + private String pointLocationJson; private String projectState; private String projectStateName; private String registerTime; + private String startTime; private String updateTime; + private String valid; private String workPerson; private String workPersonDeptId; private String workPersonDeptName; @@ -80,6 +93,16 @@ private String workRoad; private String workSiteDesc; private String workTitle; + private String workType; + private String workTypeName; + + public String getBorderPointCount() { + return borderPointCount; + } + + public void setBorderPointCount(String borderPointCount) { + this.borderPointCount = borderPointCount; + } public String getCreateTime() { return createTime; @@ -89,6 +112,62 @@ this.createTime = createTime; } + public String getDeptFullName() { + return deptFullName; + } + + public void setDeptFullName(String deptFullName) { + this.deptFullName = deptFullName; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDeviceList() { + return deviceList; + } + + public void setDeviceList(List deviceList) { + this.deviceList = deviceList; + } + + public String getFinishTime() { + return finishTime; + } + + public void setFinishTime(String finishTime) { + this.finishTime = finishTime; + } + + public String getGroupDeviceCode() { + return groupDeviceCode; + } + + public void setGroupDeviceCode(String groupDeviceCode) { + this.groupDeviceCode = groupDeviceCode; + } + + public String getGroupDeviceId() { + return groupDeviceId; + } + + public void setGroupDeviceId(String groupDeviceId) { + this.groupDeviceId = groupDeviceId; + } + public String getId() { return id; } @@ -105,6 +184,30 @@ this.imageUrl = imageUrl; } + public String getLocationTime() { + return locationTime; + } + + public void setLocationTime(String locationTime) { + this.locationTime = locationTime; + } + + public List getPointLocation() { + return pointLocation; + } + + public void setPointLocation(List pointLocation) { + this.pointLocation = pointLocation; + } + + public String getPointLocationJson() { + return pointLocationJson; + } + + public void setPointLocationJson(String pointLocationJson) { + this.pointLocationJson = pointLocationJson; + } + public String getProjectState() { return projectState; } @@ -129,6 +232,14 @@ this.registerTime = registerTime; } + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + public String getUpdateTime() { return updateTime; } @@ -137,6 +248,14 @@ this.updateTime = updateTime; } + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + public String getWorkPerson() { return workPerson; } @@ -200,6 +319,43 @@ public void setWorkTitle(String workTitle) { this.workTitle = workTitle; } + + public String getWorkType() { + return workType; + } + + public void setWorkType(String workType) { + this.workType = workType; + } + + public String getWorkTypeName() { + return workTypeName; + } + + public void setWorkTypeName(String workTypeName) { + this.workTypeName = workTypeName; + } + + public static class PointLocationModel { + private String lng; + private String lat; + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + } } } } diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 523adce..d855ac6 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -50,7 +50,7 @@ /** * 实施中列表 */ - @GET("/site/listPage") + @GET("/v3/site/listPage") suspend fun getProjectListByPage( @Header("token") token: String, @Query("keywords") keywords: String, diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index a3dc2fa..300a75b 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -64,6 +64,7 @@ isLoadMore = false if (dataRows.isEmpty()) { "到底了，别拉了".show(this) + return@observe } alarmAdapter.loadMore(dataRows) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 6fbc0c6..3b0e1a3 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -37,7 +37,6 @@ return ActivityMainBinding.inflate(layoutInflater) } - override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) } @@ -58,14 +57,15 @@ isLoadMore -> { binding.refreshView.finishLoadMore() isLoadMore = false - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { "到底了，别拉了".show(this) + return@observe } workSiteAdapter.loadMore(dataRows) } else -> { - if (dataRows.size == 0) { + if (dataRows.isEmpty()) { binding.emptyView.visibility = View.VISIBLE binding.recyclerView.visibility = View.GONE } else {