diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 725c350..a6bdd82 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -26,11 +26,6 @@ RetrofitFactory.createRetrofit(httpConfig) } - private val regionApi by lazy { - val httpConfig = "http://192.168.10.104:5000" - RetrofitFactory.createRetrofit(httpConfig) - } - /** * 验证PublicKey */ @@ -138,6 +133,12 @@ val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) + + val host = SaveKeyValues.getValue(LocaleConstant.UDP_HOST, "192.168.10.133").toString() + val regionApi by lazy { + val httpConfig = "http://${host}:5000" + RetrofitFactory.createRetrofit(httpConfig) + } return regionApi.changeAlarmState(requestBody) } @@ -242,6 +243,12 @@ val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) + + val host = SaveKeyValues.getValue(LocaleConstant.UDP_HOST, "192.168.10.133").toString() + val regionApi by lazy { + val httpConfig = "http://${host}:5000" + RetrofitFactory.createRetrofit(httpConfig) + } return regionApi.postRegion(requestBody) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 725c350..a6bdd82 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -26,11 +26,6 @@ RetrofitFactory.createRetrofit(httpConfig) } - private val regionApi by lazy { - val httpConfig = "http://192.168.10.104:5000" - RetrofitFactory.createRetrofit(httpConfig) - } - /** * 验证PublicKey */ @@ -138,6 +133,12 @@ val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) + + val host = SaveKeyValues.getValue(LocaleConstant.UDP_HOST, "192.168.10.133").toString() + val regionApi by lazy { + val httpConfig = "http://${host}:5000" + RetrofitFactory.createRetrofit(httpConfig) + } return regionApi.changeAlarmState(requestBody) } @@ -242,6 +243,12 @@ val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) + + val host = SaveKeyValues.getValue(LocaleConstant.UDP_HOST, "192.168.10.133").toString() + val regionApi by lazy { + val httpConfig = "http://${host}:5000" + RetrofitFactory.createRetrofit(httpConfig) + } return regionApi.postRegion(requestBody) } } \ No newline at end of file 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 d14b678..bbe3e52 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 @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.diffCurrentTime +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -150,10 +151,20 @@ .setText(R.id.alarmContentView, item.alarmContent) .setText(R.id.workRoadView, item.workRoad) .setText(R.id.alarmTimeView, diffTime) - .setText(R.id.alarmValueView, "报警值:${item.alarmValue}") .setImageResource( R.id.alarmImageView, item.alarmImage.combineImagePath() ) + .setOnClickListener(R.id.alarmImageView) { + navigatePageTo( + 0, arrayListOf(item.alarmImage.combineImagePath()) + ) + } + if (item.alarmType == "2") { + viewHolder.setVisibility(R.id.alarmValueView, View.INVISIBLE) + } else { + viewHolder.setVisibility(R.id.alarmValueView, View.VISIBLE) + .setText(R.id.alarmValueView, "报警值:${item.alarmValue}") + } } } alarmRecyclerView.addItemDecoration( @@ -166,7 +177,7 @@ position: Int, t: AlarmListModel.DataModel.RowsModel ) { // navigatePageTo(t.id) - "需求待完善".show(this@AlarmListActivity) + "未实现".show(this@AlarmListActivity) } }) } diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 725c350..a6bdd82 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -26,11 +26,6 @@ RetrofitFactory.createRetrofit(httpConfig) } - private val regionApi by lazy { - val httpConfig = "http://192.168.10.104:5000" - RetrofitFactory.createRetrofit(httpConfig) - } - /** * 验证PublicKey */ @@ -138,6 +133,12 @@ val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) + + val host = SaveKeyValues.getValue(LocaleConstant.UDP_HOST, "192.168.10.133").toString() + val regionApi by lazy { + val httpConfig = "http://${host}:5000" + RetrofitFactory.createRetrofit(httpConfig) + } return regionApi.changeAlarmState(requestBody) } @@ -242,6 +243,12 @@ val requestBody = param.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) + + val host = SaveKeyValues.getValue(LocaleConstant.UDP_HOST, "192.168.10.133").toString() + val regionApi by lazy { + val httpConfig = "http://${host}:5000" + RetrofitFactory.createRetrofit(httpConfig) + } return regionApi.postRegion(requestBody) } } \ No newline at end of file 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 d14b678..bbe3e52 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 @@ -18,6 +18,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.diffCurrentTime +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -150,10 +151,20 @@ .setText(R.id.alarmContentView, item.alarmContent) .setText(R.id.workRoadView, item.workRoad) .setText(R.id.alarmTimeView, diffTime) - .setText(R.id.alarmValueView, "报警值:${item.alarmValue}") .setImageResource( R.id.alarmImageView, item.alarmImage.combineImagePath() ) + .setOnClickListener(R.id.alarmImageView) { + navigatePageTo( + 0, arrayListOf(item.alarmImage.combineImagePath()) + ) + } + if (item.alarmType == "2") { + viewHolder.setVisibility(R.id.alarmValueView, View.INVISIBLE) + } else { + viewHolder.setVisibility(R.id.alarmValueView, View.VISIBLE) + .setText(R.id.alarmValueView, "报警值:${item.alarmValue}") + } } } alarmRecyclerView.addItemDecoration( @@ -166,7 +177,7 @@ position: Int, t: AlarmListModel.DataModel.RowsModel ) { // navigatePageTo(t.id) - "需求待完善".show(this@AlarmListActivity) + "未实现".show(this@AlarmListActivity) } }) } diff --git a/app/src/main/res/layout/activity_hikvision.xml b/app/src/main/res/layout/activity_hikvision.xml index c53c6fe..bc0ce45 100644 --- a/app/src/main/res/layout/activity_hikvision.xml +++ b/app/src/main/res/layout/activity_hikvision.xml @@ -14,67 +14,11 @@ android:background="@color/mainBackColor" android:orientation="vertical"> - - - - - - - - - - - - - - + android:layout_marginHorizontal="@dimen/dp_7" + android:layout_marginTop="@dimen/dp_7"> - + android:layout_height="wrap_content"> - - - - + android:orientation="vertical"> -