android/OkGoinCar.git

parent: fd725588 | 补丁 | 提交 | ignore whitespace

tanghao

2023-01-17 66d9ccf38814e8199b4ed2335c8c2d183b676380

1。4:处理预约单导致串单的问题 隐藏预约单
二次修改为测试环境

5个文件已修改

	app/src/main/AndroidManifest.xml	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/base/MainBroadCastReceiver.kt	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt	48 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/netUtls/Api.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/AndroidManifest.xml

@@ -68,34 +68,34 @@
        </provider>


<!--        <receiver android:name=".base.MainBroadCastReceiver"-->
<!--            android:enabled="true"-->
<!--            android:exported="true"-->
<!--            >-->
<!--            <intent-filter android:priority="1000">-->
<!--                <action android:name="Action" />-->
<!--                &lt;!&ndash;                //司机信息&ndash;&gt;-->
<!--                <action android:name="wisdom.intent.action.driverInfo" />-->
<!--                &lt;!&ndash;                //顶灯&ndash;&gt;-->
<!--                <action android:name="wisdom.intent.action.topLight" />-->
<!--            </intent-filter>-->
<!--        </receiver>-->
        <receiver android:name=".base.MainBroadCastReceiver"
            android:enabled="true"
            android:exported="true"
            >
            <intent-filter android:priority="1000">
                <action android:name="Action" />
                <!--                //司机信息-->
                <action android:name="wisdom.intent.action.driverInfo" />
                <!--                //顶灯-->
                <action android:name="wisdom.intent.action.topLight" />
            </intent-filter>
        </receiver>

<!--        <receiver android:name=".base.MoneyBroadCastReceiver"-->
<!--            android:enabled="true"-->
<!--            android:exported="true"-->
<!--            >-->
<!--            <intent-filter android:priority="1000">-->
<!--                <action android:name="Action" />-->
<!--                &lt;!&ndash;                //空重车状态&ndash;&gt;-->
<!--                <action android:name="wisdom.intent.action.ledLight" />-->
<!--                &lt;!&ndash;                //计价器&ndash;&gt;-->
<!--                <action android:name="wisdom.intent.action.priceDevice" />-->
<!--                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />-->
<!--                <action android:name="android.net.conn.CONNECTIVITY_SUCCESS" />-->
<!--                <action android:name="android.net.conn.CONNECTIVITY_FAILURE" />-->
<!--            </intent-filter>-->
<!--        </receiver>-->
        <receiver android:name=".base.MoneyBroadCastReceiver"
            android:enabled="true"
            android:exported="true"
            >
            <intent-filter android:priority="1000">
                <action android:name="Action" />
                <!--                //空重车状态-->
                <action android:name="wisdom.intent.action.ledLight" />
                <!--                //计价器-->
                <action android:name="wisdom.intent.action.priceDevice" />
                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
                <action android:name="android.net.conn.CONNECTIVITY_SUCCESS" />
                <action android:name="android.net.conn.CONNECTIVITY_FAILURE" />
            </intent-filter>
        </receiver>

        <meta-data
            android:name="design_width_in_dp"
@@ -117,55 +117,42 @@
        <service android:name="com.amap.api.track.AMapTrackService" />

        <activity
            android:exported="false"
            android:name="cn.sinata.xldutils.activitys.SlabBaseActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.event.SlabEventDetailActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.event.SlabHistoryEventActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.event.SlabMineEventActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.MySlabBaseActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.SlabFillOutActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.SlabLoginActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity android:name=".slab.SlabOrderListActivity"
            android:exported="false"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.SlabMainActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:exported="false"
            android:name=".slab.SlabOrderOverActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity android:name=".slab.SlabGetOrderFragment"
            android:exported="false"
            android:configChanges="orientation|screenSize|keyboardHidden"
            android:theme="@style/FadeDialog"/>
        <activity
            android:exported="false"
            android:name=".slab.SlabSelectServerModeActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />
        <activity
            android:name=".slab.SlabStartActivity"
            android:exported="false"
            android:configChanges="orientation|screenSize|keyboardHidden" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -174,7 +161,6 @@
            </intent-filter>
        </activity>
        <activity
            android:exported="false"
            android:name=".slab.SlabTripActivity"
            android:configChanges="orientation|screenSize|keyboardHidden" />


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

@@ -23,40 +23,40 @@

