diff --git a/app/build.gradle b/app/build.gradle
index 5cd4bd7..936f482 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@
applicationId "com.casic.detector.common"
minSdkVersion 23
targetSdkVersion 33
- versionCode 5091
- versionName "5.0.9.1"
+ versionCode 5092
+ versionName "5.0.9.2"
}
buildTypes {
@@ -68,7 +68,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/build.gradle b/app/build.gradle
index 5cd4bd7..936f482 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@
applicationId "com.casic.detector.common"
minSdkVersion 23
targetSdkVersion 33
- versionCode 5091
- versionName "5.0.9.1"
+ versionCode 5092
+ versionName "5.0.9.2"
}
buildTypes {
@@ -68,7 +68,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
index 03195fc..f9187a6 100644
--- a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
@@ -45,7 +45,6 @@
import com.luck.picture.lib.interfaces.OnResultCallbackListener
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.appendZero
-import com.pengxh.kt.lite.extensions.convertColor
import com.pengxh.kt.lite.extensions.dateToTimestamp
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
@@ -55,6 +54,7 @@
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
+import com.pengxh.kt.lite.widget.TitleBarView
import java.io.File
import java.io.OutputStream
import java.util.Calendar
@@ -78,9 +78,15 @@
override fun initEvent() {
//返回
- binding.titleInclude.leftBackView.setOnClickListener {
- finish()
- }
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
object : AdapterView.OnItemSelectedListener {
@@ -421,9 +427,6 @@
}
private fun initDefaultData() {
- binding.titleInclude.titleView.text = "安装新标识器"
- binding.titleInclude.titleView.setTextColor(R.color.themeColor.convertColor(context))
-
imageAdapter = EditableImageAdapter(this, 3, 3)
binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
diff --git a/app/build.gradle b/app/build.gradle
index 5cd4bd7..936f482 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@
applicationId "com.casic.detector.common"
minSdkVersion 23
targetSdkVersion 33
- versionCode 5091
- versionName "5.0.9.1"
+ versionCode 5092
+ versionName "5.0.9.2"
}
buildTypes {
@@ -68,7 +68,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
index 03195fc..f9187a6 100644
--- a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
@@ -45,7 +45,6 @@
import com.luck.picture.lib.interfaces.OnResultCallbackListener
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.appendZero
-import com.pengxh.kt.lite.extensions.convertColor
import com.pengxh.kt.lite.extensions.dateToTimestamp
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
@@ -55,6 +54,7 @@
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
+import com.pengxh.kt.lite.widget.TitleBarView
import java.io.File
import java.io.OutputStream
import java.util.Calendar
@@ -78,9 +78,15 @@
override fun initEvent() {
//返回
- binding.titleInclude.leftBackView.setOnClickListener {
- finish()
- }
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
object : AdapterView.OnItemSelectedListener {
@@ -421,9 +427,6 @@
}
private fun initDefaultData() {
- binding.titleInclude.titleView.text = "安装新标识器"
- binding.titleInclude.titleView.setTextColor(R.color.themeColor.convertColor(context))
-
imageAdapter = EditableImageAdapter(this, 3, 3)
binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
diff --git a/app/src/main/res/drawable/border_triangle.xml b/app/src/main/res/drawable/border_triangle.xml
new file mode 100644
index 0000000..8b4f3a8
--- /dev/null
+++ b/app/src/main/res/drawable/border_triangle.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 5cd4bd7..936f482 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@
applicationId "com.casic.detector.common"
minSdkVersion 23
targetSdkVersion 33
- versionCode 5091
- versionName "5.0.9.1"
+ versionCode 5092
+ versionName "5.0.9.2"
}
buildTypes {
@@ -68,7 +68,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
index 03195fc..f9187a6 100644
--- a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
@@ -45,7 +45,6 @@
import com.luck.picture.lib.interfaces.OnResultCallbackListener
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.appendZero
-import com.pengxh.kt.lite.extensions.convertColor
import com.pengxh.kt.lite.extensions.dateToTimestamp
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
@@ -55,6 +54,7 @@
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
+import com.pengxh.kt.lite.widget.TitleBarView
import java.io.File
import java.io.OutputStream
import java.util.Calendar
@@ -78,9 +78,15 @@
override fun initEvent() {
//返回
- binding.titleInclude.leftBackView.setOnClickListener {
- finish()
- }
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
object : AdapterView.OnItemSelectedListener {
@@ -421,9 +427,6 @@
}
private fun initDefaultData() {
- binding.titleInclude.titleView.text = "安装新标识器"
- binding.titleInclude.titleView.setTextColor(R.color.themeColor.convertColor(context))
-
imageAdapter = EditableImageAdapter(this, 3, 3)
binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
diff --git a/app/src/main/res/drawable/border_triangle.xml b/app/src/main/res/drawable/border_triangle.xml
new file mode 100644
index 0000000..8b4f3a8
--- /dev/null
+++ b/app/src/main/res/drawable/border_triangle.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_left_black.xml b/app/src/main/res/drawable/ic_left_black.xml
new file mode 100644
index 0000000..ef487a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_left_black.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 5cd4bd7..936f482 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@
applicationId "com.casic.detector.common"
minSdkVersion 23
targetSdkVersion 33
- versionCode 5091
- versionName "5.0.9.1"
+ versionCode 5092
+ versionName "5.0.9.2"
}
buildTypes {
@@ -68,7 +68,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
index 03195fc..f9187a6 100644
--- a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
@@ -45,7 +45,6 @@
import com.luck.picture.lib.interfaces.OnResultCallbackListener
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.appendZero
-import com.pengxh.kt.lite.extensions.convertColor
import com.pengxh.kt.lite.extensions.dateToTimestamp
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
@@ -55,6 +54,7 @@
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
+import com.pengxh.kt.lite.widget.TitleBarView
import java.io.File
import java.io.OutputStream
import java.util.Calendar
@@ -78,9 +78,15 @@
override fun initEvent() {
//返回
- binding.titleInclude.leftBackView.setOnClickListener {
- finish()
- }
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
object : AdapterView.OnItemSelectedListener {
@@ -421,9 +427,6 @@
}
private fun initDefaultData() {
- binding.titleInclude.titleView.text = "安装新标识器"
- binding.titleInclude.titleView.setTextColor(R.color.themeColor.convertColor(context))
-
imageAdapter = EditableImageAdapter(this, 3, 3)
binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
diff --git a/app/src/main/res/drawable/border_triangle.xml b/app/src/main/res/drawable/border_triangle.xml
new file mode 100644
index 0000000..8b4f3a8
--- /dev/null
+++ b/app/src/main/res/drawable/border_triangle.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_left_black.xml b/app/src/main/res/drawable/ic_left_black.xml
new file mode 100644
index 0000000..ef487a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_left_black.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 65c2262..925d972 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -1,14 +1,22 @@
-
+
+
+
diff --git a/app/src/main/res/drawable/ic_left_black.xml b/app/src/main/res/drawable/ic_left_black.xml
new file mode 100644
index 0000000..ef487a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_left_black.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 65c2262..925d972 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -1,14 +1,22 @@
-
+
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_show_left_image="false"
+ app:tbv_show_right_image="true"
+ app:tbv_smaller_title="true"
+ app:tbv_text="地下管线电子标识探测仪"
+ app:tbv_text_color="@color/white" />
+
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:background="@color/themeColor"
+ android:orientation="vertical">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5cd4bd7..936f482 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@
applicationId "com.casic.detector.common"
minSdkVersion 23
targetSdkVersion 33
- versionCode 5091
- versionName "5.0.9.1"
+ versionCode 5092
+ versionName "5.0.9.2"
}
buildTypes {
@@ -68,7 +68,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.10'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.11'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
index 03195fc..f9187a6 100644
--- a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt
@@ -45,7 +45,6 @@
import com.luck.picture.lib.interfaces.OnResultCallbackListener
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.appendZero
-import com.pengxh.kt.lite.extensions.convertColor
import com.pengxh.kt.lite.extensions.dateToTimestamp
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
@@ -55,6 +54,7 @@
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
+import com.pengxh.kt.lite.widget.TitleBarView
import java.io.File
import java.io.OutputStream
import java.util.Calendar
@@ -78,9 +78,15 @@
override fun initEvent() {
//返回
- binding.titleInclude.leftBackView.setOnClickListener {
- finish()
- }
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
object : AdapterView.OnItemSelectedListener {
@@ -421,9 +427,6 @@
}
private fun initDefaultData() {
- binding.titleInclude.titleView.text = "安装新标识器"
- binding.titleInclude.titleView.setTextColor(R.color.themeColor.convertColor(context))
-
imageAdapter = EditableImageAdapter(this, 3, 3)
binding.cameraInclude.addImageRecyclerView.adapter = imageAdapter
diff --git a/app/src/main/res/drawable/border_triangle.xml b/app/src/main/res/drawable/border_triangle.xml
new file mode 100644
index 0000000..8b4f3a8
--- /dev/null
+++ b/app/src/main/res/drawable/border_triangle.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_left_black.xml b/app/src/main/res/drawable/ic_left_black.xml
new file mode 100644
index 0000000..ef487a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_left_black.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 65c2262..925d972 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -1,14 +1,22 @@
-
+
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_show_left_image="false"
+ app:tbv_show_right_image="true"
+ app:tbv_smaller_title="true"
+ app:tbv_text="地下管线电子标识探测仪"
+ app:tbv_text_color="@color/white" />
+
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:background="@color/themeColor"
+ android:orientation="vertical">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 7d6bcd1..20fd0fe 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -12,12 +12,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
- app:tbv_only_show_title="false"
app:tbv_right_image="@drawable/ic_close"
app:tbv_show_right_image="true"
+ app:tbv_smaller_title="true"
app:tbv_text="差分定位服务"
- app:tbv_text_color="@color/black"
- app:tbv_text_size="@dimen/sp_16" />
+ app:tbv_text_color="@color/black" />
+
+
diff --git a/app/src/main/res/drawable/ic_left_black.xml b/app/src/main/res/drawable/ic_left_black.xml
new file mode 100644
index 0000000..ef487a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_left_black.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 65c2262..925d972 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -1,14 +1,22 @@
-
+
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_show_left_image="false"
+ app:tbv_show_right_image="true"
+ app:tbv_smaller_title="true"
+ app:tbv_text="地下管线电子标识探测仪"
+ app:tbv_text_color="@color/white" />
+
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:background="@color/themeColor"
+ android:orientation="vertical">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 7d6bcd1..20fd0fe 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -12,12 +12,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
- app:tbv_only_show_title="false"
app:tbv_right_image="@drawable/ic_close"
app:tbv_show_right_image="true"
+ app:tbv_smaller_title="true"
app:tbv_text="差分定位服务"
- app:tbv_text_color="@color/black"
- app:tbv_text_size="@dimen/sp_16" />
+ app:tbv_text_color="@color/black" />
-
+ android:layout_height="wrap_content">
-
+
+
-
\ No newline at end of file
+ android:layout_marginTop="17dp"
+ android:backgroundTint="#CC000000"
+ app:cardCornerRadius="@dimen/lib_dp_5">
+
+
+
+
\ No newline at end of file