1.优化接口获取完数据后才展示占位图页面

baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragmentActivity.kt

@@ -7,7 +7,6 @@ import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Bundle
-import android.view.KeyEvent
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText

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

@@ -6,12 +6,10 @@ import android.view.*
 import androidx.annotation.DrawableRes
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.DialogFragment
-import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.databinding.FragmentDialogBaseBinding
 import com.yingyangfly.baselib.ext.getDbClass
 import com.yingyangfly.baselib.ext.initBar
 import com.yingyangfly.baselib.utils.ViewTool
-import kotlinx.android.synthetic.main.fragment_dialog_base.view.*
 
 /**
  * Author: YongChao

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

@@ -35,11 +35,6 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
         setContentView(mView!!)
         fishImage = findViewById(R.id.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!!)
     }
@@ -59,6 +54,10 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
         val window = window
         focusNotAle(window!!)
         super.show()
+        if (ovlImage != null) {
+            animation = AnimationUtils.loadAnimation(AppUtil.getContext(), R.anim.scale_anim)
+            ovlImage?.startAnimation(animation)
+        }
         hideNavigationBar(window)
         clearFocusNotAle(window)
     }
@@ -108,4 +107,11 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
         window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
     }
 
+    override fun dismiss() {
+        if (ovlImage != null) {
+            ovlImage?.clearAnimation()
+        }
+        super.dismiss()
+    }
+
 }

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

@@ -5,7 +5,6 @@ import android.text.Html
 import android.text.Spanned
 import android.util.TypedValue
 import android.view.View
-import android.widget.RelativeLayout
 import androidx.fragment.app.FragmentManager
 import com.yingyangfly.baselib.base.BaseActivity
 import com.yingyangfly.baselib.databinding.DialogTipBinding

baselib/src/main/java/com/yingyangfly/baselib/net/MyRxScheduler.java

@@ -6,8 +6,6 @@ import com.yingyangfly.baselib.BaseApplication;
 import com.yingyangfly.baselib.dialog.LoadingDialog;
 import com.yingyangfly.baselib.utils.LogUtil;
 import com.yingyangfly.baselib.utils.NetWorkUtils;
-import com.yingyangfly.baselib.utils.ToastUtil;
-import com.yingyangfly.baselib.utils.ToastUtils;
 
 import io.reactivex.ObservableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;

baselib/src/main/java/com/yingyangfly/baselib/net/convert/XlGsonResponseBodyConverter.java

@@ -17,7 +17,6 @@ package com.yingyangfly.baselib.net.convert;
 
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
-import com.yingyangfly.baselib.net.BaseResp;
 import com.yingyangfly.baselib.net.XBaseEntity;
 import com.yingyangfly.baselib.utils.GsonUtil;
 

baselib/src/main/java/com/yingyangfly/baselib/utils/NetWorkUtils.kt

@@ -8,7 +8,6 @@ import android.net.NetworkInfo
 import android.net.wifi.WifiManager
 import android.os.Build
 import android.telephony.TelephonyManager
-import android.text.TextUtils
 import java.net.InetAddress
 import java.net.NetworkInterface
 import java.net.SocketException

baselib/src/main/java/com/yingyangfly/baselib/utils/ViewTool.java

@@ -16,8 +16,6 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatButton;
-import androidx.appcompat.widget.AppCompatTextView;
 import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 

livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/list/LiveBroadcastListViewModel.kt

@@ -2,7 +2,6 @@ package com.yingyang.livebroadcast.activity.list
 
 import com.yingyang.livebroadcast.entity.LiveBroadcastListBean
 import com.yingyang.livebroadcast.entity.LiveBroadcastListRequestBodyBean
-import com.yingyang.livebroadcast.entity.ReservationLiveBean
 import com.yingyang.livebroadcast.net.LIVEBROADCAST_API
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils

login/src/main/java/com/yingyang/login/net/LoginApiService.kt

@@ -3,7 +3,8 @@ package com.yingyang.login.net
 import com.yingyang.login.entity.UserInfoBean
 import com.yingyangfly.baselib.net.BaseResp
 import okhttp3.RequestBody
-import retrofit2.http.*
+import retrofit2.http.Body
+import retrofit2.http.POST
 
 interface LoginApiService {
 

login/src/main/java/com/yingyang/login/ui/login/LoginViewModel.kt

@@ -1,7 +1,7 @@
 package com.yingyang.login.ui.login
 
-import com.yingyang.login.net.LOGIN_API
 import com.yingyang.login.entity.UserInfoBean
+import com.yingyang.login.net.LOGIN_API
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil

webview/src/main/java/com/yingyangfly/webview/BridgeWebActivity.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.content.pm.ActivityInfo
 import android.os.Build
 import android.os.Bundle
-import android.view.KeyEvent
 import android.view.ViewGroup
 import android.webkit.WebResourceRequest
 import android.webkit.WebSettings

workbenches/src/main/java/com/yingyang/workbenches/orderlist/OrderListActivity.kt

@@ -9,7 +9,6 @@ import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.JumpUtil
 
 /**
  * 订单记录

workbenches/src/main/java/com/yingyang/workbenches/traincontent/TrainContentFragment.kt

@@ -10,8 +10,6 @@ import com.yingyang.workbenches.widget.SpinnerTextFormatter
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMFragment
-import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode

workbenches/src/main/java/com/yingyang/workbenches/trainreport/TrainReportFragment.kt

@@ -4,7 +4,6 @@ import com.yingyang.workbenches.R
 import com.yingyang.workbenches.adapter.TrainReportAdapter
 import com.yingyang.workbenches.databinding.FragmentTrainReportBinding
 import com.yingyangfly.baselib.base.BaseFragment
-import com.yingyangfly.baselib.ext.toast
 
 /**
  * 训练报告