liugl
2020-09-04 798c626c95adfa29cdb54a04a55e0776f3b22c80
8.31
4个文件已修改
33 ■■■■■ 已修改文件
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/util/DialogUtil.kt 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
@@ -37,7 +37,7 @@
                } else {
                    if (getToken().isNullOrEmpty()) {
                        Handler(Looper.getMainLooper()).post {
                            toast("开始登录")
//                            toast("开始登录")
                        }
                        var driverCertificate = intent.getStringExtra("driverCertificate")
                        if (driverCertificate == null) {
app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt
@@ -4,6 +4,8 @@
import android.os.Handler
import android.os.Looper
import android.widget.Toast
import cn.sinata.xldutils.netstatus.NetUtils
import cn.sinata.xldutils.utils.DialogUtils
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getContent
import com.google.gson.Gson
@@ -11,9 +13,12 @@
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.utils.Cache.CacheKey
import com.okgoincar.R
import com.okgoincar.base.BaseEvent
import com.okgoincar.bean.LoginBean
import com.okgoincar.netUtls.Api
import com.okgoincar.slab.util.DialogUtil
import kotlinx.android.synthetic.main.slab_activity_login.*
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
@@ -25,6 +30,17 @@
    override fun initView() {
        showTitle(false)
        showHeader(false)
    }
    override fun onResume() {
        super.onResume()
        if (!NetUtils.isNetworkConnected(this)){
           var dialog =  DialogUtil.getSlabSurePopWindow(this,"当前网络不通畅,请稍后再登录"){
                EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
            }
            dialog.showCenter(window.decorView)
        }
    }
    override fun setOnclick() {
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -91,7 +91,6 @@
    }
    override fun initView() {
        tv_title_top.text = "服 务 监 督 卡 I"
        if (NetUtils.isNetworkConnected(this)){
            setTitleText("OK出行司机")
            showHeader(false)
@@ -151,6 +150,7 @@
        var view = dialog.contentView
        view.tv_close_base.text = cancelStr
        view.tv_sure_base.text = sureStr
        view.tv_close_base.gone()
        view.tv_close_base.setOnClickListener {
            dialog.dismiss()
            clickClose()
app/src/main/java/com/okgoincar/slab/util/DialogUtil.kt
@@ -10,6 +10,7 @@
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
import cn.sinata.xldutils.utils.DensityUtil
import cn.sinata.xldutils.utils.gone
import com.okgoincar.R
import com.okgoincar.utils.EasePopup.EasyPopup
import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
@@ -134,6 +135,18 @@
        return dialog
    }
    fun getSlabSurePopWindow(context: Context,content:String,clickSure:() -> Unit):EasyPopup{
        var dialog = getPopupwindow(context,R.layout.dialog_sure_and_del_slab)
        var view = dialog.contentView
        view.tv_close_base.gone()
        view.tv_sure_base.setOnClickListener {
            dialog.dismiss()
            clickSure()
        }
        view.tv_view_two_base.text = content
        return dialog
    }
    fun getSlabDelAndSurePopWindow(context: Context,sureStr:String,cancelStr:String,content:String,clickClose :() -> Unit,clickSure:() -> Unit):EasyPopup{
        var dialog = getPopupwindow(context,R.layout.dialog_sure_and_del_slab)
        var view = dialog.contentView