8.3

liugl

2020-08-03 4912c06eaec62476354d0befa97ea3029cf756ed

8.3

 app/build.gradle

@@ -26,7 +26,7 @@
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 13
        versionName "13.0"
        versionName "13"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

 app/src/main/java/com/okgoincar/bean/VersionBean.java

@@ -90,5 +90,25 @@
        public void setVersion(String version) {
            this.version = version;
        }

        @Override
        public String toString() {
            return "DataBean{" +
                    "content='" + content + '\'' +
                    ", id=" + id +
                    ", mandatory=" + mandatory +
                    ", url='" + url + '\'' +
                    ", version='" + version + '\'' +
                    '}';
        }
    }

    @Override
    public String toString() {
        return "VersionBean{" +
                "code=" + code +
                ", data=" + data +
                ", msg='" + msg + '\'' +
                '}';
    }
}

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

@@ -44,10 +44,12 @@
    public static class DataBean{
        private int type = 2;
        private int userId = NetKitKt.getUserId();
        private String device = "carDevice";

        public DataBean() {
            type = 2;
            userId =  NetKitKt.getUserId();
            device = "carDevice";
        }
    }


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

@@ -94,7 +94,7 @@
        initCall()
        NettyClient.getInstance().startService()
        callPersion()
        showOrder("2221", "2", 100, 2)
//        showOrder("2221", "2", 100, 2)
        callVersion()
    }

@@ -284,12 +284,12 @@
            var bean = gson.fromJson<VersionBean>(it, VersionBean::class.java)
            if (bean.data.version != "" && bean.data.version != Utils.getAppVersion(this)) {
                if (bean.data.mandatory == 0) {
                    var pop = DialogUtil.getSlabDelAndSurePopWindow(this, "有新版本是否更新", {}) {
                    var pop = DialogUtil.getSlabDelAndSurePopWindow(this, "确定" ,"取消","有新版本是否更新", {}) {
                        DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
                    }
                    pop.showCenter(window.decorView)
                } else {
                    var pop = DialogUtil.getSlabDelAndSurePopWindow(this, "版本已过时，是否强制升级?", {}) {
                    var pop = DialogUtil.getSlabDelAndSurePopWindow(this,"确定" ,"取消","版本已过时，是否强制升级?", {}) {
                        DownloadUtil(this).downloadAPK(bean.data.url, "ok出行车载端")
                        toast("后台开始下载，请等待")
                    }

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

@@ -408,9 +408,9 @@
        callNet(this, Api.queryOrderInfo, map) {
            orderBean = gson.fromJson(it, OrderBean::class.java)
            showUi(orderBean)
            Handler(Looper.getMainLooper()).postDelayed({
                startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
            },1000)
//            Handler(Looper.getMainLooper()).postDelayed({
//                startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
//            },1000)
        }
        callPersion()
    }

 app/src/main/java/com/okgoincar/slab/util/DialogUtil.kt

@@ -133,6 +133,23 @@
        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
        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 {
            dialog.dismiss()
            clickSure()
        }
        view.tv_view_two_base.text = content
        return dialog
    }
//
//    fun getNetListDialog(arrayList: ArrayList<String>,showView: View,context: Context,okclick:(allMode:String) -> Unit):EasyPopup{
//        var pop = getPopupwindow(context,R.layout.dialog_server_mode)

 app/src/main/res/layout/slab_activity_main.xml

@@ -27,7 +27,7 @@
            android:layout_marginEnd="15dp"
            android:layout_weight="1"
            android:gravity="center"
            android:text="出租(1)"
            android:text="出租"
            android:textColor="@color/main_yellow"
            android:textSize="31sp"
            android:textStyle="bold" />