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 49037e6..761033c 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 Feb 05 15:21:25 CST 2026 +#Sat Feb 14 11:22:05 CST 2026 diff --git a/app/build.gradle b/app/build.gradle index d805e57..7cf685c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,9 +28,9 @@ android { applicationId "com.abbidot.tracker" minSdkVersion 23 targetSdkVersion 35 - versionCode 2107 -// versionName "2.1.7" - versionName "2.1.7-Beta1" + versionCode 2108 +// versionName "2.1.8" + versionName "2.1.8-Beta1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt b/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt index a78534d..234a459 100644 --- a/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt @@ -673,37 +673,37 @@ abstract class BaseActivity(val inflater: (inflater: LayoutInfl } //系统异常 "1001" -> { - showToast(R.string.txt_system_error) + showToast(R.string.txt_system_error, gravity = Gravity.CENTER) return true } "1002" -> { - showToast(R.string.txt_missing_param) + showToast(R.string.txt_missing_param, gravity = Gravity.CENTER) return true } "1003" -> { - showToast(R.string.txt_tracker_busy) + showToast(R.string.txt_tracker_busy, gravity = Gravity.CENTER) return true } "1004" -> { - showToast(R.string.txt_tracker_offline) + showToast(R.string.txt_tracker_offline, gravity = Gravity.CENTER) return true } "1005" -> { - showToast(R.string.txt_tracker_live) + showToast(R.string.txt_tracker_live, gravity = Gravity.CENTER) return true } "1006" -> { - showToast(R.string.txt_time_out_try_again) + showToast(R.string.txt_time_out_try_again, gravity = Gravity.CENTER) return true } "1007" -> { - showToast(R.string.txt_abnormity) + showToast(R.string.txt_abnormity, gravity = Gravity.CENTER) return true } 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 9e8fafe..73db18a 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 @@ -334,6 +334,13 @@ class LiveActivityV3 : BaseActivity(ActivityLiveV3Binding } } } + + override fun onErrorCode() { + setButtonEnabled( + mViewBinding.ilLiveV2OperateLayout.llLiveV2StopLive, ConstantInt.Type1 + ) + if (mLiveStatus == 1) finishActivity() + } }) } @@ -721,7 +728,7 @@ class LiveActivityV3 : BaseActivity(ActivityLiveV3Binding mHomeMapCommon.let { setMapDeviceBean(this) it.refreshPetCurrentLocation(latitude, longitude, isMoveCamera) - it.startRippleCircleAnim() + mViewBinding.root.postDelayed({ it.startRippleCircleAnim() }, 1500) isMoveCamera = false // val userAndPetDistance = it.getUserAndPetDistance() // mViewBinding.tvLiveV2Distance.text = String.format( @@ -1040,6 +1047,7 @@ class LiveActivityV3 : BaseActivity(ActivityLiveV3Binding } LogUtil.e("音量减小--,$volume") } + KeyEvent.KEYCODE_VOLUME_UP -> { LogUtil.e("音量增加++") if (!isOpenSound) { 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 157757f..056a7f5 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 @@ -173,7 +173,7 @@ class MapV3Fragment : BaseFragment(FragmentMapV3Binding::i override fun onResume() { super.onResume() - + isMoveCamera = true getHomeV2Activity()?.apply { //其他页面是否选择了宠物 if (mCurrentShowPetPos != mSelectPetPosition) { diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt index 6cec842..f5ba1c0 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt @@ -340,15 +340,14 @@ abstract class BaseGoogleMapFragment : private suspend fun setPetHeadMarker( latLng: LatLng, headBgResId: Int = R.drawable.pic_map_gps_avatar ) { - if (null == mPetHeadIconBitmap) { //设置头像 mPetHeadIconBitmap = GoogleBitmapHelper.headToBitmap(mContext!!, headBgResId, mPetHeadUrl, mPetType) } + val markerOptions = MarkerOptions().position(latLng) markerOptions.icon(BitmapDescriptorFactory.fromBitmap(mPetHeadIconBitmap!!)) - mMarker?.remove() mGoogleMap?.apply { mMarker = addMarker(markerOptions) diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/network/base/BaseNetworkApi.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/network/base/BaseNetworkApi.kt index e045b11..f24baef 100644 --- a/baselibrary/src/main/java/com/abbidot/baselibrary/network/base/BaseNetworkApi.kt +++ b/baselibrary/src/main/java/com/abbidot/baselibrary/network/base/BaseNetworkApi.kt @@ -115,7 +115,7 @@ abstract class BaseNetworkApi(private val baseUrl: String) : IService { //失败重试请求次数 private const val RETRY_COUNT = 1 //请求超时时间 - private const val REQUEST_TIMEOUT=35L + private const val REQUEST_TIMEOUT=40L private val defaultOkHttpClient by lazy { val builder = OkHttpClient.Builder().callTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS) .connectTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS).readTimeout(REQUEST_TIMEOUT, TimeUnit.SECONDS)