liugl
2020-08-19 a0427086c4cb6dc63ee25963b8d1f13a1def3948
8.19 域名修改
4个文件已修改
27 ■■■■■ 已修改文件
app/build.gradle 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/netUtls/Api.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/build.gradle
@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 18
        versionName "18"
        versionCode 19
        versionName "19"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {
app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt
@@ -30,7 +30,6 @@
        try {
            Handler(Looper.getMainLooper()).post {
                val b = intent.getBooleanExtra("isLogin",true)
                toast("isLogin=$b")
                if (!b){
                    CacheUtil.get().clear()
                    EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -12,9 +12,9 @@
//    public static final int SOCKET_PORT = 9999;
    //外网
    public static final String BASE_URL = "http://39.108.148.228:80/driver/";
    public static final String BASE_URL = "https://okyueche:443/driver/";
    public static final String SOCKET_SERVER = "39.108.148.228";
    public static final int SOCKET_PORT = 8888;
    public static final int SOCKET_PORT = 9999;
    public static final  int SUCCESS = 200;
    /**
app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
@@ -98,7 +98,7 @@
        callNet(this, Api.queryOrderInfo, map) {
            orderBean = gson.fromJson(it, OrderBean::class.java)
            showUi(orderBean)
//            addSocketLisener()
            addSocketLisener(orderBean)
            checkOrderStatue()
        }
    }
@@ -143,22 +143,26 @@
        }
    }
    private fun addSocketLisener() {
    private fun addSocketLisener(orderBean: OrderBean?) {
        MyApplication.addOrderView(object : MyApplication.OrderStatueView {
            override fun orderInfo(data: OrderSimpleData?) {
                data?.let {
                    if (it.status == 8||it.status == 7) {
                        tv_pay_result_money.textColor(this@SlabOrderOverActivity,R.color.slab_green_over)
                        tv_pay_result_money.textColor(
                            this@SlabOrderOverActivity,
                            R.color.slab_green_over
                        )
                        Handler(Looper.getMainLooper()).post {
                            time = timeOver (20000){
                            MyApplication.getTTsManager().setVideoText("乘客已支付"+orderBean?.data?.orderMoney.toString()+"元")
                            time = timeOver(20000) {
                                tv_title_slab.text = "已完成($it)"
                                if (it == 0){
                                    if (time != null){
                                if (it == 0) {
                                    if (time != null) {
                                        time!!.cancel()
                                    }
                                    try {
                                        onBackPressed()
                                    }catch (e:Exception){
                                    } catch (e: Exception) {
                                    }
                                }
                            }