diff --git a/app/src/main/java/com/yzx/escreen/MainActivity.kt b/app/src/main/java/com/yzx/escreen/MainActivity.kt index 631f16e..a1dc9ce 100644 --- a/app/src/main/java/com/yzx/escreen/MainActivity.kt +++ b/app/src/main/java/com/yzx/escreen/MainActivity.kt @@ -122,18 +122,20 @@ class MainActivity : BaseActivity>(), NetworkUtils.OnNetworkSta } private fun showNetworkError(){ - val builder = QMUIDialog.MessageDialogBuilder(this) - - builder.setMessage("你还没有连接网络,请先连接网络!") - .setTitle("温馨提示") - .addAction("去设置" - ) { dialog, index -> - NetworkUtils.openWirelessSettings() - } - .setCancelable(false) - .setCanceledOnTouchOutside(false) - netErrorDialog = builder.show() - netErrorDialog?.hideNavigationBar() + if(!NetworkUtils.isConnected()){ //无网提示 + val builder = QMUIDialog.MessageDialogBuilder(this) + + builder.setMessage("你还没有连接网络,请先连接网络!") + .setTitle("温馨提示") + .addAction("去设置" + ) { dialog, index -> + NetworkUtils.openWirelessSettings() + } + .setCancelable(false) + .setCanceledOnTouchOutside(false) + netErrorDialog = builder.show() + netErrorDialog?.hideNavigationBar() + } } private fun showNetworkLoading(){ @@ -184,6 +186,7 @@ class MainActivity : BaseActivity>(), NetworkUtils.OnNetworkSta dismiss() } } + viewPager2.removeCallbacks(netLoadingRun) if (!User.isLogin()) { WebActivity.active(this, "${Config.OA_URL}/login?logout=1") finish() diff --git a/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt index e90811a..8022c62 100644 --- a/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt +++ b/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt @@ -310,8 +310,17 @@ class HomeFragment : BaseFragment(), HomeView, if (index >= 0) { mShowDialogList.removeAt(dialogIndex) } + val showItem = mShowDialogList.find { !it.showed } + showItem?.apply { + show() + } + + } + val showList = mShowDialogList.filter { it.showed } + if(showList.isEmpty()){ + dialog.show() + dialog.showed = true } - dialog.show() dialog.hideNavigationBar() dialog.setLeaveId(detail.id) mShowDialogList.add(dialog) @@ -485,8 +494,11 @@ class HomeFragment : BaseFragment(), HomeView, } override fun onLeaveIDsSuccess(list: MutableList) { - for (leaveID in list) { - mPresenter?.getDetail(leaveID.id) + + list.forEachIndexed { index, leaveID -> + pageTv.postDelayed({ + mPresenter?.getDetail(leaveID.id) + },500L*index) } } diff --git a/app/src/main/java/com/yzx/escreen/presenter/HomePresenter.kt b/app/src/main/java/com/yzx/escreen/presenter/HomePresenter.kt index 1857494..f48bc31 100644 --- a/app/src/main/java/com/yzx/escreen/presenter/HomePresenter.kt +++ b/app/src/main/java/com/yzx/escreen/presenter/HomePresenter.kt @@ -48,9 +48,9 @@ class HomePresenter(view: HomeView) : BasePresenter(view) { .tag(this) .execute(object : JsonCallBack>() { override fun onSuccess(response: Response>?) { - LogUtils.d(response) if (response?.isSuccessful == true) { mView?.onLeaveIDsSuccess(response.body().list) + LogUtils.d("getLeaveShowIds",response.body().list) } } diff --git a/app/src/main/java/com/yzx/escreen/widget/BaseDialog.kt b/app/src/main/java/com/yzx/escreen/widget/BaseDialog.kt index df40fda..30e1524 100644 --- a/app/src/main/java/com/yzx/escreen/widget/BaseDialog.kt +++ b/app/src/main/java/com/yzx/escreen/widget/BaseDialog.kt @@ -6,6 +6,7 @@ import android.content.Context class BaseDialog(context: Context, themeResId: Int, res: Int) : Dialog(context, themeResId) { private var res: Int = 0 private var leaveId:Int = 0 + var showed = false init { setContentView(res)