diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so deleted file mode 100644 index 1dbd28b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so deleted file mode 100644 index 1dbd28b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so deleted file mode 100644 index 9cff40b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so deleted file mode 100644 index 1dbd28b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so deleted file mode 100644 index 9cff40b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so deleted file mode 100644 index 6898f49..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so deleted file mode 100644 index 1dbd28b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so deleted file mode 100644 index 9cff40b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so deleted file mode 100644 index 6898f49..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so deleted file mode 100644 index a4cee7c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so deleted file mode 100644 index 1dbd28b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so deleted file mode 100644 index 9cff40b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so deleted file mode 100644 index 6898f49..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so deleted file mode 100644 index a4cee7c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so deleted file mode 100644 index 2d00ea6..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so deleted file mode 100644 index 1dbd28b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so deleted file mode 100644 index 9cff40b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so deleted file mode 100644 index 6898f49..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so deleted file mode 100644 index a4cee7c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so deleted file mode 100644 index 2d00ea6..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libcrypto_1.1.1d.so deleted file mode 100644 index fb51f42..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f912023..594ad1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ minSdkVersion 23 targetSdkVersion 31 versionCode 1 - versionName "1.0.0" + versionName "1.0.0.0" } buildTypes { @@ -38,10 +38,6 @@ targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - } - kotlin { experimental { coroutines 'enable' @@ -50,7 +46,7 @@ applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SX_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" + outputFileName = "SXXZ_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } } @@ -63,7 +59,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -101,15 +97,12 @@ implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //高德导航、定位、地图三合一 implementation 'com.amap.api:navi-3dmap:latest.integration' - //ArcGIS -// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' //图片压缩 implementation 'top.zibin:Luban:1.1.8' -// implementation project(path: ':hatom-video-player') //绕过Android 11反射限制 implementation 'com.github.tiann:FreeReflection:3.1.0' } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar deleted file mode 100644 index 45da4df..0000000 --- a/app/libs/lite-release.aar +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt index 7ec74fd..2ef87f8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/CompletedFragment.kt @@ -7,7 +7,6 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.CompletedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo @@ -19,7 +18,6 @@ class CompletedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() @@ -39,10 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -66,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111001) } - }) + } } override fun initEvent() { @@ -84,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("3", pageIndex) + orderViewModel.obtainWorkOrderListByState("3", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt index eade61a..192e0ce 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/InHandleFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.InHandleDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class InHandleFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111004) } - }) + } } override fun initEvent() { @@ -87,7 +86,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("2", pageIndex) + orderViewModel.obtainWorkOrderListByState("2", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt index 4329f12..123a6af 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotConfirmedFragment.kt @@ -7,7 +7,7 @@ import com.casic.smart.town.sanxi.extensions.showEmptyPage import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.view.order.NotConfirmedDetailActivity -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show @@ -18,7 +18,7 @@ class NotConfirmedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -37,9 +37,8 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] - - orderListViewModel.resultModel.observe(this, { + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -63,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2022111002) } - }) + } } override fun initEvent() { @@ -81,7 +80,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("1", pageIndex) + orderViewModel.obtainWorkOrderListByState("1", pageIndex) } override fun onResume() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt index d487036..a9c9878 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/order/NotProcessedFragment.kt @@ -9,7 +9,7 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.order.NotProcessedDetailActivity import com.casic.smart.town.sanxi.vm.OperationViewModel -import com.casic.smart.town.sanxi.vm.OrderListViewModel +import com.casic.smart.town.sanxi.vm.OrderViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ class NotProcessedFragment : KotlinBaseFragment() { private lateinit var weakReferenceHandler: WeakReferenceHandler - private lateinit var orderListViewModel: OrderListViewModel + private lateinit var orderViewModel: OrderViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: NormalRecyclerAdapter private var dataBeans: MutableList = ArrayList() @@ -60,10 +60,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - orderListViewModel = ViewModelProvider(this)[OrderListViewModel::class.java] + orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - orderListViewModel.resultModel.observe(this) { + orderViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -111,7 +111,7 @@ } private fun obtainWorkOrderList() { - orderListViewModel.obtainWorkOrderListByState("0", pageIndex) + orderViewModel.obtainWorkOrderListByState("0", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt index c0d4ef3..4a85161 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AboutUsActivity.kt @@ -3,9 +3,8 @@ import com.casic.smart.town.sanxi.BuildConfig import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_about_us.* import kotlinx.android.synthetic.main.include_base_title.* @@ -14,8 +13,9 @@ override fun initLayoutView(): Int = R.layout.activity_about_us override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "关于我们" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt index e7c584e..8f417c8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/AllWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_all_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_all_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt index 30889ed..78b20e0 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/BFWellActivity.kt @@ -13,13 +13,12 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -54,8 +53,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_bf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已布防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt index dd6d452..603bcc5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/CFWellActivity.kt @@ -13,14 +13,13 @@ import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.valueToType import com.casic.smart.town.sanxi.model.WellListModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_bf_well.* import kotlinx.android.synthetic.main.include_base_title.* @@ -55,8 +54,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_cf_well) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "已撤防点位分布" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt index 57a954b..bb8b530 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/ChangePasswordActivity.kt @@ -4,16 +4,15 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.util.AuthenticationHelper import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.RSAUtils import com.casic.smart.town.sanxi.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.isLetterAndDigit import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_change_pwd.* @@ -27,8 +26,8 @@ override fun initLayoutView(): Int = R.layout.activity_change_pwd override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "修改密码" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt index 8587822..9b1899a 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/DeviceOnMapActivity.kt @@ -12,14 +12,13 @@ import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MarkerOptions import com.casic.smart.town.sanxi.R +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.WellInfoModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_device_on_map.* import kotlinx.android.synthetic.main.include_base_title.* @@ -50,8 +49,9 @@ super.onCreate(savedInstanceState) setContentView(R.layout.activity_device_on_map) - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "异常报警位置" leftBackView.setOnClickListener { finish() } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt index 36e712f..074730f 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MainActivity.kt @@ -31,7 +31,7 @@ override fun initLayoutView(): Int = R.layout.activity_main override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() } override fun initData() { diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt index 7283066..e2f9ccb 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/MonitorRecordActivity.kt @@ -3,9 +3,9 @@ import android.content.Context import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* class MonitorRecordActivity : ApplicationBaseActivity() { @@ -23,8 +23,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + leftBackView.setOnClickListener { finish() } titleView.text = "监控摄像头列表" } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt index 80dcf17..1c669cd 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/UpdateDataActivity.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.model.InfrastructureModel import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.LocaleConstant @@ -11,9 +12,7 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -45,8 +44,9 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) + titleView.text = "更新基础设施数据" leftBackView.setOnClickListener { finish() } } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt index 81de949..3bb7b04 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/CompletedDetailActivity.kt @@ -6,6 +6,7 @@ import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity import com.casic.smart.town.sanxi.extensions.combineImagePath +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.view.BigImageActivity @@ -16,7 +17,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* @@ -32,8 +32,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_completed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt index fe13615..38d63a8 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/InHandleDetailActivity.kt @@ -12,10 +12,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -34,7 +31,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -60,8 +56,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_in_handle_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt index 561f298..174e16d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotConfirmedDetailActivity.kt @@ -10,10 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity -import com.casic.smart.town.sanxi.extensions.combineImagePath -import com.casic.smart.town.sanxi.extensions.compressImage -import com.casic.smart.town.sanxi.extensions.reformat -import com.casic.smart.town.sanxi.extensions.toChinese +import com.casic.smart.town.sanxi.extensions.* import com.casic.smart.town.sanxi.util.GlideLoadEngine import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.util.OnImageCompressListener @@ -31,7 +28,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -58,8 +54,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_confirmed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 7be8bb8..2533af5 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.base.ApplicationBaseActivity +import com.casic.smart.town.sanxi.extensions.initLayoutImmersionBar import com.casic.smart.town.sanxi.extensions.toChinese import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel @@ -13,7 +14,6 @@ import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog @@ -31,8 +31,8 @@ override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) + ImmersionBar.with(this).statusBarDarkFont(true).init() + initLayoutImmersionBar(rootView) titleView.text = "工单详情" leftBackView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt deleted file mode 100644 index 12e2f95..0000000 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderListViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.smart.town.sanxi.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smart.town.sanxi.base.BaseApplication -import com.casic.smart.town.sanxi.extensions.separateResponseCode -import com.casic.smart.town.sanxi.extensions.toErrorMessage -import com.casic.smart.town.sanxi.model.OrderListModel -import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class OrderListViewModel : BaseViewModel() { - - private val gson by lazy { Gson() } - val resultModel = MutableLiveData() - - fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ - val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.get()) - } - }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt index 1cbf6d9..babbb8d 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/vm/OrderViewModel.kt @@ -5,6 +5,7 @@ import com.casic.smart.town.sanxi.extensions.separateResponseCode import com.casic.smart.town.sanxi.extensions.toErrorMessage import com.casic.smart.town.sanxi.model.OrderDetailModel +import com.casic.smart.town.sanxi.model.OrderListModel import com.casic.smart.town.sanxi.util.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -16,8 +17,24 @@ class OrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } + val resultModel = MutableLiveData() val detailModel = MutableLiveData() + fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ + val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.cause.toString().show(BaseApplication.get()) + it.printStackTrace() + }) + fun obtainWorkOrderDetail(id: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainWorkOrderDetail(id) diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml index 04ee5da..e3af6b5 100644 --- a/app/src/main/res/drawable/ic_left.xml +++ b/app/src/main/res/drawable/ic_left.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 6aa71a5..92b2dea 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -1,8 +1,10 @@ @@ -11,13 +13,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:src="@mipmap/ic_launcher" + app:qmui_border_width="0dp" + app:qmui_corner_radius="7dp" /> diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 5bc4d0f..6b56a77 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -1,5 +1,6 @@ + android:orientation="vertical"> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainThemeColor" /> + android:background="@color/mainBackColor"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8c90fcf..7408bb3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - //ArcGIS -// maven { -// url 'https://esri.jfrog.io/artifactory/arcgis' -// } } } diff --git a/hatom-video-player/.gitignore b/hatom-video-player/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/hatom-video-player/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/hatom-video-player/build.gradle b/hatom-video-player/build.gradle deleted file mode 100644 index b75c3e4..0000000 --- a/hatom-video-player/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -static def buildTime() { - return new Date().format("yyyy-MM-dd HH:mm:ss") -} - -android { - compileSdkVersion 31 - defaultConfig { - minSdkVersion android.defaultConfig.minSdkVersion - targetSdkVersion android.defaultConfig.targetSdkVersion - versionCode 1 - versionName buildTime() - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath = true - } - } - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - zipAlignEnabled true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - api fileTree(dir: "libs", include: ["*.jar"]) -} \ No newline at end of file diff --git a/hatom-video-player/consumer-rules.pro b/hatom-video-player/consumer-rules.pro deleted file mode 100644 index df52ef8..0000000 --- a/hatom-video-player/consumer-rules.pro +++ /dev/null @@ -1,6 +0,0 @@ --keep class org.MediaPlayer.PlayM4.** {*;} --keep class com.hikvision.netsdk.** {*;} --keep class com.hikvision.audio.** {*;} - --keep class com.hikvision.hatomplayer.** {*;} --keep class com.hikvision.formatconversion.** {*;} \ No newline at end of file diff --git a/hatom-video-player/libs/HatomPlayerCore.jar b/hatom-video-player/libs/HatomPlayerCore.jar deleted file mode 100644 index 6d24914..0000000 --- a/hatom-video-player/libs/HatomPlayerCore.jar +++ /dev/null Binary files differ diff --git a/hatom-video-player/proguard-rules.pro b/hatom-video-player/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/hatom-video-player/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/hatom-video-player/src/main/AndroidManifest.xml b/hatom-video-player/src/main/AndroidManifest.xml deleted file mode 100644 index a8a58b1..0000000 --- a/hatom-video-player/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so deleted file mode 100644 index e153f40..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so deleted file mode 100644 index faf3a25..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so deleted file mode 100644 index 6ca6600..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so deleted file mode 100644 index 28df4b3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so deleted file mode 100644 index 44e258b..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so deleted file mode 100644 index 64f4f61..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so deleted file mode 100644 index d5ac1d1..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so deleted file mode 100644 index 7258eb3..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so deleted file mode 100644 index bed6d5a..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so deleted file mode 100644 index 6c83fca..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so deleted file mode 100644 index 7c6657e..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so deleted file mode 100644 index 0173171..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so deleted file mode 100644 index 9c8f3bc..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so deleted file mode 100644 index a17f7f9..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so deleted file mode 100644 index a5ba652..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so deleted file mode 100644 index 0cbd456..0000000 --- a/hatom-video-player/src/main/jniLibs/arm64-v8a/libssl_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so deleted file mode 100644 index 64f9b8f..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libAudioEngine.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so deleted file mode 100644 index 14fe0af..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversion.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so deleted file mode 100644 index 3e4ff82..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libFormatConversionSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so deleted file mode 100644 index 91d7aea..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClient.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so deleted file mode 100644 index 3aaaa9c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libHPSClientSDK.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so deleted file mode 100644 index 2a234fc..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaACodec.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so deleted file mode 100644 index ebe7a01..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaAssistant.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so deleted file mode 100644 index 16e3c11..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaExtractor.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so deleted file mode 100644 index 8171459..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaMuxer.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so deleted file mode 100644 index 1dbd28b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaPostProc.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so deleted file mode 100644 index 9cff40b..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVDecode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so deleted file mode 100644 index 6898f49..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libMediaVEncode.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so deleted file mode 100644 index a4cee7c..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libPlayCtrl.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so deleted file mode 100644 index 2d00ea6..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libSystemTransform.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libcrypto_1.1.1d.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libcrypto_1.1.1d.so deleted file mode 100644 index fb51f42..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libcrypto_1.1.1d.so +++ /dev/null Binary files differ diff --git a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libssl_1.1.1d.so b/hatom-video-player/src/main/jniLibs/armeabi-v7a/libssl_1.1.1d.so deleted file mode 100644 index afc5d64..0000000 --- a/hatom-video-player/src/main/jniLibs/armeabi-v7a/libssl_1.1.1d.so +++ /dev/null Binary files differ