From 7473653c8c6ccd07c315f9cb2c12ecaa1da73956 Mon Sep 17 00:00:00 2001 From: yezhiqiu <123456@qq.com> Date: Fri, 28 Aug 2026 16:06:33 +0800 Subject: [PATCH] =?UTF-8?q?g40=E6=B7=BB=E5=8A=A0wifi=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=90=8D=E5=AD=97=E4=B8=BA=E7=A9=BA=E7=9A=84wifi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../tracker/retrofit2/INetworkService.kt | 2 +- .../device/wifi/AddWifiPowerZone3Activity.kt | 6 ++- .../subscribe/SureSubscriptionPlanActivity.kt | 46 ++++++++++--------- .../account/CreateAccountV2ThreeFragment.kt | 4 +- .../map/baidumap/BaseBaiduMapFragment.kt | 5 +- .../map/googlemap/BaseGoogleMapFragment.kt | 6 ++- 7 files changed, 41 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cc41de8..c0d7984 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { targetSdkVersion 35 versionCode 2500 // versionName "2.5.0" - versionName "2.5.0-Beta1" + versionName "2.5.0-Beta4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt index e234b66..c8b7e44 100644 --- a/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt +++ b/app/src/main/java/com/abbidot/tracker/retrofit2/INetworkService.kt @@ -128,7 +128,7 @@ interface INetworkService { @FormUrlEncoded @POST("user/login") suspend fun login( - @Field("phone") phone: String, @Field("password") password: String, + @Field("email") email: String, @Field("password") password: String, @Field("languageCode") languageCode: String ): BaseResponse diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPowerZone3Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPowerZone3Activity.kt index 4eb0c5c..a63f2bb 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPowerZone3Activity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/AddWifiPowerZone3Activity.kt @@ -8,6 +8,7 @@ import android.net.wifi.ScanResult import android.net.wifi.WifiManager import android.os.Build import android.provider.Settings +import android.text.TextUtils import android.view.Gravity import android.view.View import androidx.activity.result.contract.ActivityResultContracts @@ -297,13 +298,14 @@ class AddWifiPowerZone3Activity : wifi.SSID } bleWifi.name = wifiName.replace("\"", "") - wifiList.add(bleWifi) + if (!TextUtils.isEmpty(bleWifi.name)) + wifiList.add(bleWifi) break } } } } - if (wifiList.size > 0) { + if (wifiList.isNotEmpty()) { showWifiData(wifiList) } else { showToast(R.string.txt_time_out_try_again, true) diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt index 59d0efd..788784c 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.graphics.Paint import android.view.Gravity import android.view.View +import android.widget.RadioGroup import androidx.activity.viewModels import com.abbidot.baselibrary.constant.EventName import com.abbidot.baselibrary.constant.MMKVKey @@ -27,6 +28,7 @@ import com.abbidot.tracker.util.ViewUtil import com.abbidot.tracker.vm.GeoCoderViewModel import com.abbidot.tracker.vm.GoogleLocationViewModel import com.abbidot.tracker.vm.SubscriptionManageViewModel +import com.abbidot.tracker.widget.TypefaceRoundButton import com.google.android.material.bottomsheet.BottomSheetDialog import kotlin.math.abs @@ -491,28 +493,28 @@ class SureSubscriptionPlanActivity : mViewBinding.apply { when (v!!) { btnSureSubscribePlan1Continue -> { -// if (AppUtils.isChina()) { -// if (null == mRechargePayOptionsCn) { -// mRechargePayOptionsCn = ViewUtil.instance.showBottomSheet( -// mContext, -// R.layout.layout_recharge_pay_options_cn -// ).apply { -// setOnClickListenerViews(findViewById(R.id.btn_pay_cn_chose_sure)) -// findViewById(R.id.rg_pay_cn_chose)?.let { -// it.setOnCheckedChangeListener { _, checkedId -> -// when (checkedId) { -// R.id.rb_pay_cn_chose_alipay -> mPayCnOption = -// ConstantInt.Type0 -// -// R.id.rb_pay_cn_chose_wxpay -> mPayCnOption = -// ConstantInt.Type1 -// } -// } -// } -// } -// } -// return -// } + if (AppUtils.isChina()) { + if (null == mRechargePayOptionsCn) { + mRechargePayOptionsCn = ViewUtil.instance.showBottomSheet( + mContext, + R.layout.layout_recharge_pay_options_cn + ).apply { + setOnClickListenerViews(findViewById(R.id.btn_pay_cn_chose_sure)) + findViewById(R.id.rg_pay_cn_chose)?.let { + it.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.rb_pay_cn_chose_alipay -> mPayCnOption = + ConstantInt.Type0 + + R.id.rb_pay_cn_chose_wxpay -> mPayCnOption = + ConstantInt.Type1 + } + } + } + } + } + return + } createOrder() } diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/account/CreateAccountV2ThreeFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/account/CreateAccountV2ThreeFragment.kt index a387113..db7eab6 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/account/CreateAccountV2ThreeFragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/account/CreateAccountV2ThreeFragment.kt @@ -214,7 +214,7 @@ class CreateAccountV2ThreeFragment : BaseFragment setUserLocationData(loc.latitude, loc.longitude) - locationSuccess(loc) } val userGpsLat = MMKVUtil.getDouble(MMKVKey.UserGpsLat) val userGpsLon = MMKVUtil.getDouble(MMKVKey.UserGpsLon) if (userGpsLat != 0.0 || userGpsLon != 0.0) { setUserLocationData(userGpsLat, userGpsLon) + val location = Location(LocationManager.GPS_PROVIDER) + location.latitude = userGpsLat + location.longitude = userGpsLon + locationSuccess(location) } onMapLoadOk(googleMap)