diff --git a/app/build.gradle b/app/build.gradle index 18406a0..3730cbd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { targetSdkVersion 35 versionCode 2101 // versionName "2.1.1" - versionName "2.1.1-Beta10" + versionName "2.1.1-Beta12" 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 6aa5c99..511c2f0 100644 --- a/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt @@ -470,7 +470,8 @@ abstract class BaseActivity(val inflater: (inflater: LayoutInfl tip: String, isFinish: Boolean = false, gravity: Int = Gravity.BOTTOM // @QMUITipDialog.Builder.IconType iconType: Int = QMUITipDialog.Builder.ICON_TYPE_NOTHING ) { - if (gravity == Gravity.BOTTOM) Toaster.setGravity(gravity, 0, 300, 0f, 0f) + if (gravity == Gravity.BOTTOM) Toaster.setGravity(gravity, 0, 300) + else Toaster.setGravity(gravity) if (isFinish) { // DialogUtils.showTipDialog(mContext, mViewBinding.root, tip, iconType, true) //activity前台显示运行才弹出 diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddNewTracker3Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddNewTracker3Activity.kt index 676b061..10cec97 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddNewTracker3Activity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddNewTracker3Activity.kt @@ -80,7 +80,7 @@ class AddNewTracker3Activity : mContext, rvAddNewTracker3DeviceList, mScanDeviceAdapter, - top = QMUIDisplayHelper.dpToPx(12) + top = QMUIDisplayHelper.dpToPx(16) ) setOnClickListenerViews(ivAddNewTracker3RefreshBtn) @@ -133,6 +133,11 @@ class AddNewTracker3Activity : super.onErrorCode() setNoConnectState() } + + override fun onRequestError(exceptionCode: String?) { + super.onRequestError(exceptionCode) + setNoConnectState() + } }) } } @@ -164,7 +169,7 @@ class AddNewTracker3Activity : it.isEnabled = false if (null == mAnimatorSet) { - mAnimatorSet = ViewUtil.instance.viewAlphaAndRotationObjectAnimator(it, true) + mAnimatorSet = ViewUtil.instance.viewRotationAnimator(it, true) } else { mAnimatorSet!!.start() } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/DeleteTracker1Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/DeleteTracker1Activity.kt index 4b47238..9951c2a 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/DeleteTracker1Activity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/DeleteTracker1Activity.kt @@ -96,7 +96,7 @@ class DeleteTracker1Activity : CommonDialog1( mContext, "", - getString(R.string.txt_delete_succe), + getString(R.string.txt_unbind_success), false, 5f, Typeface.BOLD, @@ -117,7 +117,7 @@ class DeleteTracker1Activity : private fun sureDeleteDevice() { ViewUtil.instance.showDialog( - mContext, getString(R.string.txt_delete_tips), object : BaseDialog.OnDialogOkListener { + mContext, getString(R.string.txt_unbind_tips), object : BaseDialog.OnDialogOkListener { override fun onOkClick(dialog: BaseDialog<*>) { dialog.dismiss() mDeviceBean?.apply { diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt index b8d782b..2245688 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/MyTrackerV2Activity.kt @@ -409,9 +409,7 @@ class MyTrackerV2Activity : // 2 -> deleteDevice(device) // } }).apply { - if (!isOnlyBindOneDevice) { - addItem(getString(R.string.txt_unbind_device)) - } + addItem(getString(R.string.txt_unbind_device)) // if (null == device.pet) { // addItem( // getString(R.string.txt_delete) + " ${device.deviceOutId}" diff --git a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt index b6110be..f3d382c 100644 --- a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt +++ b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt @@ -739,6 +739,29 @@ class ViewUtil private constructor() { return animatorSet } + /** + * 围绕自身中心旋转360度 + */ + fun viewRotationAnimator(view: View, isLoop: Boolean = false): AnimatorSet { + val rotationAnimator = ObjectAnimator.ofFloat(view, "rotation", 0f, 360f).apply { + duration = 1000 + interpolator = LinearInterpolator() + if (isLoop) { + repeatMode = ValueAnimator.RESTART + repeatCount = ValueAnimator.INFINITE + } + } + val animatorSet = AnimatorSet().apply { + play(rotationAnimator) + //取消动画,状态恢复原来状态 + doOnCancel { + view.rotation = 0f + } + start() + } + return animatorSet + } + /** * 加载动画文件执行动画 diff --git a/app/src/main/res/layout/activity_add_new_tracker3.xml b/app/src/main/res/layout/activity_add_new_tracker3.xml index bf42210..1a1e42f 100644 --- a/app/src/main/res/layout/activity_add_new_tracker3.xml +++ b/app/src/main/res/layout/activity_add_new_tracker3.xml @@ -78,7 +78,7 @@ android:background="@drawable/shape24_white_bg" android:fadeScrollbars="false" android:paddingTop="@dimen/dp_6" - android:paddingBottom="@dimen/dp_18" + android:paddingBottom="@dimen/dp_22" android:scrollbars="vertical" android:visibility="gone" /> diff --git a/app/src/main/res/layout/activity_delete_tracker1.xml b/app/src/main/res/layout/activity_delete_tracker1.xml index f0d22aa..43c7a03 100644 --- a/app/src/main/res/layout/activity_delete_tracker1.xml +++ b/app/src/main/res/layout/activity_delete_tracker1.xml @@ -26,7 +26,7 @@ @@ -123,7 +123,7 @@ android:id="@+id/btn_next_delete_tracker1" style="@style/my_RoundRect_Button_style" android:layout_weight="1" - android:text="@string/txt_delete" + android:text="@string/tracker_manage_set_unbind" app:qmui_radius="@dimen/dp_24" app:typeface="@string/roboto_bold_font" /> diff --git a/app/src/main/res/layout/layout_san_device_item.xml b/app/src/main/res/layout/layout_san_device_item.xml index c8581bd..f36d5ed 100644 --- a/app/src/main/res/layout/layout_san_device_item.xml +++ b/app/src/main/res/layout/layout_san_device_item.xml @@ -1,5 +1,6 @@ + android:textSize="@dimen/textSize20" + app:typeface="@string/roboto_regular_font" /> %s Geofences gesetzt %s ist in der Nähe Tracker nur löschen, wenn du ihn zurückgibst oder weitergibst. - Tracker löschen Wird gelöscht LED-Einstellung Reserve diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 10db7e4..0aaba98 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -944,7 +944,6 @@ %s 围栏设置 %s 在附近 仅在您要退回或赠送追踪器时,才将其从您的账户中删除。 - 删除追踪器 将被删除 LED灯设置 预留 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3dbe5d3..32e0c04 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1001,8 +1001,7 @@ Your subscription has expired,\nplease recharge %s Fences Set %s is nearby - Only delete your Tracker from your account if you\'re returning or giving it away. - Delete Tracker + Only unbind your Tracker from your account if you\'re returning or giving it away. Will be Deleted LED Light Setting Reserve @@ -1048,7 +1047,6 @@ %s Year Care Saved. Active when online. The program has an exception and is about to exit - Activate Subscription Powered off Near %s diff --git a/local.properties b/local.properties index 8eb663c..f27a2d9 100644 --- a/local.properties +++ b/local.properties @@ -6,7 +6,6 @@ # header note. #Tue Jul 12 12:13:20 CST 2022 sdk.dir=H\:\\androidSdk - #签名文件配置信息 keyStoreFile=E\:\\AndroidProject\\key\\shanrenkey.jks keyStorePassword=ShanrenSport365