8.7

liugl

2020-08-07 a926b50fb8fd8995cdb5c10ec07dafcff888183b

8.7

 app/build.gradle

@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 16
        versionName "16"
        versionCode 17
        versionName "17"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {

 app/src/main/ic_launcher-playstore.png

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

@@ -39,13 +39,6 @@
                        var mileage = intent.getDoubleExtra("mileage", 0.0) //里程，单位为km
                        callOver(contexts!!, price)
                    }

                    "android.net.conn.CONNECTIVITY_SUCCESS", "android.net.conn.CONNECTIVITY_FAILURE", "android.net.conn.CONNECTIVITY_CHANGE" -> {
//                        toast("收到网络变化")
//                        if (NetUtils.isNetworkConnected(MyApplication.getInstance())) {
//                            callErrorOrder(contexts!!)
//                        }
                    }
                }
            }
        } catch (e: Exception) {
@@ -105,7 +98,7 @@
                } else {
                    val bean = CacheKey.getLocalOrderBean()
                    bean?.let {
                        if (bean.money >= 0.0) {
                        if (bean.money > 0.0) {
                            return@callOver
                        }
                        bean.endTime = System.currentTimeMillis()
@@ -126,6 +119,7 @@
                if (bean.money <= 0.0) {
                    return@let
                }
                CacheKey.saveLocalOrderBeanNull()
                val map = getMapByAny()
                map["orderId"] = bean.orderId
                map["orderType"] = bean.orderType
@@ -133,7 +127,6 @@
                map["travelFee"] = bean.money
                callNet(contexts, "api/order/confirmFees$", map) {
                    toast("上传异常订单成功")
                    CacheKey.saveLocalOrderBeanNull()
                    EventBus.getDefault().post(BaseEvent(BaseEvent.ERROR_INFO))
                }
            }

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

@@ -259,9 +259,9 @@
            bean.data = dataBean
            NettyClient.getInstance()
                .sendMessage(Gson().toJson(bean))
            Handler(Looper.getMainLooper()).post {
                toast("发送location --> $dataBean")
            }
//            Handler(Looper.getMainLooper()).post {
//                toast("发送location --> $dataBean")
//            }
            sysErr(dataBean.toString())
        }
    }

 app/src/main/java/com/okgoincar/netUtls/NetKit.kt

@@ -51,6 +51,12 @@
            clickAction(responseString)
        }

        override fun onError(code: Int, msg: String?, resposeString: String?) {
            super.onError(code, msg, resposeString)
            if (showDialog)
                dismissDialog()
        }

    })
}

@@ -69,6 +75,11 @@
        override fun success(responseString: String?) {
            dismissDialog()
            clickAction(responseString)
        }

        override fun onError(code: Int, msg: String?, resposeString: String?) {
            super.onError(code, msg, resposeString)
            dismissDialog()
        }
    })
}
@@ -186,6 +197,12 @@
            clickAction(responseString)
        }

        override fun onError(code: Int, msg: String?, resposeString: String?) {
            super.onError(code, msg, resposeString)
            if (showDialog)
                dismissDialog()
        }

    })
}

@@ -209,6 +226,7 @@
        }

        override fun onError(code: Int, msg: String?, resposeString: String?) {
            dismissDialog()
            clickActionError(resposeString)
        }
    })
@@ -236,7 +254,7 @@

        override fun onError(code: Int, msg: String?, resposeString: String?) {
            super.onError(code, msg, resposeString)

            dismissDialog()
            clickActionError(msg)
        }
    })
@@ -258,6 +276,10 @@
        override fun success(responseString: String?) {
            clickAction(responseString)
        }

        override fun onError(code: Int, msg: String?, resposeString: String?) {
            super.onError(code, msg, resposeString)
        }
    })
}


 app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java

@@ -101,7 +101,7 @@
    @Override
    protected void onNetworkConnected(NetUtils.NetType type) {
        super.onNetworkConnected(type);
        toast("收到网络变化");
//        toast("收到网络变化");
        if (NetUtils.isNetworkConnected(MyApplication.Companion.getInstance())) {
            MoneyBroadCastReceiver.Companion.callErrorOrder(this);
        }

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

@@ -140,7 +140,7 @@
            tv_current_time.text = DateUtil.getTime(
                DateUtil.TYPE7,
                System.currentTimeMillis()
            ) + "\n" + DateUtil.getWeek(System.currentTimeMillis())
            ) + DateUtil.getWeek(System.currentTimeMillis())
        }
    }

@@ -203,7 +203,6 @@
        }

        tv_name.clickDelay {
            toast("点亮网约")
        }

        tv_car_num.clickDelay {
@@ -224,6 +223,7 @@
        }

        tv_title_top.clickDelay {

        }

        view_mode.clickDelay {
@@ -232,10 +232,12 @@
                CacheKey.putKeyStr("date_mode", System.currentTimeMillis().toString())
                CacheKey.putKeyStr("mode_now_time", "1")//记录为点击切换的颜色 1 白色 2 黑色
                setBlackMode(false)
                mainFragment.adapter.notifyDataSetChanged()
            } else {
                CacheKey.putKeyStr("date_mode", System.currentTimeMillis().toString())
                CacheKey.putKeyStr("mode_now_time", "2")
                setBlackMode(true)
                mainFragment.adapter.notifyDataSetChanged()
            }


