From d4f5a1e0a30a5a85ea7238c589356cb333233f5f Mon Sep 17 00:00:00 2001 From: yezhiqiu <123456@qq.com> Date: Thu, 11 Jun 2026 17:17:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=AE=A0=E7=89=A9=E5=BC=80=E5=90=AF=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=AE=A0=E7=89=A9=E6=97=B6=EF=BC=8C=E5=AE=A0=E7=89=A9?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=E4=BC=9A=E5=8F=98=E5=8C=96bug=202.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E5=AE=A0?= =?UTF-8?q?=E7=89=A9=E7=9A=84=E5=BC=80=E5=85=B3=EF=BC=8C=E5=9C=A8Map=20?= =?UTF-8?q?=E5=92=8C=E7=9B=B4=E6=92=AD=E4=B8=AD=E6=9C=AA=E5=85=B3=E8=81=94?= =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=92=AD=E9=A1=B5=E4=B8=AD=E5=BC=80=E5=90=AF?= =?UTF-8?q?/=E5=85=B3=E9=97=AD=EF=BC=8C=E4=BD=86=E5=9C=A8Map=E4=B8=AD?= =?UTF-8?q?=E6=9C=AA=E5=90=8C=E6=AD=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compile-file-map.properties | 2 +- app/build.gradle | 2 +- .../tracker/dialog/SelectMapTypeDialog.kt | 3 + .../tracker/ui/activity/SayHelloActivity.kt | 1 - .../tracker/ui/activity/SplashActivity.kt | 2 +- .../tracker/ui/activity/map/LiveActivityV3.kt | 2 +- .../account/cn/AccountCnPhoneFragment.kt | 27 ++++++++ .../tracker/ui/fragment/map/MapV3Fragment.kt | 16 ++++- .../main/res/layout/dialog_common_layout.xml | 9 ++- .../res/layout/dialog_package_upgrade.xml | 8 ++- .../res/layout/fragment_account_cn_phone.xml | 69 +++++++++++++++++++ app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values/strings.xml | 3 +- .../com/abbidot/baselibrary/util/AppUtils.kt | 2 +- gradle.properties | 4 +- 15 files changed, 134 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/com/abbidot/tracker/ui/fragment/account/cn/AccountCnPhoneFragment.kt create mode 100644 app/src/main/res/layout/fragment_account_cn_phone.xml diff --git a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 90ae22b..3c868e9 100644 --- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Thu Jun 04 09:43:21 CST 2026 +#Tue Jun 09 18:35:33 CST 2026 diff --git a/app/build.gradle b/app/build.gradle index b36a3ba..7f18c34 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { targetSdkVersion 35 versionCode 2210 // versionName "2.2.10" - versionName "2.2.10-Beta2" + versionName "2.2.10-Beta3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/abbidot/tracker/dialog/SelectMapTypeDialog.kt b/app/src/main/java/com/abbidot/tracker/dialog/SelectMapTypeDialog.kt index 6333599..0512e04 100644 --- a/app/src/main/java/com/abbidot/tracker/dialog/SelectMapTypeDialog.kt +++ b/app/src/main/java/com/abbidot/tracker/dialog/SelectMapTypeDialog.kt @@ -79,6 +79,9 @@ class SelectMapTypeDialog( mViewBinding.cbDialogMapAllPetSwitch.isChecked = checked } + /** + * 是否显示按钮 + */ fun showAllPetSwitch(isShow: Boolean) { mViewBinding.llMapTypeShowAllPetSwitch.visibility = if (isShow) View.VISIBLE else View.GONE } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt index fa2537c..53d0f07 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/SayHelloActivity.kt @@ -24,7 +24,6 @@ class SayHelloActivity : BaseActivity(ActivitySayHelloB mViewBinding.apply { root.setBackgroundResource(R.drawable.icon_say_hi_bg) if (AppUtils.isChina()) { - btnSayHelloLoginWechat.visibility = View.VISIBLE } setOnClickListenerViews(btnSayHelloLogin, btnSayHelloSignup, btnSayHelloLoginWechat) diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt index 3f5c00e..f18e11b 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt @@ -198,7 +198,7 @@ class SplashActivity : QMUIActivity() { SDKInitializer.setCoordType(CoordType.GCJ02) if (AppUtils.isChina()) { - regToWx() +// regToWx() } else { initMapbox() try { diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/map/LiveActivityV3.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/map/LiveActivityV3.kt index 64f4f9c..1deb363 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/map/LiveActivityV3.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/map/LiveActivityV3.kt @@ -847,7 +847,7 @@ class LiveActivityV3 : BaseActivity(ActivityLiveV3Binding lifecycleScope.launch { mPetList?.apply { mPetBean?.let { p -> - //删除当前选中宠物 + //List删除当前选中宠物 mHomeMapCommon.showOtherPetHeadMarker(filter { it != p }.toMutableList()) } } diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/account/cn/AccountCnPhoneFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/account/cn/AccountCnPhoneFragment.kt new file mode 100644 index 0000000..486406d --- /dev/null +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/account/cn/AccountCnPhoneFragment.kt @@ -0,0 +1,27 @@ +package com.abbidot.tracker.ui.fragment.account.cn + +import androidx.fragment.app.Fragment +import com.abbidot.tracker.base.BaseFragment +import com.abbidot.tracker.databinding.FragmentAccountCnPhoneBinding + +/** + * A simple [Fragment] subclass. + * Use the [AccountCnPhoneFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class AccountCnPhoneFragment : + BaseFragment(FragmentAccountCnPhoneBinding::inflate) { + + companion object { + @JvmStatic + fun newInstance() = + AccountCnPhoneFragment().apply { + + } + } + + override fun initData() { + super.initData() + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt index 6d6547e..0db8e36 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt @@ -247,7 +247,7 @@ class MapV3Fragment : BaseFragment(FragmentMapV3Binding::i if (null == mSelectMapTypeDialog) { setAllPetShow(showAllPet) } else { - mSelectMapTypeDialog?.setShowAllPetSwitch(showDashed) + mSelectMapTypeDialog?.setShowAllPetSwitch(showAllPet) } } } @@ -672,6 +672,7 @@ class MapV3Fragment : BaseFragment(FragmentMapV3Binding::i * 设置多宠物显示 */ private fun setAllPetShow(isShow: Boolean) { + if (isShowAllPet == isShow) return isShowAllPet = isShow MMKVUtil.putBoolean(MMKVKey.ShowAllPet, isShow) if (isShow) { @@ -719,6 +720,7 @@ class MapV3Fragment : BaseFragment(FragmentMapV3Binding::i mViewBinding.ilHomeMapPetLocation.root.visibility = View.INVISIBLE mViewBinding.ivHomeMapBleConState.setImageResource(R.drawable.icon_map_offline) isCanLive = false + isShowAllPet=false setRefreshLocationBtnState() ViewUtil.instance.selectPetDialogShow( @@ -799,7 +801,8 @@ class MapV3Fragment : BaseFragment(FragmentMapV3Binding::i if (isShowDashed) { mHomeMapCommon.addUserAndPetLine() } - if (isShowAllPet) { + if (MMKVUtil.getBoolean(MMKVKey.ShowAllPet)) { + mSelectMapTypeDialog?.setShowAllPetSwitch(true) setAllPetShow(true) } } @@ -919,6 +922,15 @@ class MapV3Fragment : BaseFragment(FragmentMapV3Binding::i View.VISIBLE } } + //把最新经纬度更新到获取绑定宠物接口上，切换宠物数据不会有老的数据 + getHomeV2Activity()?.let { m -> + m.getPet(false)?.let { p -> + if (p.macID == deviceMacId) { + p.latitude = latitude + p.longitude = longitude + } + } + } setRefreshLocationBtnState() diff --git a/app/src/main/res/layout/dialog_common_layout.xml b/app/src/main/res/layout/dialog_common_layout.xml index e27a1d0..eafbb2b 100644 --- a/app/src/main/res/layout/dialog_common_layout.xml +++ b/app/src/main/res/layout/dialog_common_layout.xml @@ -6,12 +6,13 @@ android:background="@drawable/shape16_white_color_bg" android:orientation="vertical" android:paddingTop="@dimen/dp_18" - android:paddingBottom="@dimen/dp_6"> + android:paddingBottom="@dimen/dp_14"> + android:paddingBottom="@dimen/dp_14"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3847426..0dc29b7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1060,5 +1060,6 @@ 已是最小尺寸 请使用有效的手机号码 + 账户 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a671407..cb3fa01 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -672,7 +672,7 @@ Device already bound, please verify \nand try again Add Tracker Successfully\nPaired - Choose your plan + Choose Your Plan Benefits Monthly Subscription $%s @@ -1118,5 +1118,6 @@ Already at minimum size 请使用有效的手机号码 + 账户 \ No newline at end of file diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt index 6ddf15c..851be49 100644 --- a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt +++ b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt @@ -93,7 +93,7 @@ class AppUtils { * 是否是国内 */ fun isChina(type: String = SWITCH_PAGE_TYPE): Boolean { -// return false + return false if (isDebug()) { if (type == SWITCH_MAP_TYPE && MMKVUtil.getBoolean(MMKVKey.OnlyGoogleMap, false)) { //只启用谷歌地图 diff --git a/gradle.properties b/gradle.properties index 8b4b14f..8f7bb63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ # This option should only be used with decoupled projects. For more details, visit # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects # org.gradle.parallel=true -#Tue Jun 09 14:21:45 CST 2026 +#Wed Jun 10 09:53:29 CST 2026 BAIDU_MAP_KEY=YT2CmlqAkpMyzmw1AKNIBlYlBtHESEaW BUGLY_KEY=06fc0a9cd1 GOOGLE_MAP_KEY=AIzaSyCFEqlOoo2274NsX7tzoQjs_DA7B9N7-gY @@ -25,4 +25,4 @@ android.nonTransitiveRClass=false android.suppressUnsupportedCompileSdk=34 android.useAndroidX=true kotlin.code.style=official -org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1536M" -Dfile.encoding\=UTF-8 +org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M" -Dfile.encoding\=UTF-8