diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3561334..9b4acfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,21 +71,21 @@ dependencies { //基础依赖库 implementation("com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.6.1") + implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.10.0") //Google官方授权框架 implementation("pub.devrel:easypermissions:3.0.0") //沉浸式状态栏。基础依赖包，必须要依赖 implementation("com.geyifeng.immersionbar:immersionbar:3.2.2") //Kotlin协程 - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") //MVVM+LiveData - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") //图片加载框架 - implementation("com.github.bumptech.glide:glide:4.9.0") + implementation("com.github.bumptech.glide:glide:4.12.0") //图片选择框架 implementation("io.github.lucksiege:pictureselector:v3.11.1") //图片压缩 @@ -98,7 +98,7 @@ implementation("com.squareup.okhttp3:logging-interceptor:4.6.0") //网络请求和接口封装 implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") //官方Json解析库 implementation("com.google.code.gson:gson:2.10.1") //上拉加载下拉刷新 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3561334..9b4acfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,21 +71,21 @@ dependencies { //基础依赖库 implementation("com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.6.1") + implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.10.0") //Google官方授权框架 implementation("pub.devrel:easypermissions:3.0.0") //沉浸式状态栏。基础依赖包，必须要依赖 implementation("com.geyifeng.immersionbar:immersionbar:3.2.2") //Kotlin协程 - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") //MVVM+LiveData - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") //图片加载框架 - implementation("com.github.bumptech.glide:glide:4.9.0") + implementation("com.github.bumptech.glide:glide:4.12.0") //图片选择框架 implementation("io.github.lucksiege:pictureselector:v3.11.1") //图片压缩 @@ -98,7 +98,7 @@ implementation("com.squareup.okhttp3:logging-interceptor:4.6.0") //网络请求和接口封装 implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") //官方Json解析库 implementation("com.google.code.gson:gson:2.10.1") //上拉加载下拉刷新 diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt index 1f411c0..30a6bad 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt @@ -128,8 +128,8 @@ private val selectLocationLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult(), object : ActivityResultCallback { - override fun onActivityResult(result: ActivityResult?) { - if (result?.resultCode == Activity.RESULT_OK) { + override fun onActivityResult(result: ActivityResult) { + if (result.resultCode == Activity.RESULT_OK) { val data = result.data ?: return binding.longitudeView.setText(data.getStringExtra("longitude")) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3561334..9b4acfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,21 +71,21 @@ dependencies { //基础依赖库 implementation("com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.6.1") + implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.10.0") //Google官方授权框架 implementation("pub.devrel:easypermissions:3.0.0") //沉浸式状态栏。基础依赖包，必须要依赖 implementation("com.geyifeng.immersionbar:immersionbar:3.2.2") //Kotlin协程 - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") //MVVM+LiveData - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") //图片加载框架 - implementation("com.github.bumptech.glide:glide:4.9.0") + implementation("com.github.bumptech.glide:glide:4.12.0") //图片选择框架 implementation("io.github.lucksiege:pictureselector:v3.11.1") //图片压缩 @@ -98,7 +98,7 @@ implementation("com.squareup.okhttp3:logging-interceptor:4.6.0") //网络请求和接口封装 implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") //官方Json解析库 implementation("com.google.code.gson:gson:2.10.1") //上拉加载下拉刷新 diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt index 1f411c0..30a6bad 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt @@ -128,8 +128,8 @@ private val selectLocationLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult(), object : ActivityResultCallback { - override fun onActivityResult(result: ActivityResult?) { - if (result?.resultCode == Activity.RESULT_OK) { + override fun onActivityResult(result: ActivityResult) { + if (result.resultCode == Activity.RESULT_OK) { val data = result.data ?: return binding.longitudeView.setText(data.getStringExtra("longitude")) diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml deleted file mode 100644 index ab9f879..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3561334..9b4acfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,21 +71,21 @@ dependencies { //基础依赖库 implementation("com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.6.1") + implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.10.0") //Google官方授权框架 implementation("pub.devrel:easypermissions:3.0.0") //沉浸式状态栏。基础依赖包，必须要依赖 implementation("com.geyifeng.immersionbar:immersionbar:3.2.2") //Kotlin协程 - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") //MVVM+LiveData - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") //图片加载框架 - implementation("com.github.bumptech.glide:glide:4.9.0") + implementation("com.github.bumptech.glide:glide:4.12.0") //图片选择框架 implementation("io.github.lucksiege:pictureselector:v3.11.1") //图片压缩 @@ -98,7 +98,7 @@ implementation("com.squareup.okhttp3:logging-interceptor:4.6.0") //网络请求和接口封装 implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") //官方Json解析库 implementation("com.google.code.gson:gson:2.10.1") //上拉加载下拉刷新 diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt index 1f411c0..30a6bad 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt @@ -128,8 +128,8 @@ private val selectLocationLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult(), object : ActivityResultCallback { - override fun onActivityResult(result: ActivityResult?) { - if (result?.resultCode == Activity.RESULT_OK) { + override fun onActivityResult(result: ActivityResult) { + if (result.resultCode == Activity.RESULT_OK) { val data = result.data ?: return binding.longitudeView.setText(data.getStringExtra("longitude")) diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml deleted file mode 100644 index ab9f879..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index 9f33fc4..dbcb6e9 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -49,11 +49,12 @@ + app:tint="@color/white" /> \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3561334..9b4acfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,21 +71,21 @@ dependencies { //基础依赖库 implementation("com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.6.1") + implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.10.0") //Google官方授权框架 implementation("pub.devrel:easypermissions:3.0.0") //沉浸式状态栏。基础依赖包，必须要依赖 implementation("com.geyifeng.immersionbar:immersionbar:3.2.2") //Kotlin协程 - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") //MVVM+LiveData - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") //图片加载框架 - implementation("com.github.bumptech.glide:glide:4.9.0") + implementation("com.github.bumptech.glide:glide:4.12.0") //图片选择框架 implementation("io.github.lucksiege:pictureselector:v3.11.1") //图片压缩 @@ -98,7 +98,7 @@ implementation("com.squareup.okhttp3:logging-interceptor:4.6.0") //网络请求和接口封装 implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") //官方Json解析库 implementation("com.google.code.gson:gson:2.10.1") //上拉加载下拉刷新 diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt index 1f411c0..30a6bad 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt @@ -128,8 +128,8 @@ private val selectLocationLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult(), object : ActivityResultCallback { - override fun onActivityResult(result: ActivityResult?) { - if (result?.resultCode == Activity.RESULT_OK) { + override fun onActivityResult(result: ActivityResult) { + if (result.resultCode == Activity.RESULT_OK) { val data = result.data ?: return binding.longitudeView.setText(data.getStringExtra("longitude")) diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml deleted file mode 100644 index ab9f879..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index 9f33fc4..dbcb6e9 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -49,11 +49,12 @@ + app:tint="@color/white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index be08855..82ddaa4 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -92,174 +92,181 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="@dimen/dp_50" + android:padding="@dimen/dp_7"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="2" + android:orientation="vertical"> + + + + + + + + + + + + + + + - - - - - - - - - - + android:text="产品编号：3XXXXXXXXX" + android:textSize="@dimen/sp_12" /> + android:id="@+id/densityView" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:text="浓度：0%LEL" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" /> - - - - - - + + android:layout_width="match_parent" + android:layout_height="90dp" + android:orientation="horizontal" + android:padding="@dimen/dp_7"> - + - + - + + + + + + - - + - - - - - + android:orientation="vertical" + android:padding="@dimen/dp_7"> - + + + + - + { - override fun onActivityResult(result: ActivityResult?) { - if (result?.resultCode == Activity.RESULT_OK) { + override fun onActivityResult(result: ActivityResult) { + if (result.resultCode == Activity.RESULT_OK) { val data = result.data ?: return binding.longitudeView.setText(data.getStringExtra("longitude")) diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml deleted file mode 100644 index ab9f879..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index 9f33fc4..dbcb6e9 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -49,11 +49,12 @@ + app:tint="@color/white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index be08855..82ddaa4 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -92,174 +92,181 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="@dimen/dp_50" + android:padding="@dimen/dp_7"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="2" + android:orientation="vertical"> + + + + + + + + + + + + + + + - - - - - - - - - - + android:text="产品编号：3XXXXXXXXX" + android:textSize="@dimen/sp_12" /> + android:id="@+id/densityView" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:text="浓度：0%LEL" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" /> - - - - - - + + android:layout_width="match_parent" + android:layout_height="90dp" + android:orientation="horizontal" + android:padding="@dimen/dp_7"> - + - + - + + + + + + - - + - - - - - + android:orientation="vertical" + android:padding="@dimen/dp_7"> - + + + + - + @@ -67,7 +67,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="一分公司" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -99,7 +99,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="2024-07-12" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -131,7 +131,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:gravity="center" - android:text="孙毅" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -189,7 +189,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="南苑路燃气管线泄漏，现场开挖进行管道维修，现场开挖进行管道维修" + android:text="@string/unknown" android:textColor="@color/black" /> diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3561334..9b4acfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,21 +71,21 @@ dependencies { //基础依赖库 implementation("com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.6.1") + implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.10.0") //Google官方授权框架 implementation("pub.devrel:easypermissions:3.0.0") //沉浸式状态栏。基础依赖包，必须要依赖 implementation("com.geyifeng.immersionbar:immersionbar:3.2.2") //Kotlin协程 - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") //MVVM+LiveData - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") //图片加载框架 - implementation("com.github.bumptech.glide:glide:4.9.0") + implementation("com.github.bumptech.glide:glide:4.12.0") //图片选择框架 implementation("io.github.lucksiege:pictureselector:v3.11.1") //图片压缩 @@ -98,7 +98,7 @@ implementation("com.squareup.okhttp3:logging-interceptor:4.6.0") //网络请求和接口封装 implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") //官方Json解析库 implementation("com.google.code.gson:gson:2.10.1") //上拉加载下拉刷新 diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt index 1f411c0..30a6bad 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt @@ -128,8 +128,8 @@ private val selectLocationLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult(), object : ActivityResultCallback { - override fun onActivityResult(result: ActivityResult?) { - if (result?.resultCode == Activity.RESULT_OK) { + override fun onActivityResult(result: ActivityResult) { + if (result.resultCode == Activity.RESULT_OK) { val data = result.data ?: return binding.longitudeView.setText(data.getStringExtra("longitude")) diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml deleted file mode 100644 index ab9f879..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index 9f33fc4..dbcb6e9 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -49,11 +49,12 @@ + app:tint="@color/white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index be08855..82ddaa4 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -92,174 +92,181 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="@dimen/dp_50" + android:padding="@dimen/dp_7"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="2" + android:orientation="vertical"> + + + + + + + + + + + + + + + - - - - - - - - - - + android:text="产品编号：3XXXXXXXXX" + android:textSize="@dimen/sp_12" /> + android:id="@+id/densityView" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:text="浓度：0%LEL" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" /> - - - - - - + + android:layout_width="match_parent" + android:layout_height="90dp" + android:orientation="horizontal" + android:padding="@dimen/dp_7"> - + - + - + + + + + + - - + - - - - - + android:orientation="vertical" + android:padding="@dimen/dp_7"> - + + + + - + @@ -67,7 +67,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="一分公司" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -99,7 +99,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="2024-07-12" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -131,7 +131,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:gravity="center" - android:text="孙毅" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -189,7 +189,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="南苑路燃气管线泄漏，现场开挖进行管道维修，现场开挖进行管道维修" + android:text="@string/unknown" android:textColor="@color/black" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index db19ba5..58dda70 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,10 @@ #1D55C6 - #333333 + #424242 #626262 - #F7F7FA - #C0C0C0 + #F2F2F2 + #CCCCCC #FF0000 #37D4AE #99000000 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3561334..9b4acfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,21 +71,21 @@ dependencies { //基础依赖库 implementation("com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.6.1") + implementation("androidx.core:core-ktx:1.13.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.10.0") //Google官方授权框架 implementation("pub.devrel:easypermissions:3.0.0") //沉浸式状态栏。基础依赖包，必须要依赖 implementation("com.geyifeng.immersionbar:immersionbar:3.2.2") //Kotlin协程 - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") //MVVM+LiveData - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") //图片加载框架 - implementation("com.github.bumptech.glide:glide:4.9.0") + implementation("com.github.bumptech.glide:glide:4.12.0") //图片选择框架 implementation("io.github.lucksiege:pictureselector:v3.11.1") //图片压缩 @@ -98,7 +98,7 @@ implementation("com.squareup.okhttp3:logging-interceptor:4.6.0") //网络请求和接口封装 implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") //官方Json解析库 implementation("com.google.code.gson:gson:2.10.1") //上拉加载下拉刷新 diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt index 1f411c0..30a6bad 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt @@ -128,8 +128,8 @@ private val selectLocationLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult(), object : ActivityResultCallback { - override fun onActivityResult(result: ActivityResult?) { - if (result?.resultCode == Activity.RESULT_OK) { + override fun onActivityResult(result: ActivityResult) { + if (result.resultCode == Activity.RESULT_OK) { val data = result.data ?: return binding.longitudeView.setText(data.getStringExtra("longitude")) diff --git a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml b/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml deleted file mode 100644 index ab9f879..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_white_radius_top_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index 9f33fc4..dbcb6e9 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -49,11 +49,12 @@ + app:tint="@color/white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index be08855..82ddaa4 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -92,174 +92,181 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="@dimen/dp_50" + android:padding="@dimen/dp_7"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="2" + android:orientation="vertical"> + + + + + + + + + + + + + + + - - - - - - - - - - + android:text="产品编号：3XXXXXXXXX" + android:textSize="@dimen/sp_12" /> + android:id="@+id/densityView" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:text="浓度：0%LEL" + android:textColor="@color/black" + android:textSize="@dimen/sp_16" /> - - - - - - + + android:layout_width="match_parent" + android:layout_height="90dp" + android:orientation="horizontal" + android:padding="@dimen/dp_7"> - + - + - + + + + + + - - + - - - - - + android:orientation="vertical" + android:padding="@dimen/dp_7"> - + + + + - + @@ -67,7 +67,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="一分公司" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -99,7 +99,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="2024-07-12" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -131,7 +131,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:gravity="center" - android:text="孙毅" + android:text="@string/unknown" android:textColor="@color/black" /> @@ -189,7 +189,7 @@ android:layout_height="match_parent" android:layout_weight="3" android:gravity="center" - android:text="南苑路燃气管线泄漏，现场开挖进行管道维修，现场开挖进行管道维修" + android:text="@string/unknown" android:textColor="@color/black" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index db19ba5..58dda70 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,10 @@ #1D55C6 - #333333 + #424242 #626262 - #F7F7FA - #C0C0C0 + #F2F2F2 + #CCCCCC #FF0000 #37D4AE #99000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a13fe28..5b9a3ad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ 动态感知 中国航天科工集团二院二〇三所 - 数据获取中… + 未知 \ No newline at end of file