class MainBroadCastReceiver : BroadcastReceiver() {
    override fun onReceive(contexts: Context?, intent: Intent?) {
//        if (intent == null) {
//            toast("内容获取为空，广播接收消息错误")
//            return
//        }
//        try {
//            Handler(Looper.getMainLooper()).post {
//                val b = intent.getBooleanExtra("isLogin", true)
//                if (!b) {
//                    loginOut(contexts)
//                    CacheUtil.get().clear()
//                    EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
//                } else {
//                    if (getToken().isNullOrEmpty()) {
//                        Handler(Looper.getMainLooper()).post {
////                            toast("开始登录")
//                        }
//                        var driverCertificate = intent.getStringExtra("driverCertificate")
//                        if (driverCertificate == null) {
////                            toast("身份证获取失败")
//                        } else {
//                            if (contexts == null) {
////                                toast("上下文为空，使用全局跳转")
//                                toLoginActivity(MyApplication.getInstance(), driverCertificate)
//                            } else {
//                                toLoginActivity(MyApplication.getInstance(), driverCertificate)
//                            }
//                        }
//
//                    }
//                }
//            }
//        } catch (e: Exception) {
//
//        }
        if (intent == null) {
            toast("内容获取为空，广播接收消息错误")
            return
        }
        try {
            Handler(Looper.getMainLooper()).post {
                val b = intent.getBooleanExtra("isLogin", true)
                if (!b) {
                    loginOut(contexts)
                    CacheUtil.get().clear()
                    EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
                } else {
                    if (getToken().isNullOrEmpty()) {
                        Handler(Looper.getMainLooper()).post {
//                            toast("开始登录")
                        }
                        var driverCertificate = intent.getStringExtra("driverCertificate")
                        if (driverCertificate == null) {
//                            toast("身份证获取失败")
                        } else {
                            if (contexts == null) {
//                                toast("上下文为空，使用全局跳转")
                                toLoginActivity(MyApplication.getInstance(), driverCertificate)
                            } else {
                                toLoginActivity(MyApplication.getInstance(), driverCertificate)
                            }
                        }

                    }
                }
            }
        } catch (e: Exception) {

        }

    }


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

@@ -40,30 +40,30 @@
 */
class MoneyBroadCastReceiver : BroadcastReceiver() {
    override fun onReceive(contexts: Context?, intent: Intent?) {
//        if (intent == null && contexts == null) {
//            toast("内容获取为空，广播接收消息错误")
//            return
//        }
//        try {
//            Handler(Looper.getMainLooper()).post {
//                when (intent!!.action) {
//                    "wisdom.intent.action.ledLight" -> {
//                        val isHeavy = intent!!.getBooleanExtra("isHeavy", true)
//                        if (isHeavy) {
//                            callStatue(contexts!!, 5) //代表让订单到进行中
//                        }
//                    }
//
//                    "wisdom.intent.action.priceDevice" -> {
//                        var price = intent.getDoubleExtra("price", 0.0) //计价器价格，单位为元
//                        var mileage = intent.getDoubleExtra("mileage", 0.0) //里程，单位为km
//                        callOver(contexts!!, price)
//                    }
//                }
//            }
//        } catch (e: Exception) {
//
//        }
        if (intent == null && contexts == null) {
            toast("内容获取为空，广播接收消息错误")
            return
        }
        try {
            Handler(Looper.getMainLooper()).post {
                when (intent!!.action) {
                    "wisdom.intent.action.ledLight" -> {
                        val isHeavy = intent!!.getBooleanExtra("isHeavy", true)
                        if (isHeavy) {
                            callStatue(contexts!!, 5) //代表让订单到进行中
                        }
                    }

                    "wisdom.intent.action.priceDevice" -> {
                        var price = intent.getDoubleExtra("price", 0.0) //计价器价格，单位为元
                        var mileage = intent.getDoubleExtra("mileage", 0.0) //里程，单位为km
                        callOver(contexts!!, price)
                    }
                }
            }
        } catch (e: Exception) {

        }
    }

