liugl
2021-01-19 36bc30bdfea6e604a517267e9cabe57b51c322ea
1。4:处理预约单导致串单的问题 隐藏预约单
5个文件已修改
19 ■■■■ 已修改文件
app/build.gradle 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/release/output.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/netUtls/Api.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/build.gradle
@@ -25,8 +25,8 @@
        applicationId "com.okgoincar"
        minSdkVersion 19
        targetSdkVersion 29
        versionCode 8
        versionName "8"
        versionCode 9
        versionName "9"
//        versionCode 22
//        versionName "22"
        multiDexEnabled true
app/release/output.json
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -57,6 +57,7 @@
    public static String queryHistoryActivity = "api/driver/queryHistoryActivity"; //api/driver/queryHistoryActivity 获取历史活动列表
    public static String queryHistoryActivityInfo = "api/driver/queryHistoryActivityInfo"; //api/driver/queryHistoryActivityInfo 获取历史日期中的活动内容
    public static String queryNeedCertificate = "base/driver/queryNeedCertificate"; //base/driver/queryNeedCertificate 注册完善个人信息根据选择的从业地判断是否需要网约车资格证
    public static String queryMyAllOrder1 = "api/order/queryMyAllOrder1"; ///api/order/queryMyAllOrder 获取我的订单列表
    /***
     * 订单中
app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
@@ -174,8 +174,8 @@
     */
    public void showOrder(String orderId, String orderType, int time, int type) {
//        UtilKtKt.calldetailOrderIsYy(this, orderId, orderType, b -> {
//            if (b) {
        UtilKtKt.calldetailOrderIsYy(this, orderId, orderType, b -> {
            if (b) {
                MyApplication.Companion.getTTsManager().setVideoText("OK出行,有一条新的订单");
                Intent intent = new Intent(MySlabBaseActivity.this, SlabGetOrderFragment.class);
                intent.putExtra("orderId", orderId);
@@ -183,10 +183,10 @@
                intent.putExtra("time", time);
                intent.putExtra("type", type);
                startActivity(intent);
//            } else {
            } else {
//                toast("收到预约单");
//            }
//        });
            }
        });
    }
app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
@@ -70,7 +70,7 @@
        map["state"] = 4
        map["size"] = 10
        map["pageNum"] = 1
        callNet(Api.queryMyAllOrder, map) {
        callNet(Api.queryMyAllOrder1, map) {
            var data = gson.fromJson<OrderListBean>(it, OrderListBean::class.java)
            adapter.data.addAll(data.data)
            adapter.notifyDataSetChanged()