@@ -299,16 +301,16 @@

    override fun onLocationChanged(p0: AMapLocation?) {
        if (p0 == null) {
            toast("高德位置是空的")
//            toast("高德位置是空的")
            return
        }
        if (p0.errorCode == 0) {
            toast("定位成功")
//            toast("定位成功")
            MyApplication.aMapLocation = p0
            CacheKey.putKeyStr("location", Gson().toJson(p0))
        } else {
            p0.let {
                toast("定位失败" + it.errorCode.toString())
//                toast("定位失败" + it.errorCode.toString())
            }
        }
    }

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

@@ -15,6 +15,7 @@
import com.okgoincar.netUtls.timeOver
import com.okgoincar.utils.MyUtils
import kotlinx.android.synthetic.main.activity_order_over.*
import java.lang.Exception

class SlabOrderOverActivity : MySlabBaseActivity() {

@@ -42,7 +43,7 @@
    override fun onPause() {
        super.onPause()
        if (time != null){
            time!!.onFinish()
            time!!.cancel()
        }
    }

@@ -111,6 +112,7 @@
                MyUtils.getInstans().CallPhone(this, it.data.phone.toString())
            }
            tv_pay_result_money.text = "￥" + it.data.orderMoney.toString()
            tv_pay_result_small_money.text = "¥" + it.data.tipMoney.toString()
            tv_time.text = it.data.travelTime
            tv_start_address.text = it.data.startAddress
            tv_end_address.text = it.data.endAddress
@@ -148,10 +150,16 @@
                    if (it.status == 8||it.status == 7) {
                        tv_pay_result_money.textColor(this@SlabOrderOverActivity,R.color.slab_green_over)
                        Handler(Looper.getMainLooper()).post {
                            time = timeOver (5000){
                            time = timeOver (20000){
                                tv_title_slab.text = "已完成($it)"
                                if (it == 0){
                                    onBackPressed()
                                    if (time != null){
                                        time!!.cancel()
                                    }
                                    try {
                                        onBackPressed()
                                    }catch (e:Exception){
                                    }
                                }
                            }
                        }

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

@@ -124,7 +124,7 @@
            tv_name.textColor(this, R.color.black)
            tv_car_num.textColor(this, R.color.black)
            tv_phone.textColor(this, R.color.black)
            tv_phone.setDrawableNull()
            tv_phone.setDrawableLeft(R.mipmap.car_phone_bkack)
            tv_time.textColor(this, R.color.black)
            tv_start_address.textColor(this, R.color.black)
            tv_end_address.textColor(this, R.color.black)
@@ -464,7 +464,7 @@
            tv_current_time.text = DateUtil.getTime(
                DateUtil.TYPE7,
                System.currentTimeMillis()
            ) + "\n" + DateUtil.getWeek(System.currentTimeMillis())
            ) +  DateUtil.getWeek(System.currentTimeMillis())
        }
    }

@@ -533,7 +533,6 @@
        getAllMark(it)
        when (it.data.orderState) {
            2, 3 -> {
                toast("点亮网约")
                clickBroad()
                iv_to_gd.visible()
                makeMarker?.isVisible = true
@@ -549,7 +548,6 @@
                }
            }
            4 -> {
                toast("点亮网约")
                clickBroad()
                iv_to_gd.gone()
                closeLine()

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

@@ -271,7 +271,7 @@
                android:id="@+id/tv_pay_result_small_money"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="¥2.00"
                android:text=""
                android:textColor="@color/main_yellow_qian_y"
                android:textSize="26sp"/>


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

@@ -16,6 +16,7 @@
            android:id="@+id/btn_start"
            android:layout_width="wrap_content"
            android:layout_marginStart="150dp"
            android:visibility="gone"
            android:text="开始行程"
            android:layout_height="match_parent"/>

@@ -23,6 +24,7 @@
            android:id="@+id/btn_end"
            android:layout_width="wrap_content"
            android:layout_marginStart="300dp"
            android:visibility="gone"
            android:text="结束行程"
            android:layout_height="match_parent"/>

@@ -335,7 +337,7 @@
            android:layout_width="200dp"
            android:layout_height="200dp"
            android:layout_alignParentEnd="true"
            android:layout_marginTop="153dp"
            android:layout_marginTop="160dp"
            android:layout_marginEnd="26dp" />

        <TextView

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

@@ -201,9 +201,9 @@

    <ImageView
        android:id="@+id/iv_head"
        android:layout_width="170dp"
        android:layout_height="170dp"
        android:layout_marginTop="75dp"
        android:layout_width="200dp"
        android:layout_height="200dp"
        android:layout_marginTop="80dp"
        android:layout_marginEnd="26dp"
        android:elevation="5dp"
        android:scaleType="centerCrop"

 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_background" />
    <foreground android:drawable="@drawable/ic_launcher_foreground" />
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_background" />
    <foreground android:drawable="@drawable/ic_launcher_foreground" />
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

 app/src/main/res/mipmap-hdpi/ic_launcher.png

 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png

 app/src/main/res/mipmap-hdpi/ic_launcher_round.png

 app/src/main/res/mipmap-mdpi/ic_launcher.png

 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png

 app/src/main/res/mipmap-mdpi/ic_launcher_round.png

 app/src/main/res/mipmap-xhdpi/ic_launcher.png

 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png

 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png

 app/src/main/res/mipmap-xxhdpi/car_phone_bkack.png

 app/src/main/res/mipmap-xxhdpi/ic_launcher.png

 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png

 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png

 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png

 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png

 app/src/main/res/values/ic_launcher_background.xml

New file
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="ic_launcher_background">#FFFFFF</color>
</resources>