diff --git a/.idea/misc.xml b/.idea/misc.xml index b0903e3..e218332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -164,6 +164,7 @@ + @@ -306,6 +307,7 @@ + @@ -323,6 +325,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index b0903e3..e218332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -164,6 +164,7 @@ + @@ -306,6 +307,7 @@ + @@ -323,6 +325,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 91c63f1..15ae70e 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -117,7 +117,7 @@ public static final String LIGHT_DETAIL = "/lightCr/overview/lampDetail?lampId="; //配置项 - public static final String PROJECT_CONFIG = "http://223.82.47.232:11504/bridge/static/project.config.json"; + public static final String PROJECT_CONFIG = "http://111.198.10.15:11404/bridge/static/project.config.json"; public static final String LAYER_CONFIG = "http://111.198.10.15:11404/dcms/static/project.config.json"; static final String TOILET_SERVICE_URL = "/arcgis/rest/services/crbjfc/FeatureServer";//崇仁公厕特征图层 diff --git a/.idea/misc.xml b/.idea/misc.xml index b0903e3..e218332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -164,6 +164,7 @@ + @@ -306,6 +307,7 @@ + @@ -323,6 +325,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 91c63f1..15ae70e 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -117,7 +117,7 @@ public static final String LIGHT_DETAIL = "/lightCr/overview/lampDetail?lampId="; //配置项 - public static final String PROJECT_CONFIG = "http://223.82.47.232:11504/bridge/static/project.config.json"; + public static final String PROJECT_CONFIG = "http://111.198.10.15:11404/bridge/static/project.config.json"; public static final String LAYER_CONFIG = "http://111.198.10.15:11404/dcms/static/project.config.json"; static final String TOILET_SERVICE_URL = "/arcgis/rest/services/crbjfc/FeatureServer";//崇仁公厕特征图层 diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 9443145..a03ca81 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -623,7 +623,7 @@ * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return shopApi.obtainMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -633,7 +633,7 @@ String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description ) { - return api.addMaintainRecord( + return shopApi.addMaintainRecord( AuthenticationHelper.getToken(), bridgeId, content, maintainTime, personId, longitude, latitude, description); } @@ -644,7 +644,7 @@ public static Observable getMaintainRecordResult( String startDate, String endDate, int offset ) { - return api.obtainMaintainRecord( + return shopApi.obtainMaintainRecord( AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -653,14 +653,14 @@ * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return shopApi.obtainLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return shopApi.obtainLightList(AuthenticationHelper.getToken()); } /** @@ -668,7 +668,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return shopApi.obtainLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -677,14 +677,14 @@ public static Observable getLightControlResult( List lampIds, String controlType ) { - return api.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); + return shopApi.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); } /** * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return shopApi.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -693,7 +693,7 @@ public static Observable getCancelAlarmResult( String id, String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); } /** @@ -702,14 +702,14 @@ public static Observable getCancelAlarmResult( String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); } /** * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return shopApi.obtainWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); @@ -719,14 +719,14 @@ * 单个撤防/布防 */ public static Observable getSingleOptionWellResult(String wellId, String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); } /** * 一键撤防/布防 */ public static Observable getBatchOptionWellResult(String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), bfzt); } /** @@ -740,7 +740,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return shopApi.obtainWellDetail( "json", "4326", "4326", "*", true, where ); } diff --git a/.idea/misc.xml b/.idea/misc.xml index b0903e3..e218332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -164,6 +164,7 @@ + @@ -306,6 +307,7 @@ + @@ -323,6 +325,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 91c63f1..15ae70e 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -117,7 +117,7 @@ public static final String LIGHT_DETAIL = "/lightCr/overview/lampDetail?lampId="; //配置项 - public static final String PROJECT_CONFIG = "http://223.82.47.232:11504/bridge/static/project.config.json"; + public static final String PROJECT_CONFIG = "http://111.198.10.15:11404/bridge/static/project.config.json"; public static final String LAYER_CONFIG = "http://111.198.10.15:11404/dcms/static/project.config.json"; static final String TOILET_SERVICE_URL = "/arcgis/rest/services/crbjfc/FeatureServer";//崇仁公厕特征图层 diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 9443145..a03ca81 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -623,7 +623,7 @@ * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return shopApi.obtainMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -633,7 +633,7 @@ String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description ) { - return api.addMaintainRecord( + return shopApi.addMaintainRecord( AuthenticationHelper.getToken(), bridgeId, content, maintainTime, personId, longitude, latitude, description); } @@ -644,7 +644,7 @@ public static Observable getMaintainRecordResult( String startDate, String endDate, int offset ) { - return api.obtainMaintainRecord( + return shopApi.obtainMaintainRecord( AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -653,14 +653,14 @@ * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return shopApi.obtainLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return shopApi.obtainLightList(AuthenticationHelper.getToken()); } /** @@ -668,7 +668,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return shopApi.obtainLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -677,14 +677,14 @@ public static Observable getLightControlResult( List lampIds, String controlType ) { - return api.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); + return shopApi.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); } /** * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return shopApi.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -693,7 +693,7 @@ public static Observable getCancelAlarmResult( String id, String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); } /** @@ -702,14 +702,14 @@ public static Observable getCancelAlarmResult( String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); } /** * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return shopApi.obtainWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); @@ -719,14 +719,14 @@ * 单个撤防/布防 */ public static Observable getSingleOptionWellResult(String wellId, String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); } /** * 一键撤防/布防 */ public static Observable getBatchOptionWellResult(String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), bfzt); } /** @@ -740,7 +740,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return shopApi.obtainWellDetail( "json", "4326", "4326", "*", true, where ); } diff --git a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java index 471b31b..77825af 100644 --- a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.view; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; @@ -49,7 +48,12 @@ viewBinding.titleBarLayout.titleView.setText("路桥养护"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - viewBinding.titleBarLayout.rightImageView.setOnClickListener(v -> startActivity(new Intent(this, MaintainRecordActivity.class))); + viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ContextHub.navigatePageTo(context, MaintainRecordActivity.class); + } + }); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index b0903e3..e218332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -164,6 +164,7 @@ + @@ -306,6 +307,7 @@ + @@ -323,6 +325,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 91c63f1..15ae70e 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -117,7 +117,7 @@ public static final String LIGHT_DETAIL = "/lightCr/overview/lampDetail?lampId="; //配置项 - public static final String PROJECT_CONFIG = "http://223.82.47.232:11504/bridge/static/project.config.json"; + public static final String PROJECT_CONFIG = "http://111.198.10.15:11404/bridge/static/project.config.json"; public static final String LAYER_CONFIG = "http://111.198.10.15:11404/dcms/static/project.config.json"; static final String TOILET_SERVICE_URL = "/arcgis/rest/services/crbjfc/FeatureServer";//崇仁公厕特征图层 diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 9443145..a03ca81 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -623,7 +623,7 @@ * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return shopApi.obtainMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -633,7 +633,7 @@ String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description ) { - return api.addMaintainRecord( + return shopApi.addMaintainRecord( AuthenticationHelper.getToken(), bridgeId, content, maintainTime, personId, longitude, latitude, description); } @@ -644,7 +644,7 @@ public static Observable getMaintainRecordResult( String startDate, String endDate, int offset ) { - return api.obtainMaintainRecord( + return shopApi.obtainMaintainRecord( AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -653,14 +653,14 @@ * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return shopApi.obtainLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return shopApi.obtainLightList(AuthenticationHelper.getToken()); } /** @@ -668,7 +668,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return shopApi.obtainLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -677,14 +677,14 @@ public static Observable getLightControlResult( List lampIds, String controlType ) { - return api.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); + return shopApi.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); } /** * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return shopApi.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -693,7 +693,7 @@ public static Observable getCancelAlarmResult( String id, String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); } /** @@ -702,14 +702,14 @@ public static Observable getCancelAlarmResult( String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); } /** * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return shopApi.obtainWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); @@ -719,14 +719,14 @@ * 单个撤防/布防 */ public static Observable getSingleOptionWellResult(String wellId, String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); } /** * 一键撤防/布防 */ public static Observable getBatchOptionWellResult(String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), bfzt); } /** @@ -740,7 +740,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return shopApi.obtainWellDetail( "json", "4326", "4326", "*", true, where ); } diff --git a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java index 471b31b..77825af 100644 --- a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.view; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; @@ -49,7 +48,12 @@ viewBinding.titleBarLayout.titleView.setText("路桥养护"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - viewBinding.titleBarLayout.rightImageView.setOnClickListener(v -> startActivity(new Intent(this, MaintainRecordActivity.class))); + viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ContextHub.navigatePageTo(context, MaintainRecordActivity.class); + } + }); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index b93b727..6f35405 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -19,6 +19,8 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.ItemDecoration; +import com.pengxh.androidx.lite.hub.FloatHub; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -172,6 +174,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; + viewBinding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); viewBinding.recordRecyclerView.setAdapter(adapter); } } diff --git a/.idea/misc.xml b/.idea/misc.xml index b0903e3..e218332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -164,6 +164,7 @@ + @@ -306,6 +307,7 @@ + @@ -323,6 +325,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 91c63f1..15ae70e 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -117,7 +117,7 @@ public static final String LIGHT_DETAIL = "/lightCr/overview/lampDetail?lampId="; //配置项 - public static final String PROJECT_CONFIG = "http://223.82.47.232:11504/bridge/static/project.config.json"; + public static final String PROJECT_CONFIG = "http://111.198.10.15:11404/bridge/static/project.config.json"; public static final String LAYER_CONFIG = "http://111.198.10.15:11404/dcms/static/project.config.json"; static final String TOILET_SERVICE_URL = "/arcgis/rest/services/crbjfc/FeatureServer";//崇仁公厕特征图层 diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 9443145..a03ca81 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -623,7 +623,7 @@ * 根据养护类型获取养护内容 */ public static Observable getMaintainContentResult(String type) { - return api.obtainMaintainContent(AuthenticationHelper.getToken(), type); + return shopApi.obtainMaintainContent(AuthenticationHelper.getToken(), type); } /** @@ -633,7 +633,7 @@ String bridgeId, String content, String maintainTime, String personId, String longitude, String latitude, String description ) { - return api.addMaintainRecord( + return shopApi.addMaintainRecord( AuthenticationHelper.getToken(), bridgeId, content, maintainTime, personId, longitude, latitude, description); } @@ -644,7 +644,7 @@ public static Observable getMaintainRecordResult( String startDate, String endDate, int offset ) { - return api.obtainMaintainRecord( + return shopApi.obtainMaintainRecord( AuthenticationHelper.getToken(), startDate, endDate, LocaleConstant.PAGE_LIMIT, offset ); } @@ -653,14 +653,14 @@ * 路灯分页列表 */ public static Observable getLightListResult(int limit, int offset) { - return api.obtainLightList(AuthenticationHelper.getToken(), limit, offset); + return shopApi.obtainLightList(AuthenticationHelper.getToken(), limit, offset); } /** * 全部路灯 */ public static Observable getLightListResult() { - return api.obtainLightList(AuthenticationHelper.getToken()); + return shopApi.obtainLightList(AuthenticationHelper.getToken()); } /** @@ -668,7 +668,7 @@ * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ public static Observable getLightDetailResult(String lampId) { - return api.obtainLightDetail(AuthenticationHelper.getToken(), lampId); + return shopApi.obtainLightDetail(AuthenticationHelper.getToken(), lampId); } /** @@ -677,14 +677,14 @@ public static Observable getLightControlResult( List lampIds, String controlType ) { - return api.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); + return shopApi.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); } /** * 报警列表 */ public static Observable getAlarmListResult(int limit, int offset) { - return api.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); + return shopApi.obtainAlarmList(AuthenticationHelper.getToken(), "1", limit, offset); } /** @@ -693,7 +693,7 @@ public static Observable getCancelAlarmResult( String id, String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), id, jobStatus, handleMessage); } /** @@ -702,14 +702,14 @@ public static Observable getCancelAlarmResult( String jobStatus, String handleMessage ) { - return api.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); + return shopApi.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); } /** * 窨井列表 */ public static Observable getWellListResult(int offset) { - return api.obtainWellList( + return shopApi.obtainWellList( AuthenticationHelper.getToken(), "wellCode", "asc", LocaleConstant.PAGE_LIMIT, offset ); @@ -719,14 +719,14 @@ * 单个撤防/布防 */ public static Observable getSingleOptionWellResult(String wellId, String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), wellId, bfzt); } /** * 一键撤防/布防 */ public static Observable getBatchOptionWellResult(String bfzt) { - return api.optionWellStatus(AuthenticationHelper.getToken(), bfzt); + return shopApi.optionWellStatus(AuthenticationHelper.getToken(), bfzt); } /** @@ -740,7 +740,7 @@ // .client(createOKHttpClient())//log拦截器 // .build(); // RetrofitService service = retrofit.create(RetrofitService.class); - return api.obtainWellDetail( + return shopApi.obtainWellDetail( "json", "4326", "4326", "*", true, where ); } diff --git a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java index 471b31b..77825af 100644 --- a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java @@ -1,7 +1,6 @@ package com.casic.dcms.view; import android.content.Context; -import android.content.Intent; import android.text.TextUtils; import android.view.View; @@ -49,7 +48,12 @@ viewBinding.titleBarLayout.titleView.setText("路桥养护"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - viewBinding.titleBarLayout.rightImageView.setOnClickListener(v -> startActivity(new Intent(this, MaintainRecordActivity.class))); + viewBinding.titleBarLayout.rightImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ContextHub.navigatePageTo(context, MaintainRecordActivity.class); + } + }); } @Override diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index b93b727..6f35405 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -19,6 +19,8 @@ import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; import com.pengxh.androidx.lite.adapter.ViewHolder; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.divider.ItemDecoration; +import com.pengxh.androidx.lite.hub.FloatHub; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -172,6 +174,7 @@ .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); } }; + viewBinding.recordRecyclerView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 10), 0f)); viewBinding.recordRecyclerView.setAdapter(adapter); } } diff --git a/app/src/main/res/layout/item_maintain_rv_l.xml b/app/src/main/res/layout/item_maintain_rv_l.xml index 9ea11fa..a22a35a 100644 --- a/app/src/main/res/layout/item_maintain_rv_l.xml +++ b/app/src/main/res/layout/item_maintain_rv_l.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_below="@id/l" android:layout_alignParentStart="true" - android:layout_marginTop="3dp" + android:layout_marginTop="@dimen/dp_5" android:gravity="center_vertical" android:singleLine="true" android:text="@string/app_name"