diff --git a/app/src/main/java/com/huolala/mockgps/manager/FloatingViewManger.kt b/app/src/main/java/com/huolala/mockgps/manager/FloatingViewManger.kt index 81dd030..5c2f3b7 100644 --- a/app/src/main/java/com/huolala/mockgps/manager/FloatingViewManger.kt +++ b/app/src/main/java/com/huolala/mockgps/manager/FloatingViewManger.kt @@ -334,17 +334,20 @@ class FloatingViewManger private constructor() { } override fun onStopTrackingTouch(seekBar: SeekBar?) { - val speed = naviAdjust?.speed_nav_view!!.getCurValue() - changeNaviInfo(seekBar!!.progress, speed) + seekBar?.let { + changeNaviInfo( + it.progress, + naviAdjust?.speed_nav_view!!.getCurValue() + ) + } } - }) + //修改参数 ClickUtils.applySingleDebouncing(naviAdjust?.btn_nav_change!!) { ToastUtils.showShort("修改成功") - val index = naviAdjust?.road_nav_seekbar!!.progress val speed = naviAdjust?.speed_nav_view!!.getCurValue() - changeNaviInfo(index, speed) + changeNaviInfo(speed = speed) } //关闭微调悬浮窗 @@ -377,9 +380,6 @@ class FloatingViewManger private constructor() { } private fun changeNaviInfo(index: Int = -1, speed: Int = 0) { - if (index == -1 || speed == 0) { - return - } listener?.changeNaviInfo(index, speed) } diff --git a/common/src/main/res/drawable-night-xxxhdpi/ic_avatar.webp b/common/src/main/res/drawable-night-xxxhdpi/ic_avatar.webp deleted file mode 100644 index 76b1f9d..0000000 Binary files a/common/src/main/res/drawable-night-xxxhdpi/ic_avatar.webp and /dev/null differ diff --git a/common/src/main/res/drawable-night-xxxhdpi/ic_back.png b/common/src/main/res/drawable-night-xxxhdpi/ic_back.png deleted file mode 100644 index 3d60d55..0000000 Binary files a/common/src/main/res/drawable-night-xxxhdpi/ic_back.png and /dev/null differ diff --git a/common/src/main/res/drawable-night-xxxhdpi/ic_share.png b/common/src/main/res/drawable-night-xxxhdpi/ic_share.png deleted file mode 100644 index 6be8c26..0000000 Binary files a/common/src/main/res/drawable-night-xxxhdpi/ic_share.png and /dev/null differ diff --git a/common/src/main/res/drawable-v24/ic_launcher_foreground.xml b/common/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index cc14f03..0000000 --- a/common/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/common/src/main/res/drawable-xxxhdpi/ic_back.png b/common/src/main/res/drawable-xxxhdpi/common_ic_appbar_back.png similarity index 100% rename from common/src/main/res/drawable-xxxhdpi/ic_back.png rename to common/src/main/res/drawable-xxxhdpi/common_ic_appbar_back.png diff --git a/common/src/main/res/drawable-xxxhdpi/ic_avatar.webp b/common/src/main/res/drawable-xxxhdpi/ic_avatar.webp deleted file mode 100644 index 76b1f9d..0000000 Binary files a/common/src/main/res/drawable-xxxhdpi/ic_avatar.webp and /dev/null differ diff --git a/common/src/main/res/drawable-xxxhdpi/ic_share.png b/common/src/main/res/drawable-xxxhdpi/ic_share.png deleted file mode 100644 index 24fc54f..0000000 Binary files a/common/src/main/res/drawable-xxxhdpi/ic_share.png and /dev/null differ diff --git a/common/src/main/res/layout/layout_appbar.xml b/common/src/main/res/layout/layout_appbar.xml index 6d9710f..fa9c613 100644 --- a/common/src/main/res/layout/layout_appbar.xml +++ b/common/src/main/res/layout/layout_appbar.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:onClick="@{OnClickListener}" android:paddingHorizontal="5dp" - android:src="@drawable/ic_back" + android:src="@drawable/common_ic_appbar_back" android:visibility="@{isGoneBack?View.GONE:View.VISIBLE}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent"