1:新增版本号

liugl

2020-12-14 8b04af3769b20c2344f371cc17bdba8a93121209

1:新增版本号

 app/src/main/java/com/okgoincar/bean/websocket/HeartBean.java

@@ -1,6 +1,8 @@
package com.okgoincar.bean.websocket;


import android.view.View;

import com.okgoincar.netUtls.NetKitKt;
import com.okgoincar.utils.Cache.CacheKey;


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

@@ -1,24 +1,20 @@
package com.okgoincar.slab

import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.Gravity
import android.view.KeyEvent
import android.view.ViewGroup
import android.widget.PopupWindow
import android.widget.Toast
import androidx.recyclerview.widget.LinearLayoutManager
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
import com.okgoincar.netUtls.callNet
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.ui.adapter.SlabStartAdapter
import com.okgoincar.utils.Cache.CacheKey
import com.google.gson.Gson
import com.okgoincar.R
import com.okgoincar.base.AMapKit
@@ -26,22 +22,22 @@
import com.okgoincar.base.MyApplication
import com.okgoincar.bean.*
import com.okgoincar.netUtls.Api
import com.okgoincar.netUtls.sendAudio
import com.okgoincar.netUtls.callNet
import com.okgoincar.netUtls.createView
import com.okgoincar.netUtls.getMapByAny
import com.okgoincar.slab.event.SlabMineEventActivity
import com.okgoincar.slab.util.DialogUtil
import com.okgoincar.ui.adapter.SlabStartAdapter
import com.okgoincar.utils.Cache.CacheKey
import com.okgoincar.utils.DateUtil
import com.okgoincar.utils.EasePopup.EasyPopup
import com.okgoincar.utils.PackageUtil
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
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
import java.lang.Exception

