commit 9.29

唐浩

2020-09-29 49fe3bb67505e2bbd9718936ba54e98ee2a598f5

commit 9.29

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

@@ -146,18 +146,18 @@
                if (bean.startTime <= 0L) {
                    if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
                        CacheKey.saveLocalOrderBeanNull()
                        MyApplication.currentOrderId = ""
                        toast("调用正常结束，在异常订单中")
                        callEndOrder(contexts,bean.money)
                    }
                }else{
                    if (NetUtils.isNetworkConnected(MyApplication.getInstance())){
                        CacheKey.saveLocalOrderBeanNull()
                        MyApplication.currentOrderId = ""
                        val map = getMapByAny()
                        map["orderId"] = bean.orderId
                        map["orderType"] = bean.orderType
                        map["type"] = "1"
                        map["travelFee"] = bean.money
                        CacheKey.saveLocalOrderBeanNull()
                        toast("调用异常结束，在异常订单中 id==="+bean.orderId)
                        callNet(contexts, "api/order/confirmFees$", map,{
                            toast("上传异常订单成功")
                            EventBus.getDefault().post(BaseEvent(BaseEvent.ERROR_INFO))

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

@@ -56,4 +56,6 @@
    public void setMoney(double money) {
        this.money = money;
    }


}

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

@@ -38,7 +38,12 @@
        showHeader(false)

        if (isMoreLogin){
//            DialogUtil.getSlabDelAndSurePopWindow()
            window.decorView.post {
                var pop =  DialogUtil.getSlabDelAndSurePopWindow(false,this,"确定","取消","您的账号在其他车载端登录，或者在本机长时间未登录，需要重新登签！",{}){

                }
                pop.showCenter(window.decorView)
            }
        }
    }

@@ -46,7 +51,8 @@
        tv_login.clickDelay {
            //            51168119911111447X  15928265276 11111q
//            450211198101280848 黄桥账号
            toLoginActivity(this, et_number.getContent())
            toLoginActivity(this, "450211198101280848")
//            toLoginActivity(this, et_number.getContent())
        }
    }


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

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

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

@@ -32,7 +32,7 @@
        if (!data.data.isNullOrEmpty()){
            if ((data.data[0].state == 2 || data.data[0].state == 3 || data.data[0].state == 4 || data.data[0].state == 5 || data.data[0].state == 6) && data.data.size >= 1) {
                MyApplication.currentOrderId = data.data[0].id.toString()
                MyApplication.currentOrderId = data.data[0].type.toString()
                MyApplication.currentOrderType = data.data[0].type.toString()
            }
        }
        return data.data

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

@@ -366,7 +366,7 @@
    private fun initMineLocation() {
        AMapKit.initLocation(this, AMapLocationListener {
            it?.let {
                toast("errorCode=="+it.errorCode.toString()+"latitude=="+it.latitude.toString())
//                toast("errorCode=="+it.errorCode.toString()+"latitude=="+it.latitude.toString())
                if (it.errorCode == 0) {
                    MyApplication.aMapLocation = it
                    carMarker!!.position = LatLng(it.latitude, it.longitude)

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

@@ -300,7 +300,7 @@
            android:background="@drawable/bg_event_btn_one"
            android:gravity="center"
            android:text="返回首页"
            android:textColor="#ffffffff"
            android:textColor="@color/slab_green_over"
            android:textSize="40sp" />