lmw
2023-06-14 c6a53572a83eaf4ad0d6193303e5acc4929b239f
录音
19个文件已修改
229 ■■■■ 已修改文件
app/build.gradle 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/libs/Msc.jar 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/base/MyApplication.kt 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/base/gaode/gpsnav/util/IFlyTTS.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/bean/LoginBean.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/bean/OrderListBean.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/MainTabActivity.kt 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/adapter/MainAdapter.kt 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/main/GetOrderFragment.kt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/main/MainFragment.kt 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/main/OrderOverActivity.kt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/main/TripActivity.kt 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/main/TripPoolingDetailActivity.kt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/main/add_order/AddCityOrderActivity.kt 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/main/add_order/SelectCityStartActivity.kt 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/pub/LoginActivity.kt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/kuanzhai/driver/ui/to_city/TripCityActivity.kt 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/jniLibs/arm64-v8a/libmsc.so 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/jniLibs/armeabi-v7a/libmsc.so 补丁 | 查看 | 原始文档 | blame | 历史
app/build.gradle
@@ -30,7 +30,7 @@
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {
            // 设置支持的SO库架构,第三方给的so库哪几种架构,就配置这几种架构
            abiFilters 'armeabi'
            abiFilters "armeabi-v7a"
        }
        manifestPlaceholders = [
@@ -132,5 +132,8 @@
    implementation 'cn.jzvd:jiaozivideoplayer:7.3.0'
//http日志拦截器
    implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1'
    //融云 云录制使用
    implementation 'cn.rongcloud.sdk:im_lib:5.1.9.7' // 即时通讯基础能力库
    implementation 'cn.rongcloud.sdk:rtc_lib:5.1.17.1' // 音视频通话基础能力库
}
app/libs/Msc.jar
Binary files differ
app/src/main/java/com/kuanzhai/driver/base/MyApplication.kt
@@ -8,6 +8,13 @@
import androidx.annotation.RequiresApi
import cn.jpush.android.api.JPushInterface
import cn.jpush.android.api.TagAliasCallback
import cn.rongcloud.rtc.api.RCRTCConfig
import cn.rongcloud.rtc.api.RCRTCEngine
import cn.rongcloud.rtc.api.RCRTCRoom
import cn.rongcloud.rtc.api.callback.IRCRTCResultCallback
import cn.rongcloud.rtc.api.callback.IRCRTCResultDataCallback
import cn.rongcloud.rtc.api.stream.RCRTCInputStream
import cn.rongcloud.rtc.base.RTCErrorCode
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.BaseApplication
import cn.sinata.xldutils.utils.sysErr
@@ -37,6 +44,7 @@
import com.umeng.commonsdk.UMConfigure
import com.umeng.socialize.PlatformConfig
import com.xuexiang.xui.XUI
import io.rong.imlib.RongIMClient
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.toast
import org.json.JSONObject
@@ -71,6 +79,7 @@
        registerActivityLifecycleCallbacks(this)
        initUpPoint()
        initSocket()
        initRong()
    }
    fun initPersionDate(){
@@ -88,6 +97,14 @@
        setAlisa()
        LogUtils.OpenLog(true)
//        CrashReport.initCrashReport(getApplicationContext(), "444bb776ed", false);
    }
    private fun initRong() {
        // IMLib 初始化
        RongIMClient.init(this, "0vnjpoad01rwz")
        // RTCLib 初始化
        val config = RCRTCConfig.Builder.create()
        RCRTCEngine.getInstance().init(this, config.build())
    }
    public fun setAlisa() {
@@ -193,7 +210,7 @@
                                    val act = activities[activities.size - 1]
//                                    MyApplication.getTTsManager().setVideoText("收到新的订单")
                                    when (orderSimpleData.orderType) {
                                        1,2 -> {
                                        1,2,10 -> {
                                            (act as MyBaseActivity).showOrder(
                                                orderSimpleData.orderId.toString(),
                                                orderSimpleData.orderType.toString(),
@@ -442,6 +459,7 @@
        var aMapLocation: AMapLocation? = null
        var currentOrderId: String = ""
        var currentOrderType: String = ""
        var recordRoomId: String = ""
        var orderStatueViews: MutableList<OrderStatueView> =
            mutableListOf()
        var testHeartNunm = 0
@@ -483,6 +501,70 @@
        fun removeOrderView(view: OrderStatueView?) {
            orderStatueViews.remove(view)
        }
        fun startRecord(){
            if (recordRoomId.isNotEmpty()){
                RCRTCEngine.getInstance()
                    .joinRoom(recordRoomId, object : IRCRTCResultDataCallback<RCRTCRoom?>() {
                        override fun onSuccess(rcrtcRoom: RCRTCRoom?) {
                            Log.e("RongLog", "开始录制======》当前房间号:${recordRoomId}")
//                            rcrtcRoom?.registerRoomListener(object :IRCRTCRoomEventsListener(){})
                            //step1:推流
                            rcrtcRoom?.localUser?.publishDefaultStreams(object :
                                IRCRTCResultCallback() {
                                override fun onSuccess() {
                                    Log.e("RongLog", "发布资源成功")
                                }
                                override fun onFailed(errorCode: RTCErrorCode) {
                                    Log.e("RongLog", "发布资源失败:${errorCode.reason}")
                                }
                            })
                            //step2:订阅远端
                            val inputStreams: MutableList<RCRTCInputStream> = ArrayList()
                            for (remoteUser in rcrtcRoom?.remoteUsers ?: arrayListOf()) {
                                if (remoteUser.streams.size == 0) {
                                    continue
                                }
                                inputStreams.addAll(remoteUser.streams)
                            }
                            if (inputStreams.size == 0) {
                                return
                            }
                            rcrtcRoom?.localUser?.subscribeStreams(
                                inputStreams,
                                object : IRCRTCResultCallback() {
                                    override fun onFailed(errorCode: RTCErrorCode?) {
                                        Log.e("RongLog", "订阅资源失败:${errorCode}")
                                    }
                                    override fun onSuccess() {
                                        Log.e("RongLog", "订阅资源成功")
                                    }
                                })
                        }
                        override fun onFailed(rtcErrorCode: RTCErrorCode) {
                            Log.e("RongLog", "录制失败======》${rtcErrorCode}")
                        }
                    })
            }
        }
        fun finishRecord(){
            RCRTCEngine.getInstance().leaveRoom(object : IRCRTCResultCallback() {
                override fun onFailed(errorCode: RTCErrorCode?) {
                    Log.e("RongLog", "结束录制失败")
                }
                override fun onSuccess() {
                    Log.e("RongLog", "结束录制成功")
                }
            })
        }
    }
    private val activities = ArrayList<Activity?>()
app/src/main/java/com/kuanzhai/driver/base/gaode/gpsnav/util/IFlyTTS.java
@@ -31,7 +31,7 @@
    /**
     * todo 请替换您自己申请的ID。
     */
    private final String appId = "c368b2ff";
    private final String appId = "df57aa12";
    public static IFlyTTS getInstance(Context context) {
        if (iflyTTS == null) {
app/src/main/java/com/kuanzhai/driver/bean/LoginBean.java
@@ -48,6 +48,7 @@
        private String serverId;
        private String terminalId;
        private String state;
        public String rongYunToken;
        public String getState() {
            return state;
app/src/main/java/com/kuanzhai/driver/bean/OrderListBean.java
@@ -57,6 +57,7 @@
        private String startAddress;
        private int state;
        private String time;
        public String orderNumber;
        private int type;
        private String remark;
        private String peopleNumber;
app/src/main/java/com/kuanzhai/driver/ui/MainTabActivity.kt
@@ -1,8 +1,11 @@
package com.kuanzhai.driver.ui
import android.util.Log
import android.view.View
import android.widget.Toast
import cn.sinata.xldutils.utils.*
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.setDrawableTop
import cn.sinata.xldutils.utils.textColor
import com.kuanzhai.driver.R
import com.kuanzhai.driver.base.MyBaseActivity
import com.kuanzhai.driver.bean.ModuleBean
@@ -14,6 +17,8 @@
import com.kuanzhai.driver.ui.main.MainPubFragment
import com.kuanzhai.driver.ui.mine.MineActivity
import com.kuanzhai.driver.utils.Cache.CacheKey
import com.kuanzhai.driver.utils.Cache.CacheKey.getKeyStr
import io.rong.imlib.RongIMClient
import kotlinx.android.synthetic.main.activity_main_tab.*
class MainTabActivity: MyBaseActivity() {
@@ -37,11 +42,24 @@
    override fun initView() {
        showHeader(false)
        showTitle(false)
        RongIMClient.connect(getKeyStr("rongToken"), object : RongIMClient.ConnectCallback() {
            override fun onSuccess(s: String) {
                Log.e("RongTag", "融云服务已连接")
            }
            override fun onError(connectionErrorCode: RongIMClient.ConnectionErrorCode) {
                Log.e("RongTag", "融云服务连接失败:$connectionErrorCode")
            }
            override fun onDatabaseOpened(databaseOpenStatus: RongIMClient.DatabaseOpenStatus) {}
        })
        allGray()
        callMine()
        tv_main.textColor(this,R.color.main_yellow_shen)
        tv_main.textColor(this, R.color.main_yellow_shen)
        tv_main.setDrawableTop(R.mipmap.tab_home_green)
        addFragment(mainFragment,R.id.container)
        addFragment(mainFragment, R.id.container)
        callModule()
    }
@@ -52,7 +70,7 @@
    private fun callMine() {
        var map = getMapByAny()
        callNet(false,Api.queryInfo, map) {
        callNet(false, Api.queryInfo, map) {
            var user = gson.fromJson<UserBean>(it, UserBean::class.java)
            CacheKey.saveUserInfo(user.data)
        }
@@ -62,29 +80,29 @@
    override fun setOnclick() {
        tv_main.clickDelay {
            allGray()
            tv_main.textColor(this,R.color.main_yellow_shen)
            tv_main.textColor(this, R.color.main_yellow_shen)
            tv_main.setDrawableTop(R.mipmap.tab_home_green)
            addFragment(mainFragment,R.id.container)
            addFragment(mainFragment, R.id.container)
//            showOrder("1323","1",100,1)
        }
        tv_driver.clickDelay {
            allGray()
            tv_driver.textColor(this,R.color.main_yellow_shen)
            tv_driver.textColor(this, R.color.main_yellow_shen)
            tv_driver.setDrawableTop(R.mipmap.tab_driver_server_yes)
            addFragment(driverServerFragment,R.id.container)
            addFragment(driverServerFragment, R.id.container)
        }
        tv_mine.clickDelay {
            allGray()
            tv_mine.textColor(this,R.color.main_yellow_shen)
            tv_mine.textColor(this, R.color.main_yellow_shen)
            tv_mine.setDrawableTop(R.mipmap.tab_user_green)
            addFragment(mineFragment,R.id.container)
            addFragment(mineFragment, R.id.container)
        }
    }
    private fun allGray() {
        tv_main.textColor(this,R.color.tab_gray)
        tv_driver.textColor(this,R.color.tab_gray)
        tv_mine.textColor(this,R.color.tab_gray)
        tv_main.textColor(this, R.color.tab_gray)
        tv_driver.textColor(this, R.color.tab_gray)
        tv_mine.textColor(this, R.color.tab_gray)
        tv_main.setDrawableTop(R.mipmap.tab_home_gray)
        tv_driver.setDrawableTop(R.mipmap.tab_driver_server_null)
        tv_mine.setDrawableTop(R.mipmap.tab_user_gray)
@@ -96,7 +114,7 @@
     */
    private fun callModule() {
        var map = getMapByAny()
        callNet(Api.getShowModular,map){
        callNet(Api.getShowModular, map){
            var module = gson.fromJson<ModuleBean>(it, ModuleBean::class.java)
            tv_driver.visibility = if (module.data.filter { it.driverShow == 1 }.isNotEmpty()) View.VISIBLE else View.GONE //如果子菜单全隐藏,则整个模块隐藏
        }
app/src/main/java/com/kuanzhai/driver/ui/adapter/MainAdapter.kt
@@ -82,6 +82,10 @@
                    }
                    it.itemView.tv_people_num.text = "乘车人数" + item.peopleNumber + "人"
                }
                10->{
                    it.itemView.tv_remark.gone()
                    it.itemView.tv_people_num.text = "乘车人数" + item.peopleNumber + "人"
                }
                4, 5 -> {
                    it.itemView.rl_overtime.visible()
                    if (item.arriveTimeExpect.isNotEmpty()) {
@@ -147,7 +151,7 @@
                    return@clickDelay
                }
                if (item.type == 2 || (item.type == 1 && item.rideType != "3")) { //订单类型(1=快车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
                if (item.type == 10||item.type == 2 || (item.type == 1 && item.rideType != "3")) { //订单类型(1=快车,2=出租车,3=城际,4=小件物流-同城,5=小件物流-跨城,6=包车)
                    when (item.state) {
                        2, 3, 4, 5 -> {
                            context.startActivity<TripActivity>(
@@ -206,7 +210,7 @@
//                        }
//                    }
                }
                if (item.type == 3||item.type == 7) {
                if (item.type == 3||item.type == 8||item.type == 9) {
                    if (item.state < 6) {
                        context.startActivity<TripCityActivity>(
                            "orderId" to item.id.toString(),
app/src/main/java/com/kuanzhai/driver/ui/main/GetOrderFragment.kt
@@ -146,6 +146,11 @@
                    tv_name.visible()
                }
            }
            if (orderType == "10") {
                tv_money.gone()
                tv_name.visible()
                tv_name.text = "${data.peopleNumber}人"
            }
            if (orderType == "5" || orderType == "4") {
                if (data.arriveTimeExpect.isNotEmpty()){
                    tv_expect_time.text = "要求送达时间:"+data.arriveTimeExpect
app/src/main/java/com/kuanzhai/driver/ui/main/MainFragment.kt
@@ -1,7 +1,9 @@
package com.kuanzhai.driver.ui.main
import android.view.View
import com.beloo.widget.chipslayoutmanager.util.log.Log
import com.driver.emanagercar.ui.base.BaseRecyclerFragment
import com.kuanzhai.driver.base.MyApplication
import com.kuanzhai.driver.bean.OrderListBean
import com.kuanzhai.driver.netUtls.Api
import com.kuanzhai.driver.netUtls.getMapByAny
@@ -28,6 +30,13 @@
    override fun getDatas(t: String?): List<OrderListBean.DataBean> {
        var data = gson.fromJson<OrderListBean>(t,OrderListBean::class.java)
        val inOrder = data.data.filter { it.state == 5 }.firstOrNull()
        if (inOrder!=null){
            MyApplication.currentOrderId = inOrder.id.toString()
            MyApplication.recordRoomId = if (inOrder.type == 3||inOrder.type == 8||inOrder.type == 9) inOrder.orderNumber else inOrder.id.toString()
            Log.e("Rong","当前进行中的订单id==========》${MyApplication.currentOrderId}")
            MyApplication.startRecord()
        }
        return data.data
    }
app/src/main/java/com/kuanzhai/driver/ui/main/OrderOverActivity.kt
@@ -76,6 +76,10 @@
            if(orderType == "1"){
                tv_red_money.gone()
            }
            if(orderType == "10"){
                tv_red_money.setCompoundDrawablesRelativeWithIntrinsicBounds(R.mipmap.icon_people_gray,0,0,0)
                tv_red_money.text = "${it.data.peopleNumber}人"
            }
            when (orderBean.data.orderState) {
                10, 11 -> {
                    ll_order_cancel.visible()
app/src/main/java/com/kuanzhai/driver/ui/main/TripActivity.kt
@@ -69,7 +69,6 @@
    lateinit var aMap: AMap
    lateinit var orderBean: OrderBean
    override fun setContentView() {
        setContentView(R.layout.activity_trip)
    }
@@ -256,12 +255,13 @@
                        }
                    }
                    5, 6 -> {
                        MyApplication.finishRecord()
                        it.data.orderState = 6
                        when(orderType){
                            "2" -> {
                                showMoneyTypeDialog()
                            }
                            "1" -> {
                            "1","10" -> {
                                callStatue(6,{
                                    startActivity<MajorSureMoneyActivity>(
                                        "orderId" to orderId,
@@ -423,6 +423,7 @@
    private fun callOrder() {
        MyApplication.currentOrderId = orderId
        MyApplication.recordRoomId = orderId
        MyApplication.currentOrderType = orderType
        var map = getMapByAny()
        map["orderId"] = orderId
@@ -445,6 +446,10 @@
                tv_red_money.gone()
            }
            tv_red_money.text = it.data.tipMoney.toString() + "元红包"
            if (orderType == "10"){//公务出行
                tv_red_money.text = "${it.data.peopleNumber}人"
                tv_red_money.setCompoundDrawablesRelativeWithIntrinsicBounds(R.mipmap.icon_people_gray,0,0,0)
            }
            showStatueMapUI(it)
        }
    }
@@ -549,6 +554,8 @@
                slide_btn.changeButtonText("乘客已上车")
            }
            5, 6 -> {
                if (it.data.orderState == 5)
                    MyApplication.startRecord()
                closeTimeStart()
                iv_to_gd.visible()
                tv_Right.gone()
app/src/main/java/com/kuanzhai/driver/ui/main/TripPoolingDetailActivity.kt
@@ -240,6 +240,7 @@
                        }
                    }
                    5, 6 -> {
                        MyApplication.finishRecord()
                        it.data.orderState = 6
                        when (orderType) {
                            "2" -> {
@@ -474,6 +475,7 @@
    private fun callOrder() {
        MyApplication.currentOrderId = orderId
        MyApplication.recordRoomId = orderId
        MyApplication.currentOrderType = orderType
        var map = getMapByAny()
        map["orderId"] = orderId
@@ -626,6 +628,8 @@
                slide_btn.changeButtonText("乘客已上车")
            }
            5, 6 -> {
                if (it.data.orderState == 5)
                    MyApplication.startRecord()
                closeTimeStart()
                iv_to_gd.visible()
                tv_Right.gone()
app/src/main/java/com/kuanzhai/driver/ui/main/add_order/AddCityOrderActivity.kt
@@ -176,6 +176,7 @@
                map["startLon"] = startLon
                map["totalSeat"] = totalSeat
                map["travelMode"] = travelMode
                map["type"] = orderType
                map["travelTime"] = DateUtil.getTime(DateUtil.TYPE0, System.currentTimeMillis())
                if (majorSureMoneyAdapter.data.isNotEmpty()){
                    map["additionalFee"] = gson.toJson(majorSureMoneyAdapter.data)
@@ -218,6 +219,7 @@
                ): Boolean {
                    tv_order_type.text = list[options1]
                    orderType = if (options1 == 0) 3 else if (options1 == 1) 8 else 9
                    clearByType(0)
                    return false
                }
            })
@@ -229,12 +231,16 @@
                toast("请先选择起点")
                return@clickDelay
            }
            startActivity<SelectCityStartActivity>("startCityId" to startCityId)
            startActivity<SelectCityStartActivity>("startCityId" to startCityId,"orderType" to orderType)
        }
        ll_select_city_start.clickDelay {
            selectCityLocation = 1
            startActivity<SelectCityStartActivity>()
            if (orderType == 0){
                toast("请选择订单类型")
            }else{
                selectCityLocation = 1
                startActivity<SelectCityStartActivity>("orderType" to orderType)
            }
        }
        ll_select_car_num.clickDelay {
@@ -405,7 +411,7 @@
    private fun downOrder(paytype: String, orderId: String,function: () -> Unit) {
        var map = getMapByAny()
        map["orderId"] = orderId
        map["orderType"] = "3"
        map["orderType"] = orderType
        map["payType"] = paytype
        map["type"] = "2"
        callNet(Api.payTaxiOrder, map) {
@@ -430,7 +436,6 @@
        }
    }
    private fun callMoney(function: (QueryOrderMoneyBean.DataBean) -> Unit) {
        var map = getMapByAny()
        map["endLonLat"] = "$endLon,$endLat"
@@ -447,19 +452,6 @@
        }
    }
//    /***
//     * 根据排班id获取最大出行人数
//     */
//    private fun callPeopleNum() {
//        var map = getMapByAny()
//        map["id"] = lineShiftDriverId
//        callNet(Api.querySeat,map){
//            var bean = gson.fromJson<PeopleNumBean>(it,PeopleNumBean::class.java)
//        }
//
//    }
    override fun onEventMainThread(event: BaseEvent?) {
        super.onEventMainThread(event)
@@ -590,8 +582,11 @@
            startLon = ""
            tv_up_point.text = ""
        }
        if(i < 1){
            startCityName = ""
            startCityId = ""
            tv_start_point.text = ""
        }
    }
}
app/src/main/java/com/kuanzhai/driver/ui/main/add_order/SelectCityStartActivity.kt
@@ -33,6 +33,8 @@
        intent.getStringExtra("startCityId") //1 选择起点城市 2 选择终点城市
    }
    private val orderType by lazy { intent.getIntExtra("orderType",3) }
    var letterAdapter = LetterAdapter()
    var cityAdapter = CitySelectAdapter()
@@ -93,7 +95,9 @@
        var map = getMapByAny()
        if (!startSiteId.isNullOrEmpty()){
            map["startSiteId"] = startSiteId
        }
        }else
            map["type"] = orderType
        callNet(Api.queryOpenCity, map) {
            var bean = gson.fromJson<SitePointBean>(it, SitePointBean::class.java)
            initLetter(bean.data)
app/src/main/java/com/kuanzhai/driver/ui/pub/LoginActivity.kt
@@ -140,6 +140,7 @@
                CacheKey.putKeyStr("userId", bean.data.id.toString())
                CacheKey.putKeyStr("serverId", bean.data.serverId.toString())
                CacheKey.putKeyStr("terminalName", bean.data.terminalId.toString())
                CacheKey.putKeyStr("rongToken", bean.data.rongYunToken)
                toast("登录成功")
                MyApplication.getInstance()!!.setAlisa()
                startActivity<MainTabActivity>()
app/src/main/java/com/kuanzhai/driver/ui/to_city/TripCityActivity.kt
@@ -114,7 +114,7 @@
        override fun orderInfo(data: OrderSimpleData?) {
            data?.let {
                when(it.orderType){
                    1,2,3 -> {
                    1,2,3,8,9,10 -> {
                        if (it.status == 10 || it.status == 12) {
                            removeItem(it.orderId.toString())
                            Handler(Looper.getMainLooper()).post {
@@ -262,9 +262,10 @@
                        tripItemAdapter.data[currentPositionOrder].orderState = 6
                        tripItemAdapter.notifyDataSetChanged()
                        when (orderType) {
                            "3" -> {
                            "3","8","9" -> {
                                var isAllOver = getIsOver()  //是否所有子订单都完成了
                                if (isAllOver) {
                                    MyApplication.finishRecord()
                                    //去订单完成页面
                                    callStatue(it.orderState,{
                                        allOver()
@@ -540,6 +541,7 @@
        callNet(Api.queryCityOrderInfo, map) {
            orderBean = gson.fromJson(it, OrderCityBean::class.java)
//            orderBean.data.orders.sortWith(MyComparator())
            MyApplication.recordRoomId = orderBean.data.orderNumber
            tv_line.text = orderBean.data.line
            tv_people_num.text = orderBean.data.peopleNumber.toString() + "人"
            tripItemAdapter.data.clear()
@@ -722,6 +724,7 @@
            }
            5, 6 -> {
                MyApplication.startRecord()
                closeTimeStart()
                iv_to_gd.visible()
                allStartVisible()
app/src/main/jniLibs/arm64-v8a/libmsc.so
Binary files differ
app/src/main/jniLibs/armeabi-v7a/libmsc.so
Binary files differ