class SlabMainActivity : MySlabBaseActivity(), AMapLocationListener {

@@ -92,7 +88,7 @@
    }

    override fun initView() {
        if (NetUtils.isNetworkConnected(this)){
        if (NetUtils.isNetworkConnected(this)) {
            setTitleText("OK出行司机")
            showHeader(false)
            showTitle(false)
@@ -106,11 +102,10 @@
//        showOrder("2221", "2", 100, 2)
                callVersion()
            }
        }else{
        } else {
            showNoneNetDialog()
        }
    }



    private fun callPersion() {
@@ -121,7 +116,7 @@
        }
    }

    var popup:EasyPopup? = null
    var popup: PopupWindow? = null

    override fun onResume() {
        super.onResume()
@@ -129,29 +124,40 @@
        try {
            mainFragment?.refresh()
            callPersion()
        }catch (e:Exception){
        } catch (e: Exception) {

        }
    }

    fun showNoneNetDialog(){
        if (!NetUtils.isNetworkConnected(this)){
            popup = getSlabDelAndSurePopWindow(this,"刷新","取消","网络不通畅,是否刷新页面？",{}){
                if (!NetUtils.isNetworkConnected(this)){
    fun showNoneNetDialog() {
        if (!NetUtils.isNetworkConnected(this)) {
            popup = getSlabDelAndSurePopWindow(this, "刷新", "取消", "网络不通畅,是否刷新页面？", {}) {
                if (!NetUtils.isNetworkConnected(this)) {
                    toast("无网络")
                }else{
                } else {
                    initView()
                    popup?.dismiss()
                }
            }
            window.decorView.post {
                popup?.showCenter(window.decorView)
                popup?.showAtLocation(window.decorView, Gravity.CENTER, 0, 0);
//                popup?.showCenter(window.decorView)
            }
        }
    }

    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)
    fun getSlabDelAndSurePopWindow(
        context: Context,
        sureStr: String,
        cancelStr: String,
        content: String,
        clickClose: () -> Unit,
        clickSure: () -> Unit
    ): PopupWindow {
        var dialog = PopupWindow(createView(R.layout.dialog_sure_and_del_slab,context))
        dialog.width = ViewGroup.LayoutParams.MATCH_PARENT
        dialog.height = ViewGroup.LayoutParams.MATCH_PARENT

        var view = dialog.contentView
        view.tv_close_base.text = cancelStr
        view.tv_sure_base.text = sureStr
@@ -168,15 +174,19 @@
    }




    private fun showUI(data: UserInfoBean?) {
        data?.let {
            textView_version.text ="版本-V"+PackageUtil.getVersionName(this)
            textView_version.text = "版本-V" + PackageUtil.getVersionName(this)
            tv_title_top.text = "服 务 监 督 卡"
            if (data.taxiAptitudeCard.length > 7){
                tv_code_num.text  = "资格证号："+data.taxiAptitudeCard.substring(0,3)+"*******"+data.taxiAptitudeCard.substring(data.taxiAptitudeCard.length-4,data.taxiAptitudeCard.length)
            }else{
            if (data.taxiAptitudeCard.length > 7) {
                tv_code_num.text = "资格证号：" + data.taxiAptitudeCard.substring(
                    0,
                    3
                ) + "*******" + data.taxiAptitudeCard.substring(
                    data.taxiAptitudeCard.length - 4,
                    data.taxiAptitudeCard.length
                )
            } else {
                tv_code_num.text = "资格证号：" + data.taxiAptitudeCard
            }
            tv_name.text = "姓名：" + it.name
@@ -189,8 +199,8 @@
                ) as RecyclerView.LayoutManager?
            recycler_view_start.adapter = SlabStartAdapter(it.score.toDouble())
            var company = it.company
            if (company.startsWith("广西")){
                company = company.substring(2,company.length)
            if (company.startsWith("广西")) {
                company = company.substring(2, company.length)
            }
            tv_company.text = "公司：" + company
            tv_time.text = "发证日期：" + it.networkCarlssueDate
@@ -327,6 +337,9 @@
    var mBackAppTime: Long = 0

    override fun onBackPressed() {
        if (popup != null && popup!!.isShowing) {
            return
        }
        if (System.currentTimeMillis() - mBackAppTime > 2000) {
            Toast.makeText(this, "再按一次退出程序", Toast.LENGTH_SHORT)
                .show()
@@ -334,6 +347,13 @@
        } else {
            moveTaskToBack(true)
        }
    }

    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
        if (popup != null && popup!!.isShowing) {
            return false
        }
        return super.onKeyDown(keyCode, event)
    }

    override fun onEventMainThread(event: BaseEvent?) {
@@ -347,16 +367,16 @@
                    toast("收到显示屏信息")
                }
            }
            BaseEvent.UPDATA_MAIN_CAR->{
            BaseEvent.UPDATA_MAIN_CAR -> {
                try {
                    mainFragment.refresh()
                }catch (e:Exception){
                } catch (e: Exception) {
                }
            }
            BaseEvent.ERROR_INFO -> {
                try {
                    mainFragment.refresh()
                }catch (e:Exception){
                } catch (e: Exception) {
                }
            }
        }
@@ -373,7 +393,7 @@
            CacheKey.putKeyStr("location", Gson().toJson(p0))
        } else {
            p0.let {
//                toast("定位失败" + it.errorCode.toString())
                //                toast("定位失败" + it.errorCode.toString())
            }
        }
    }
@@ -385,7 +405,13 @@
            if (bean.data.version != "" && bean.data.version != Utils.getAppVersion(this)) {
                if (bean.data.mandatory == 0) {
                    var pop =
                        DialogUtil.getSlabDelAndSurePopWindow(true,this, "确定", "取消", "有新版本是否更新", {}) {
                        DialogUtil.getSlabDelAndSurePopWindow(
                            true,
                            this,
                            "确定",
                            "取消",
                            "有新版本是否更新",
                            {}) {
                            DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
                        }
                    pop.showCenter(window.decorView)
@@ -414,7 +440,7 @@
        if (jobNum.isNotEmpty()) {
            var map = getMapByAny()
            map["taxiAptitudeCard"] = identification
            callNet(this, Api.loginByTaxiAptitudeCard, map,{
            callNet(this, Api.loginByTaxiAptitudeCard, map, {
                var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("identification", identification)
                CacheKey.putKeyStr("appid", bean.data.appid)
@@ -429,7 +455,7 @@
        } else if (identification.isNotEmpty()) {
            var map = getMapByAny()
            map["taxiAptitudeCard"] = identification
            callNet(this, Api.loginByTaxiAptitudeCard, map,{
            callNet(this, Api.loginByTaxiAptitudeCard, map, {
                var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("identification", identification)
                CacheKey.putKeyStr("appid", bean.data.appid)

 app/src/main/java/com/okgoincar/utils/EasePopup/EasyPopup.java

@@ -25,6 +25,11 @@
    }

    @Override
    public void onDismiss() {
        super.onDismiss();
    }

    @Override
    protected void initAttributes() {

    }