优化新的ui

app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt

@@ -470,7 +470,8 @@ abstract class BaseActivity<T : ViewBinding>(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前台显示运行才弹出

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()
             }

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 {

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}"

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
+    }
+
 
     /**
      * 加载动画文件执行动画