    companion object {

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

@@ -25,7 +25,7 @@
//    public static final String BASE_URL = "https://okyueche.com:443/driver/";
//    public static final String SOCKET_SERVER = "39.108.122.38";
//    public static final int SOCKET_PORT = 8888;
//    public static final  int SUCCESS = 200;
    public static final  int SUCCESS = 200;

    /**
     * 手机登录

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

@@ -176,9 +176,9 @@
    private fun showUI(data: UserInfoBean?) {
        data?.let {
            if (Api.BASE_URL.contains("okyueche")){
                textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+"_online"+"  TEXT"
                textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+"_online"
            }else{
                textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+ "_测试"+"  TEXT"
                textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+ "_测试"
            }
            tv_title_top.text = "服 务 监 督 卡"
            if (data.taxiAptitudeCard.length > 7) {

			@@ -68,34 +68,34 @@
			</provider>


			<!-- <receiver android:name=".base.MainBroadCastReceiver"-->
			<!-- android:enabled="true"-->
			<!-- android:exported="true"-->
			<!-- >-->
			<!-- <intent-filter android:priority="1000">-->
			<!-- <action android:name="Action" />-->
			<!-- <!– //司机信息–>-->
			<!-- <action android:name="wisdom.intent.action.driverInfo" />-->
			<!-- <!– //顶灯–>-->
			<!-- <action android:name="wisdom.intent.action.topLight" />-->
			<!-- </intent-filter>-->
			<!-- </receiver>-->
			<receiver android:name=".base.MainBroadCastReceiver"
			android:enabled="true"
			android:exported="true"
			>
			<intent-filter android:priority="1000">
			<action android:name="Action" />
			<!-- //司机信息-->
			<action android:name="wisdom.intent.action.driverInfo" />
			<!-- //顶灯-->
			<action android:name="wisdom.intent.action.topLight" />
			</intent-filter>
			</receiver>

			<!-- <receiver android:name=".base.MoneyBroadCastReceiver"-->
			<!-- android:enabled="true"-->
			<!-- android:exported="true"-->
			<!-- >-->
			<!-- <intent-filter android:priority="1000">-->
			<!-- <action android:name="Action" />-->
			<!-- <!– //空重车状态–>-->
			<!-- <action android:name="wisdom.intent.action.ledLight" />-->
			<!-- <!– //计价器–>-->
			<!-- <action android:name="wisdom.intent.action.priceDevice" />-->
			<!-- <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />-->
			<!-- <action android:name="android.net.conn.CONNECTIVITY_SUCCESS" />-->
			<!-- <action android:name="android.net.conn.CONNECTIVITY_FAILURE" />-->
			<!-- </intent-filter>-->
			<!-- </receiver>-->
			<receiver android:name=".base.MoneyBroadCastReceiver"
			android:enabled="true"
			android:exported="true"
			>
			<intent-filter android:priority="1000">
			<action android:name="Action" />
			<!-- //空重车状态-->
			<action android:name="wisdom.intent.action.ledLight" />
			<!-- //计价器-->
			<action android:name="wisdom.intent.action.priceDevice" />
			<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
			<action android:name="android.net.conn.CONNECTIVITY_SUCCESS" />
			<action android:name="android.net.conn.CONNECTIVITY_FAILURE" />
			</intent-filter>
			</receiver>

			<meta-data
			android:name="design_width_in_dp"
			@@ -117,55 +117,42 @@
			<service android:name="com.amap.api.track.AMapTrackService" />

			<activity
			android:exported="false"
			android:name="cn.sinata.xldutils.activitys.SlabBaseActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.event.SlabEventDetailActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.event.SlabHistoryEventActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.event.SlabMineEventActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.MySlabBaseActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.SlabFillOutActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.SlabLoginActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity android:name=".slab.SlabOrderListActivity"
			android:exported="false"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.SlabMainActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:exported="false"
			android:name=".slab.SlabOrderOverActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity android:name=".slab.SlabGetOrderFragment"
			android:exported="false"
			android:configChanges="orientation\|screenSize\|keyboardHidden"
			android:theme="@style/FadeDialog"/>
			<activity
			android:exported="false"
			android:name=".slab.SlabSelectServerModeActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />
			<activity
			android:name=".slab.SlabStartActivity"
			android:exported="false"
			android:configChanges="orientation\|screenSize\|keyboardHidden" >
			<intent-filter>
			<action android:name="android.intent.action.MAIN" />
			@@ -174,7 +161,6 @@
			</intent-filter>
			</activity>
			<activity
			android:exported="false"
			android:name=".slab.SlabTripActivity"
			android:configChanges="orientation\|screenSize\|keyboardHidden" />

			@@ -23,40 +23,40 @@

			class MainBroadCastReceiver : BroadcastReceiver() {
			override fun onReceive(contexts: Context?, intent: Intent?) {
			// if (intent == null) {
			// toast("内容获取为空，广播接收消息错误")
			// return
			// }
			// try {
			// Handler(Looper.getMainLooper()).post {
			// val b = intent.getBooleanExtra("isLogin", true)
			// if (!b) {
			// loginOut(contexts)
			// CacheUtil.get().clear()
			// EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
			// } else {
			// if (getToken().isNullOrEmpty()) {
			// Handler(Looper.getMainLooper()).post {
			//// toast("开始登录")
			// }
			// var driverCertificate = intent.getStringExtra("driverCertificate")
			// if (driverCertificate == null) {
			//// toast("身份证获取失败")
			// } else {
			// if (contexts == null) {
			//// toast("上下文为空，使用全局跳转")
			// toLoginActivity(MyApplication.getInstance(), driverCertificate)
			// } else {
			// toLoginActivity(MyApplication.getInstance(), driverCertificate)
			// }
			// }
			//
			// }
			// }
			// }
			// } catch (e: Exception) {
			//
			// }
			if (intent == null) {
			toast("内容获取为空，广播接收消息错误")
			return
			}
			try {
			Handler(Looper.getMainLooper()).post {
			val b = intent.getBooleanExtra("isLogin", true)
			if (!b) {
			loginOut(contexts)
			CacheUtil.get().clear()
			EventBus.getDefault().post(BaseEvent(BaseEvent.OUT_APP))
			} else {
			if (getToken().isNullOrEmpty()) {
			Handler(Looper.getMainLooper()).post {
			// toast("开始登录")
			}
			var driverCertificate = intent.getStringExtra("driverCertificate")
			if (driverCertificate == null) {
			// toast("身份证获取失败")
			} else {
			if (contexts == null) {
			// toast("上下文为空，使用全局跳转")
			toLoginActivity(MyApplication.getInstance(), driverCertificate)
			} else {
			toLoginActivity(MyApplication.getInstance(), driverCertificate)
			}
			}

			}
			}
			}
			} catch (e: Exception) {

			}

			}

			@@ -40,30 +40,30 @@
			*/
			class MoneyBroadCastReceiver : BroadcastReceiver() {
			override fun onReceive(contexts: Context?, intent: Intent?) {
			// if (intent == null && contexts == null) {
			// toast("内容获取为空，广播接收消息错误")
			// return
			// }
			// try {
			// Handler(Looper.getMainLooper()).post {
			// when (intent!!.action) {
			// "wisdom.intent.action.ledLight" -> {
			// val isHeavy = intent!!.getBooleanExtra("isHeavy", true)
			// if (isHeavy) {
			// callStatue(contexts!!, 5) //代表让订单到进行中
			// }
			// }
			//
			// "wisdom.intent.action.priceDevice" -> {
			// var price = intent.getDoubleExtra("price", 0.0) //计价器价格，单位为元
			// var mileage = intent.getDoubleExtra("mileage", 0.0) //里程，单位为km
			// callOver(contexts!!, price)
			// }
			// }
			// }
			// } catch (e: Exception) {
			//
			// }
			if (intent == null && contexts == null) {
			toast("内容获取为空，广播接收消息错误")
			return
			}
			try {
			Handler(Looper.getMainLooper()).post {
			when (intent!!.action) {
			"wisdom.intent.action.ledLight" -> {
			val isHeavy = intent!!.getBooleanExtra("isHeavy", true)
			if (isHeavy) {
			callStatue(contexts!!, 5) //代表让订单到进行中
			}
			}

			"wisdom.intent.action.priceDevice" -> {
			var price = intent.getDoubleExtra("price", 0.0) //计价器价格，单位为元
			var mileage = intent.getDoubleExtra("mileage", 0.0) //里程，单位为km
			callOver(contexts!!, price)
			}
			}
			}
			} catch (e: Exception) {

			}
			}

			companion object {

			@@ -25,7 +25,7 @@
			// public static final String BASE_URL = "https://okyueche.com:443/driver/";
			// public static final String SOCKET_SERVER = "39.108.122.38";
			// public static final int SOCKET_PORT = 8888;
			// public static final int SUCCESS = 200;
			public static final int SUCCESS = 200;

			/**
			* 手机登录

			@@ -176,9 +176,9 @@
			private fun showUI(data: UserInfoBean?) {
			data?.let {
			if (Api.BASE_URL.contains("okyueche")){
			textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+"_online"+" TEXT"
			textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+"_online"
			}else{
			textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+ "_测试"+" TEXT"
			textView_version.text = "版本-V" + PackageUtil.getVersionName(this)+ "_测试"
			}
			tv_title_top.text = "服务监督卡"
			if (data.taxiAptitudeCard.length > 7) {