android/OkGoinCar.git

parent: 6881a0f9 | 补丁 | 提交 | show whitespace

liugl

2020-09-10 40a8a2c243c15fe8d4eb46f4dbc42a290bd0a63a

9.10

7个文件已修改

	app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/netUtls/Api.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabLoginActivity.kt	66 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_order_over.xml	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -67,13 +67,40 @@
        }
    }

//    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
//        var map = getMapByAny()
//        map["identification"] = driverCertificate
//        callNet(context!!, Api.loginByIdentification, map) {
//            toast("登录成功")
//            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
//            CacheKey.putKeyStr("identification", driverCertificate!!)
//            CacheKey.putKeyStr("appid", bean.data.appid)
//            CacheKey.putKeyStr("token", bean.data.token)
//            CacheKey.putKeyStr("userId", bean.data.id.toString())
//            CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
//            CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//            Handler(Looper.getMainLooper()).post {
//                var intent = Intent()
//                intent.setClass(context, SlabMainActivity::class.java)
//                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
//                context.startActivity(intent)
//            }
//        }
//    }

    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
        var map = getMapByAny()
        map["identification"] = driverCertificate
        callNet(context!!, Api.loginByIdentification, map) {
        if (driverCertificate.isNullOrEmpty()){
//            toast("资格证号：空")
            return
        }else{
//            toast("资格证号："+driverCertificate)
        }
        map["taxiAptitudeCard"] = driverCertificate
        callNet(context!!, Api.loginByTaxiAptitudeCard, map) {
            toast("登录成功")
            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
            CacheKey.putKeyStr("identification", driverCertificate!!)
            CacheKey.putKeyStr("identification", driverCertificate)
            CacheKey.putKeyStr("appid", bean.data.appid)
            CacheKey.putKeyStr("token", bean.data.token)
            CacheKey.putKeyStr("userId", bean.data.id.toString())

 app/src/main/java/com/okgoincar/netUtls/Api.java

@@ -34,6 +34,8 @@
    public static String work2 = "api/driver/work2"; //api/driver/work2 司机上下班操作
    public static String loginByIdentification = "base/driver/loginByIdentification"; //api/driver/work2 司机身份证登录
    public static String loginOut = "api/driver/loginOut"; ///api/driver/loginOut 司机退出登录
    public static String loginByTaxiAptitudeCard = "base/driver/loginByTaxiAptitudeCard";
    public static String completeOrder = "api/taxi/completeOrder"; // /api/taxi/completeOrder 手动确认订单完成


    /***

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

@@ -228,7 +228,6 @@
        } else {
            startActivity(tClass);
        }

    }

    public void startActivityResult(Class tClass, int code) {

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

@@ -1,6 +1,7 @@
package com.okgoincar.slab

import android.content.Context
import android.content.Intent
import android.os.Handler
import android.os.Looper
import android.widget.Toast
@@ -45,25 +46,26 @@

    override fun setOnclick() {
        tv_login.clickDelay {
            if (et_number.getContent().isNullOrEmpty()) {
                toast("请输入工号")
                return@clickDelay
            }
            var map = getMapByAny()
            map["jobNum"] = et_number.getContent().trim()
            callNet(true, Api.loginByJobNumber, map) {
                toast("登录成功")
                var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("jobNum",et_number.getContent().trim())
                CacheKey.putKeyStr("appid", bean.data.appid)
                CacheKey.putKeyStr("token", bean.data.token)
                CacheKey.putKeyStr("userId", bean.data.id.toString())
                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
                finish()
                startActivity<SlabMainActivity>()
            }
//            toLoginActivity(this,"452229198204010012")
//            if (et_number.getContent().isNullOrEmpty()) {
//                toast("请输入工号")
//                return@clickDelay
//            }
//            var map = getMapByAny()
//            map["jobNum"] = et_number.getContent().trim()
//            callNet(true, Api.loginByJobNumber, map) {
//                toast("登录成功")
//                var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
//                CacheKey.putKeyStr("jobNum",et_number.getContent().trim())
//                CacheKey.putKeyStr("appid", bean.data.appid)
//                CacheKey.putKeyStr("token", bean.data.token)
//                CacheKey.putKeyStr("userId", bean.data.id.toString())
//                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
//                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//                finish()
//                startActivity<SlabMainActivity>()
//            }
//            51168119911111447X  15928265276 11111q
//            toLoginActivity(this,"51168119911111447X")

        }
    }
@@ -94,19 +96,41 @@
        }
    }

//    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
//        var map = getMapByAny()
//        map["taxiAptitudeCard"] = driverCertificate
//        callNet(context!!,Api.loginByTaxiAptitudeCard,map){
//            cn.sinata.xldutils.utils.toast("登录成功")
//            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
//            CacheKey.putKeyStr("appid", bean.data.appid)
//            CacheKey.putKeyStr("token", bean.data.token)
//            CacheKey.putKeyStr("userId", bean.data.id.toString())
//            CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
//            CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
//            Handler(Looper.getMainLooper()).post {
//                context.startActivity<SlabMainActivity>()
//            }
//        }
//    }


    private fun toLoginActivity(context: Context?, driverCertificate: String?) {
        var map = getMapByAny()
        map["identification"] = driverCertificate
        callNet(context!!,Api.loginByIdentification,map){
            cn.sinata.xldutils.utils.toast("登录成功")
            toast("登录成功")
            var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
            CacheKey.putKeyStr("identification", driverCertificate!!)
            CacheKey.putKeyStr("appid", bean.data.appid)
            CacheKey.putKeyStr("token", bean.data.token)
            CacheKey.putKeyStr("userId", bean.data.id.toString())
            CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
            CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
            Handler(Looper.getMainLooper()).post {
                context.startActivity<SlabMainActivity>()
                var intent = Intent()
                intent.setClass(context, SlabMainActivity::class.java)
                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                context.startActivity(intent)
            }
        }
    }

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

@@ -401,10 +401,12 @@
        var identification = CacheKey.getKeyStr("identification")
        if (jobNum.isNotEmpty()) {
            var map = getMapByAny()
            map["jobNum"] = jobNum
            callNet(true, Api.loginByJobNumber, map) {
                var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("jobNum", jobNum)
            map["taxiAptitudeCard"] = identification
            callNet(this, Api.loginByTaxiAptitudeCard, map,{
                ok()
            }) {
                var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
                CacheKey.putKeyStr("identification", identification)
                CacheKey.putKeyStr("appid", bean.data.appid)
                CacheKey.putKeyStr("token", bean.data.token)
                CacheKey.putKeyStr("userId", bean.data.id.toString())
@@ -414,8 +416,8 @@
            }
        } else if (identification.isNotEmpty()) {
            var map = getMapByAny()
            map["identification"] = identification
            callNet(true, Api.loginByIdentification, map) {
            map["taxiAptitudeCard"] = identification
            callNet(true, 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/slab/SlabOrderOverActivity.kt

@@ -154,12 +154,12 @@
                            R.color.slab_green_over
                        )
                        Handler(Looper.getMainLooper()).post {
                            if (isPlay)
                            {
                            if (isPlay) {
                                return@post
                            }
                            isPlay = true
                            MyApplication.getTTsManager().setVideoText("乘客已支付"+orderBean?.data?.orderMoney.toString()+"元")
                            MyApplication.getTTsManager()
                                .setVideoText("乘客已支付" + orderBean?.data?.orderMoney.toString() + "元")
                            time = timeOver(20000) {
                                tv_title_slab.text = "已完成($it)"
                                if (it == 0) {
@@ -226,12 +226,12 @@
                        R.color.slab_green_over
                    )
                    Handler(Looper.getMainLooper()).post {
                        if (isPlay)
                        {
                        if (isPlay) {
                            return@post
                        }
                        isPlay = true
                        MyApplication.getTTsManager().setVideoText("乘客已支付"+ orderBean.data?.orderMoney.toString()+"元")
                        MyApplication.getTTsManager()
                            .setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
                        time = timeOver(20000) {
                            tv_title_slab.text = "已完成($it)"
                            if (it == 0) {
@@ -282,5 +282,46 @@
        tv_to_main.clickDelay {
            onBackPressed()
        }

        tv_complete.clickDelay {
            callComplete() {
                tv_complete.gone()
                tv_pay_result_money.textColor(
                    this@SlabOrderOverActivity,
                    R.color.slab_green_over
                )
                Handler(Looper.getMainLooper()).post {
                    if (isPlay) {
                        return@post
                    }
                    isPlay = true
                    MyApplication.getTTsManager()
                        .setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
                    time = timeOver(20000) {
                        tv_title_slab.text = "已完成($it)"
                        if (it == 0) {
                            if (time != null) {
                                time!!.cancel()
                            }
                            try {
                                onBackPressed()
                            } catch (e: Exception) {
                            }
                        }
                    }
                }
            }
        }
    }

    private fun callComplete(function: () -> Unit) {
        var map = getMapByAny()
        map["orderId"] = orderId
        map["orderType"] = orderType
        callNet(Api.completeOrder,map,{
            function()
        }){

        }
    }
}

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

@@ -282,6 +282,17 @@
        <include layout="@layout/include_weight_height"/>

        <TextView
            android:id="@+id/tv_complete"
            android:layout_width="wrap_content"
            android:text="我已付款 >"
            android:textSize="30sp"
            android:layout_gravity="center"
            android:layout_marginBottom="10dp"
            android:textColor="@color/main_yellow"
            android:gravity="center"
            android:layout_height="70dp"/>

        <TextView
            android:id="@+id/tv_to_main"
            android:layout_width="match_parent"
            android:layout_height="100dp"

			@@ -67,13 +67,40 @@
			}
			}

			// private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			// var map = getMapByAny()
			// map["identification"] = driverCertificate
			// callNet(context!!, Api.loginByIdentification, map) {
			// toast("登录成功")
			// var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			// CacheKey.putKeyStr("identification", driverCertificate!!)
			// CacheKey.putKeyStr("appid", bean.data.appid)
			// CacheKey.putKeyStr("token", bean.data.token)
			// CacheKey.putKeyStr("userId", bean.data.id.toString())
			// CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			// CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			// Handler(Looper.getMainLooper()).post {
			// var intent = Intent()
			// intent.setClass(context, SlabMainActivity::class.java)
			// intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
			// context.startActivity(intent)
			// }
			// }
			// }

			private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			var map = getMapByAny()
			map["identification"] = driverCertificate
			callNet(context!!, Api.loginByIdentification, map) {
			if (driverCertificate.isNullOrEmpty()){
			// toast("资格证号：空")
			return
			}else{
			// toast("资格证号："+driverCertificate)
			}
			map["taxiAptitudeCard"] = driverCertificate
			callNet(context!!, Api.loginByTaxiAptitudeCard, map) {
			toast("登录成功")
			var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			CacheKey.putKeyStr("identification", driverCertificate!!)
			CacheKey.putKeyStr("identification", driverCertificate)
			CacheKey.putKeyStr("appid", bean.data.appid)
			CacheKey.putKeyStr("token", bean.data.token)
			CacheKey.putKeyStr("userId", bean.data.id.toString())

			@@ -34,6 +34,8 @@
			public static String work2 = "api/driver/work2"; //api/driver/work2 司机上下班操作
			public static String loginByIdentification = "base/driver/loginByIdentification"; //api/driver/work2 司机身份证登录
			public static String loginOut = "api/driver/loginOut"; ///api/driver/loginOut 司机退出登录
			public static String loginByTaxiAptitudeCard = "base/driver/loginByTaxiAptitudeCard";
			public static String completeOrder = "api/taxi/completeOrder"; // /api/taxi/completeOrder 手动确认订单完成


			/***

			@@ -228,7 +228,6 @@
			} else {
			startActivity(tClass);
			}

			}

			public void startActivityResult(Class tClass, int code) {

			@@ -1,6 +1,7 @@
			package com.okgoincar.slab

			import android.content.Context
			import android.content.Intent
			import android.os.Handler
			import android.os.Looper
			import android.widget.Toast
			@@ -45,25 +46,26 @@

			override fun setOnclick() {
			tv_login.clickDelay {
			if (et_number.getContent().isNullOrEmpty()) {
			toast("请输入工号")
			return@clickDelay
			}
			var map = getMapByAny()
			map["jobNum"] = et_number.getContent().trim()
			callNet(true, Api.loginByJobNumber, map) {
			toast("登录成功")
			var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
			CacheKey.putKeyStr("jobNum",et_number.getContent().trim())
			CacheKey.putKeyStr("appid", bean.data.appid)
			CacheKey.putKeyStr("token", bean.data.token)
			CacheKey.putKeyStr("userId", bean.data.id.toString())
			CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			finish()
			startActivity<SlabMainActivity>()
			}
			// toLoginActivity(this,"452229198204010012")
			// if (et_number.getContent().isNullOrEmpty()) {
			// toast("请输入工号")
			// return@clickDelay
			// }
			// var map = getMapByAny()
			// map["jobNum"] = et_number.getContent().trim()
			// callNet(true, Api.loginByJobNumber, map) {
			// toast("登录成功")
			// var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
			// CacheKey.putKeyStr("jobNum",et_number.getContent().trim())
			// CacheKey.putKeyStr("appid", bean.data.appid)
			// CacheKey.putKeyStr("token", bean.data.token)
			// CacheKey.putKeyStr("userId", bean.data.id.toString())
			// CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			// CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			// finish()
			// startActivity<SlabMainActivity>()
			// }
			// 51168119911111447X 15928265276 11111q
			// toLoginActivity(this,"51168119911111447X")

			}
			}
			@@ -94,19 +96,41 @@
			}
			}

			// private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			// var map = getMapByAny()
			// map["taxiAptitudeCard"] = driverCertificate
			// callNet(context!!,Api.loginByTaxiAptitudeCard,map){
			// cn.sinata.xldutils.utils.toast("登录成功")
			// var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			// CacheKey.putKeyStr("appid", bean.data.appid)
			// CacheKey.putKeyStr("token", bean.data.token)
			// CacheKey.putKeyStr("userId", bean.data.id.toString())
			// CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			// CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			// Handler(Looper.getMainLooper()).post {
			// context.startActivity<SlabMainActivity>()
			// }
			// }
			// }


			private fun toLoginActivity(context: Context?, driverCertificate: String?) {
			var map = getMapByAny()
			map["identification"] = driverCertificate
			callNet(context!!,Api.loginByIdentification,map){
			cn.sinata.xldutils.utils.toast("登录成功")
			toast("登录成功")
			var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			CacheKey.putKeyStr("identification", driverCertificate!!)
			CacheKey.putKeyStr("appid", bean.data.appid)
			CacheKey.putKeyStr("token", bean.data.token)
			CacheKey.putKeyStr("userId", bean.data.id.toString())
			CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
			CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
			Handler(Looper.getMainLooper()).post {
			context.startActivity<SlabMainActivity>()
			var intent = Intent()
			intent.setClass(context, SlabMainActivity::class.java)
			intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
			context.startActivity(intent)
			}
			}
			}

			@@ -401,10 +401,12 @@
			var identification = CacheKey.getKeyStr("identification")
			if (jobNum.isNotEmpty()) {
			var map = getMapByAny()
			map["jobNum"] = jobNum
			callNet(true, Api.loginByJobNumber, map) {
			var bean = gson.fromJson<LoginBean>(it, LoginBean::class.java)
			CacheKey.putKeyStr("jobNum", jobNum)
			map["taxiAptitudeCard"] = identification
			callNet(this, Api.loginByTaxiAptitudeCard, map,{
			ok()
			}) {
			var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			CacheKey.putKeyStr("identification", identification)
			CacheKey.putKeyStr("appid", bean.data.appid)
			CacheKey.putKeyStr("token", bean.data.token)
			CacheKey.putKeyStr("userId", bean.data.id.toString())
			@@ -414,8 +416,8 @@
			}
			} else if (identification.isNotEmpty()) {
			var map = getMapByAny()
			map["identification"] = identification
			callNet(true, Api.loginByIdentification, map) {
			map["taxiAptitudeCard"] = identification
			callNet(true, Api.loginByTaxiAptitudeCard, map) {
			var bean = Gson().fromJson<LoginBean>(it, LoginBean::class.java)
			CacheKey.putKeyStr("identification", identification)
			CacheKey.putKeyStr("appid", bean.data.appid)

			@@ -154,12 +154,12 @@
			R.color.slab_green_over
			)
			Handler(Looper.getMainLooper()).post {
			if (isPlay)
			{
			if (isPlay) {
			return@post
			}
			isPlay = true
			MyApplication.getTTsManager().setVideoText("乘客已支付"+orderBean?.data?.orderMoney.toString()+"元")
			MyApplication.getTTsManager()
			.setVideoText("乘客已支付" + orderBean?.data?.orderMoney.toString() + "元")
			time = timeOver(20000) {
			tv_title_slab.text = "已完成($it)"
			if (it == 0) {
			@@ -226,12 +226,12 @@
			R.color.slab_green_over
			)
			Handler(Looper.getMainLooper()).post {
			if (isPlay)
			{
			if (isPlay) {
			return@post
			}
			isPlay = true
			MyApplication.getTTsManager().setVideoText("乘客已支付"+ orderBean.data?.orderMoney.toString()+"元")
			MyApplication.getTTsManager()
			.setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
			time = timeOver(20000) {
			tv_title_slab.text = "已完成($it)"
			if (it == 0) {
			@@ -282,5 +282,46 @@
			tv_to_main.clickDelay {
			onBackPressed()
			}

			tv_complete.clickDelay {
			callComplete() {
			tv_complete.gone()
			tv_pay_result_money.textColor(
			this@SlabOrderOverActivity,
			R.color.slab_green_over
			)
			Handler(Looper.getMainLooper()).post {
			if (isPlay) {
			return@post
			}
			isPlay = true
			MyApplication.getTTsManager()
			.setVideoText("乘客已支付" + orderBean.data?.orderMoney.toString() + "元")
			time = timeOver(20000) {
			tv_title_slab.text = "已完成($it)"
			if (it == 0) {
			if (time != null) {
			time!!.cancel()
			}
			try {
			onBackPressed()
			} catch (e: Exception) {
			}
			}
			}
			}
			}
			}
			}

			private fun callComplete(function: () -> Unit) {
			var map = getMapByAny()
			map["orderId"] = orderId
			map["orderType"] = orderType
			callNet(Api.completeOrder,map,{
			function()
			}){

			}
			}
			}

			@@ -282,6 +282,17 @@
			<include layout="@layout/include_weight_height"/>

			<TextView
			android:id="@+id/tv_complete"
			android:layout_width="wrap_content"
			android:text="我已付款 >"
			android:textSize="30sp"
			android:layout_gravity="center"
			android:layout_marginBottom="10dp"
			android:textColor="@color/main_yellow"
			android:gravity="center"
			android:layout_height="70dp"/>

			<TextView
			android:id="@+id/tv_to_main"
			android:layout_width="match_parent"
			android:layout_height="100dp"