8.31

liugl

2020-09-01 f2124ee623ac169d5f82bc85eba6ebf377f58b07

8.31

 app/build.gradle

@@ -103,4 +103,6 @@
    implementation 'me.jessyan:autosize:1.1.2'
    implementation files('libs/AMap3DMap_7.5.0_AMapNavi_7.5.0_AMapSearch_7.3.0_AMapTrack_1.3.0_AMapLocation_5.0.0_20200610.jar')
    implementation 'com.wang.avi:library:2.1.3'
    implementation 'com.tencent.bugly:crashreport:3.1.0'
    implementation 'com.tencent.bugly:nativecrashreport:3.1.0'
}

 app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt

@@ -63,7 +63,7 @@
    private fun loginOut(context: Context?) {
        var map = getMapByAny()
        callNet(context!!, Api.loginOut, map) {

            toast("Ok退签")
        }
    }


 app/src/main/java/com/okgoincar/base/MyApplication.kt

@@ -29,6 +29,7 @@
import com.okgoincar.netUtls.getUserId
import com.okgoincar.slab.MySlabBaseActivity
import com.okgoincar.utils.Cache.CacheKey
import com.tencent.bugly.crashreport.CrashReport
import org.jetbrains.anko.toast
import org.json.JSONObject
import java.security.SecureRandom
@@ -69,6 +70,7 @@
//        PlatformConfig.setWeixin("wx65d2c03f04352f90", "7a3a57f9ba78c1f400b75298eec4c7c0")
//        PlatformConfig.setQQZone("101877032", "eab94b262bf9789eec770cde42a6e71e") //qq互联
//        LogUtils.OpenLog(true)
        CrashReport.initCrashReport(applicationContext, "666d35fada", false)
        initUpPoint()
        initSocket()
    }

 app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt

@@ -11,6 +11,7 @@
import androidx.recyclerview.widget.RecyclerView
import cn.sinata.rxnetty.Cache.CacheUtil
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.netstatus.NetUtils
import cn.sinata.xldutils.utils.*
import com.amap.api.location.AMapLocation
import com.amap.api.location.AMapLocationListener
@@ -29,8 +30,10 @@
import com.okgoincar.slab.event.SlabMineEventActivity
import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.utils.DateUtil
import com.okgoincar.utils.EasePopup.EasyPopup
import com.okgoincar.utils.download.DownloadUtil
import com.okgoincar.utils.glide.GlideUtil
import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
import kotlinx.android.synthetic.main.slab_activity_login.*
import kotlinx.android.synthetic.main.slab_activity_main.*
import kotlinx.android.synthetic.main.slab_activity_main.tv_name
@@ -84,26 +87,30 @@
            tv_time.textColor(this, R.color.black)
            tv_car_statue.textColor(this, R.color.black)
            tv_title.textColor(this, R.color.yellow_ffa72d)

        }
    }

    override fun initView() {
        setTitleText("OK出行司机")
        showHeader(false)
        showTitle(false)
        callLogin {
            view_mode.isSelected = !getNowTimeBlack()
            addFragment(mainFragment, R.id.rl_container)
            AMapKit.initLocation(this, this)
            initCall()
            NettyClient.getInstance().startService()
            callPersion()
        tv_title_top.text = "服 务 监 督 卡 I"
        if (NetUtils.isNetworkConnected(this)){
            setTitleText("OK出行司机")
            showHeader(false)
            showTitle(false)
            callLogin {
                view_mode.isSelected = !getNowTimeBlack()
                addFragment(mainFragment, R.id.rl_container)
                AMapKit.initLocation(this, this)
                initCall()
                NettyClient.getInstance().startService()
                callPersion()
//        showOrder("2221", "2", 100, 2)
            callVersion()
                callVersion()
            }
        }else{
            toast("无网络")
        }
        //重重新登录 用来上线
    }



    private fun callPersion() {
@@ -114,15 +121,50 @@
        }
    }

    var popup:EasyPopup? = null

    override fun onResume() {
        super.onResume()
        if (!NetUtils.isNetworkConnected(this)){
            popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
                if (!NetUtils.isNetworkConnected(this)){
                    toast("无网络")
                }else{
                    initView()
                    popup?.dismiss()
                }
            }
            window.decorView.post {
                popup?.showCenter(window.decorView)
            }
        }
        try {
            mainFragment.refresh()
            mainFragment?.refresh()
        }catch (e:Exception){

        }

    }

    fun getSlabDelAndSurePopWindow(context: Context,sureStr:String,cancelStr:String,content:String,clickClose :() -> Unit,clickSure:() -> Unit): EasyPopup {
        var dialog = DialogUtil.getPopupwindow(context, R.layout.dialog_sure_and_del_slab)
        var view = dialog.contentView
        view.tv_close_base.text = cancelStr
        view.tv_sure_base.text = sureStr
        view.tv_close_base.setOnClickListener {
            dialog.dismiss()
            clickClose()
        }
        view.tv_sure_base.setOnClickListener {
            clickSure()
        }
        view.tv_view_two_base.text = content
        return dialog
    }




    private fun showUI(data: UserInfoBean?) {
        data?.let {
            if (data.taxiAptitudeCard.length > 7){