1.修改loading框样式

baselib/src/main/java/com/yingyangfly/baselib/dialog/LoadingDialog.kt

@@ -8,9 +8,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
 import androidx.appcompat.widget.AppCompatImageView
-import com.bumptech.glide.Glide
 import com.yingyangfly.baselib.R
+import com.yingyangfly.baselib.utils.AppUtil
 
 /**
  * Loading
@@ -19,6 +21,8 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
 
     var mView: View? = null
     private var fishImage: AppCompatImageView? = null
+    private var ovlImage: AppCompatImageView? = null
+    var animation: Animation? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -30,9 +34,12 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
         mView = inflater.inflate(R.layout.dialog_loading, null)
         setContentView(mView!!)
         fishImage = findViewById(R.id.fishImage)
-        Glide.with(context)
-            .load("file:///android_asset/fish.GIF")
-            .into(fishImage!!)
+        ovlImage = findViewById(R.id.ovlImage)
+//        Glide.with(context)
+//            .load("file:///android_asset/fish.GIF")
+//            .into(fishImage!!)
+        animation = AnimationUtils.loadAnimation(AppUtil.getContext(), R.anim.scale_anim)
+        ovlImage?.startAnimation(animation)
         setCanceledOnTouchOutside(false)
         setDialogLayout(context, window!!)
     }

baselib/src/main/java/com/yingyangfly/baselib/dialog/TaskFragment.kt

@@ -74,7 +74,7 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
             //停止动画
             fishImage?.clearAnimation()
             if (animationDrawable != null) {
-                animationDrawable?.stop();
+                animationDrawable?.stop()
             }
             onDialogClickListener?.invoke(id)
             dismiss()
@@ -83,9 +83,9 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
 
     private fun init() {
         //开始动画
-        fishImage?.setImageResource(R.drawable.anim_loading);
+        fishImage?.setImageResource(R.drawable.anim_loading)
         animationDrawable = fishImage?.drawable as AnimationDrawable?
-        animationDrawable?.start();
+        animationDrawable?.start()
         tvContent?.text = taskDesn
     }
 

baselib/src/main/res/anim/scale_anim.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<scale xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="1000"
+    android:fillBefore="true"
+    android:fromXScale="0.8"
+    android:fromYScale="0.8"
+    android:pivotX="50%"
+    android:pivotY="50%"
+    android:repeatCount="800"
+    android:repeatMode="reverse"
+    android:toXScale="1.5"
+    android:toYScale="1.5" />

baselib/src/main/res/drawable/bg_dialog_ring.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="@dimen/divider_200px"
+    android:shape="ring"
+    android:thickness="@dimen/divider_10px"
+    android:useLevel="false">
+
+    <solid android:color="@color/color_FF4A76FF" />
+
+    <size
+        android:width="@dimen/divider_1600px"
+        android:height="@dimen/divider_1600px" />
+
+</shape>

baselib/src/main/res/layout/dialog_loading.xml

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/transparent"
     android:gravity="center"
     android:orientation="vertical">
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/ovlImage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_dialog_ring" />
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/fishImage"
-        android:layout_width="@dimen/divider_333px"
-        android:layout_height="@dimen/divider_520px" />
+        android:layout_width="@dimen/divider_180px"
+        android:layout_height="@dimen/divider_330px"
+        android:layout_gravity="center"
+        android:scaleType="centerInside"
+        android:background="@mipmap/icon_dolphin" />
 
-</LinearLayout>
+</FrameLayout>

baselib/src/main/res/values/dimens.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <dimen name="divider_1600px" tools:ignore="ResourceName">1600px</dimen>
     <dimen name="divider_1194px" tools:ignore="ResourceName">1194px</dimen>
     <dimen name="divider_834px" tools:ignore="ResourceName">834px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
     <dimen name="divider_667px" tools:ignore="ResourceName">667px</dimen>
+    <dimen name="divider_600px" tools:ignore="ResourceName">600px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
     <dimen name="divider_520px" tools:ignore="ResourceName">520px</dimen>
     <dimen name="divider_483px" tools:ignore="ResourceName">483px</dimen>
@@ -47,6 +49,7 @@
     <dimen name="divider_213px" tools:ignore="ResourceName">213px</dimen>
     <dimen name="divider_204px" tools:ignore="ResourceName">204px</dimen>
     <dimen name="divider_203px" tools:ignore="ResourceName">203px</dimen>
+    <dimen name="divider_200px" tools:ignore="ResourceName">200px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
     <dimen name="divider_190px" tools:ignore="ResourceName">190px</dimen>
     <dimen name="divider_184px" tools:ignore="ResourceName">184px</dimen>

personalcenter/src/main/java/com/yingyang/personalcenter/activity/PersonalCenterActivity.kt

@@ -50,8 +50,8 @@ class PersonalCenterActivity :
             }
             //设备租赁及服务
             tvEquipmentServices.setOnSingleClickListener {
-//                JumpUtil.jumpActivity(RouterUrlCommon.equipmentServices, mContext)
-                "该功能正在开发中，敬请期待".toast()
+                JumpUtil.jumpActivity(RouterUrlCommon.equipmentServices, mContext)
+//                "该功能正在开发中，敬请期待".toast()
             }
             //设置
             settingLayout.setOnSingleClickListener {

personalcenter/src/main/java/com/yingyang/personalcenter/equipmentservices/EquipmentServicesActivity.kt

@@ -12,7 +12,7 @@ import com.yingyangfly.baselib.router.RouterUrlCommon
 class EquipmentServicesActivity : BaseActivity<ActivityEquipmentServicesBinding>() {
 
     override fun initViews() {
-
+        showLoading()
     }
 
     override fun initListener() {