打印整改：println->log

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -341,7 +341,7 @@ object BusinessManager {
                                                 return@readPortalCaseCardRfid
                                             }
                                             val rfid = res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
-                                            println("卡片RFID ： $rfid")
+                                            LogUtil.i("卡片RFID ： $rfid")
                                         }
                                     }
                                     DEVICE_TYPE_FINGERPRINT -> {
@@ -383,19 +383,19 @@ object BusinessManager {
                 0 -> {
                     val isLeftLock = (res[4].toInt() shr 0) and 0x1 == 1
                     val isRightLock = (res[4].toInt() shr 4) and 0x1 == 1
-                    println("锁具底座卡扣状态 ： $isLeftLock - $isRightLock")
+                    LogUtil.i("锁具底座卡扣状态 ： $isLeftLock - $isRightLock")
                 }
                 1 -> {
                     val tempList = mutableListOf<Boolean>()
                     for (i in 0..7) {
                         tempList.add((res[4].toInt() shr i) and 0x1 == 1)
                     }
-                    println("锁具底座卡扣1-8状态 ： $tempList")
+                    LogUtil.i("锁具底座卡扣1-8状态 ： $tempList")
                 }
                 2 -> {
                     val lock9Status = (res[4].toInt() shr 0) and 0x1 == 1
                     val lock10Status = (res[4].toInt() shr 1) and 0x1 == 1
-                    println("锁具底座卡扣9、10状态 ： $lock9Status - $lock10Status")
+                    LogUtil.i("锁具底座卡扣9、10状态 ： $lock9Status - $lock10Status")
                 }
             }
         }
@@ -410,19 +410,19 @@ object BusinessManager {
                 0 -> {
                     val isLeftLock = (res[4].toInt() shr 0) and 0x1 == 1
                     val isRightLock = (res[4].toInt() shr 4) and 0x1 == 1
-                    println("钥匙底座卡扣状态 ： $isLeftLock - $isRightLock")
+                    LogUtil.i("钥匙底座卡扣状态 ： $isLeftLock - $isRightLock")
                 }
                 1 -> {
                     val tempList = mutableListOf<Boolean>()
                     for (i in 0..7) {
                         tempList.add((res[4].toInt() shr i) and 0x1 == 1)
                     }
-                    println("锁具底座卡扣1-8状态 ： $tempList")
+                    LogUtil.i("锁具底座卡扣1-8状态 ： $tempList")
                 }
                 2 -> {
                     val lock9Status = (res[4].toInt() shr 0) and 0x1 == 1
                     val lock10Status = (res[4].toInt() shr 1) and 0x1 == 1
-                    println("锁具底座卡扣9、10状态 ： $lock9Status - $lock10Status")
+                    LogUtil.i("锁具底座卡扣9、10状态 ： $lock9Status - $lock10Status")
                 }
             }
         }
@@ -1128,11 +1128,11 @@ object BusinessManager {
         BleCmdManager.getTicketStatus(bleDevice, object : CustomBleWriteCallback() {
             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
                 if (isNeedLoading) mEventBus.postValue(MsgEvent(MSG_EVENT_LOADING, LoadingMsg(false, "工作票获取成功", null)))
-                println("getTicketStatus success")}
+                LogUtil.i("getTicketStatus success")}
             override fun onWriteFailure(exception: BleException?) {
                 if (isNeedLoading) mEventBus.postValue(MsgEvent(MSG_EVENT_LOADING, LoadingMsg(false, "工作票获取失败", false)))
                 processCallback?.invoke(false)
-                println("getTicketStatus fail")}
+                LogUtil.e("getTicketStatus fail")}
         })
     }
 

app/src/main/java/com/grkj/iscs/ble/BleCmdManager.kt

@@ -121,7 +121,7 @@ object BleCmdManager {
         BusinessManager.getBleDeviceByMac(bleDevice.mac)?.let {
             it.token = byteArrayOf(byteArray[11], byteArray[12], byteArray[13], byteArray[14])
             callBack?.invoke(true)
-            println("Token 赋值 ${it.token?.toHexStrings()} : ${bleDevice.mac}")
+            LogUtil.i("Token 赋值 ${it.token?.toHexStrings()} : ${bleDevice.mac}")
         } ?: let {
             callBack?.invoke(false)
         }
@@ -276,7 +276,7 @@ object BleCmdManager {
         val idx = byteArray[6] + byteArray[7]
         val crc = byteArray[8] + byteArray[9]
         val size = byteArray[10].toUByte() + byteArray[11].toUByte()
-        println("工作票数据 ： $total : $idx : $size")
+        LogUtil.i("工作票数据 ： $total : $idx : $size")
         // 数据组装
         BusinessManager.getBleDeviceByMac(bleDevice.mac)?.let {
             it.ticketStatus += byteArray.copyOfRange(12, 12 + size.toInt())
@@ -285,17 +285,17 @@ object BleCmdManager {
         if (idx != total - 1) {
             getTicketStatusPart(idx.toByteArray(), total.toByteArray(), byteArrayOf(0x00.toByte()), bleDevice, object : CustomBleWriteCallback() {
                 override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                    println("getTicketStatusPart success")
+                    LogUtil.i("getTicketStatusPart success")
                 }
 
                 override fun onWriteFailure(exception: BleException?) {
-                    println("getTicketStatusPart fail")
+                    LogUtil.e("getTicketStatusPart fail")
                     mEventBus.postValue(MsgEvent(MSG_EVENT_GET_TICKET_STATUS, GetTicketStatusMsg(false, bleDevice)))
                 }
             })
         } else {
             BusinessManager.getBleDeviceByMac(bleDevice.mac)?.let {
-                println("工作票完成接收 ： ${String(it.ticketStatus)}")
+                LogUtil.i("工作票完成接收 ： ${String(it.ticketStatus)}")
                 callBack?.invoke(String(it.ticketStatus))
                 // TODO 清空ticket
                 it.ticketStatus = byteArrayOf()
@@ -332,16 +332,16 @@ object BleCmdManager {
         LogUtil.i("handlePowerStatus : ${byteArray.toHexStrings()}")
         val bat = byteArray[4].toInt()
         val chg = byteArray[5]
-        println("钥匙电量 ： $bat%")
+        LogUtil.i("钥匙电量 ： $bat%")
         when (chg) {
             0x01.toByte() -> {
-                println("充电状态：未充电")
+                LogUtil.i("充电状态：未充电")
             }
             0x02.toByte() -> {
-                println("充电状态：充电中")
+                LogUtil.i("充电状态：充电中")
             }
             0x03.toByte() -> {
-                println("充电状态：充满")
+                LogUtil.i("充电状态：充满")
             }
         }
     }

app/src/main/java/com/grkj/iscs/modbus/DockBean.kt

@@ -134,7 +134,7 @@ class DockBean(
                     val isFingerPrintExist = (byteArray[3].toInt() shr 5) and 0x1 == 1
                     val isDockCharging = (byteArray[3].toInt() shr 6) and 0x1 == 1
                     val isDockFullCharged = (byteArray[3].toInt() shr 7) and 0x1 == 1
-                    println("便携式底座状态 ： $isCardExist - $isFingerPrintExist - $isDockCharging - $isDockFullCharged")
+                    LogUtil.i("便携式底座状态 ： $isCardExist - $isFingerPrintExist - $isDockCharging - $isDockFullCharged")
 
                     // TODO 便携柜 list
                     if (getCardList().isEmpty()) {

app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt

@@ -197,7 +197,7 @@ object ModBusController {
                         updateKeyRfid(dockBean.addr, isLeft, rfid)
                         // 蓝牙准备操作
                         NetApi.getKeyInfo(rfid) {
-                            println("getKeyInfo : $rfid - ${it?.macAddress}")
+                            LogUtil.i("getKeyInfo : $rfid - ${it?.macAddress}")
                             if (it != null && !it.macAddress.isNullOrEmpty()) {
                                 // 更新mac
                                 updateKeyMac(dockBean.addr, key.isLeft, it.macAddress)
@@ -495,7 +495,7 @@ object ModBusController {
     }
 
     fun updateDeviceType() {
-        println("____________________________________")
+        LogUtil.i("____________________________________")
         readDeviceType { res ->
             LogUtil.i("设备类型数量 ： ${res.size}")
             LogUtil.i("设备类型 ： ${res.map { it.toHexStrings()}}")
@@ -512,7 +512,7 @@ object ModBusController {
                 }
                 LogUtil.i("设备（${bytes[0].toInt()}）类型：$type")
             }
-            println("____________________________________")
+            LogUtil.i("____________________________________")
         }
     }
 

app/src/main/java/com/grkj/iscs/presentation/PresentationLoginActivity.kt

@@ -20,6 +20,7 @@ import com.grkj.iscs.util.ActivityUtils
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.FileUtil
 import com.grkj.iscs.util.ToastUtils
+import com.grkj.iscs.util.log.LogUtil
 
 class PresentationLoginActivity : BaseActivity<ActivityPresentationLoginBinding>() {
 
@@ -35,7 +36,7 @@ class PresentationLoginActivity : BaseActivity<ActivityPresentationLoginBinding>
             ToastUtils.tip("未找到 presentation.txt 文件，请先在手机Download目录创建 presentation 文件夹，并将 presentation.txt 文件放入")
             return
         }
-        println("Mac Json : $str")
+        LogUtil.i("Mac Json : $str")
         PresentationManager.cardList =
             Gson().fromJson(str, object : TypeToken<List<PresentationManager.PCardInfoBean>>() {}.type)
         if (PresentationManager.cardList.isEmpty()) {
@@ -76,7 +77,7 @@ class PresentationLoginActivity : BaseActivity<ActivityPresentationLoginBinding>
                                     ModBusController.readPortalCaseCardRfid(dockBean.addr) { res ->
                                         if (res.size >= 11) {
                                             val rfid = res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
-                                            println("卡片RFID ： $rfid")
+                                            LogUtil.i("卡片RFID ： $rfid")
                                             if(window.decorView.visibility != View.VISIBLE) {
 //                                            ToastUtils.tip("当前页面不可见")
                                                 val current = ActivityUtils.currentActivity()

app/src/main/java/com/grkj/iscs/presentation/PresentationManager.kt

@@ -136,8 +136,8 @@ object PresentationManager {
     }
 
     fun updateWorkTicket(ticketStatusBean: WorkTicketStatusBean) {
-        println("updateWorkTicket1 : $ticketStatusBean")
-        println("updateWorkTicket2 : $workTicketList")
+        LogUtil.i("updateWorkTicket1 : $ticketStatusBean")
+        LogUtil.i("updateWorkTicket2 : $workTicketList")
         val statusTicketList = ticketStatusBean.data
         if (statusTicketList.isNullOrEmpty()) {
             ToastUtils.tip("钥匙无工作票数据")
@@ -162,7 +162,7 @@ object PresentationManager {
                             }
                             if (itStatusTask.closed == 0) {
                                 isLockerDone = false
-                                println("测试打印 ： 有未完成的")
+                                LogUtil.i("测试打印 ： 有未完成的")
                             }
                         }
                     }
@@ -178,14 +178,14 @@ object PresentationManager {
                 }
             }
             if (isLockerDone) {
-                println("测试打印 ： 上锁人状态 - ${pServerTicket.locker?.status}")
+                LogUtil.i("测试打印 ： 上锁人状态 - ${pServerTicket.locker?.status}")
                 if (pServerTicket.locker?.status == 0 || pServerTicket.locker?.status == 1) {
                     pServerTicket.locker?.status = pServerTicket.locker!!.status!! + 1
                 }
             }
         }
 
-        println("updateWorkTicket3 : $workTicketList")
+        LogUtil.i("updateWorkTicket3 : $workTicketList")
     }
 
     fun getTicketJson(): String {

app/src/main/java/com/grkj/iscs/util/FileUtil.kt

@@ -2,6 +2,7 @@ package com.grkj.iscs.util
 
 import android.content.Context
 import android.os.Environment
+import com.grkj.iscs.util.log.LogUtil
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.io.BufferedReader
@@ -110,7 +111,7 @@ object FileUtil {
             //是文件就拷贝
             var newfile = File(destFile.absolutePath, f.name)
             if (f.isFile) {
-                println("${f.absolutePath}-->${newfile.absolutePath}")
+                LogUtil.i("${f.absolutePath}-->${newfile.absolutePath}")
                 copyfile(f, newfile)
             } else { //如果是目录就递归复制
                 //如果目标文件不存在，则创建

app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -26,6 +26,7 @@ import com.grkj.iscs.model.vo.ticket.WorkstationTicketListRespVO
 import com.grkj.iscs.model.vo.user.RoleListRespVO
 import com.grkj.iscs.model.vo.user.UserInfoRespVO
 import com.grkj.iscs.model.vo.user.UserListRespVO
+import com.grkj.iscs.util.log.LogUtil
 
 /**
  * 网络请求
@@ -372,7 +373,7 @@ object NetApi {
      * 取出挂锁时更新数据
      */
     fun updateLockTake(list: MutableList<LockTakeUpdateReqVO>, callBack: (Boolean?) -> Unit) {
-        println("updateLockTake : $list")
+        LogUtil.i("updateLockTake : $list")
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.LOCK_TAKE_UPDATE,
             false,

app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt

@@ -177,7 +177,7 @@ class NetHttpManager {
                             )
                         }
                     } catch (e: Exception) {
-                        println("非标准返回数据，特殊处理：${e.message}")
+                        LogUtil.i("非标准返回数据，特殊处理：${e.message}")
                         callback(it.body, null, it.status)
                     }
                 } else {

app/src/main/java/com/grkj/iscs/view/activity/test/BleActivity.kt

@@ -81,27 +81,27 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                         item?.let {
                             BleUtil.instance?.indicate(it.bleDevice, indicateCallback = object : CustomBleIndicateCallback() {
                                 override fun onPrompt(promptStr: String?) {
-                                    println("监听onPrompt ： $promptStr")
+                                    LogUtil.i("监听onPrompt ： $promptStr")
                                 }
 
                                 override fun onConnectPrompt(promptStr: String?) {
-                                    println("监听onConnectPrompt ： $promptStr")
+                                    LogUtil.i("监听onConnectPrompt ： $promptStr")
                                 }
 
                                 override fun onDisConnectPrompt(promptStr: String?) {
-                                    println("监听onDisConnectPrompt ： $promptStr")
+                                    LogUtil.i("监听onDisConnectPrompt ： $promptStr")
                                 }
 
                                 override fun onIndicateSuccess() {
-                                    println("监听成功")
+                                    LogUtil.i("监听成功")
                                 }
 
                                 override fun onIndicateFailure(exception: BleException?) {
-                                    println("监听失败")
+                                    LogUtil.i("监听失败")
                                 }
 
                                 override fun onCharacteristicChanged(data: ByteArray?) {
-                                    println("******************* : ${data?.toHexStrings()}")
+                                    LogUtil.i("******************* : ${data?.toHexStrings()}")
                                     data?.let { itData ->
                                         BleCmdManager.handleRsp(it, itData)
                                     }
@@ -121,11 +121,11 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     holder.setOnClickListener(R.id.token) {
                         BleCmdManager.getToken(item?.bleDevice?.mac, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("getToken success")
+                                LogUtil.i("getToken success")
                             }
 
                             override fun onWriteFailure(exception: BleException?) {
-                                println("getToken fail")
+                                LogUtil.e("getToken fail")
                             }
                         })
                     }
@@ -133,11 +133,11 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     holder.setOnClickListener(R.id.version) {
                         BleCmdManager.getVersion(item?.bleDevice?.mac, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("getVersion success")
+                                LogUtil.i("getVersion success")
                             }
 
                             override fun onWriteFailure(exception: BleException?) {
-                                println("getVersion fail")
+                                LogUtil.e("getVersion fail")
                             }
                         })
                     }
@@ -145,11 +145,11 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     holder.setOnClickListener(R.id.power) {
                         BleCmdManager.getPower(item?.bleDevice?.mac, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("getPower success")
+                                LogUtil.i("getPower success")
                             }
 
                             override fun onWriteFailure(exception: BleException?) {
-                                println("getPower fail")
+                                LogUtil.e("getPower fail")
                             }
                         })
                     }
@@ -157,10 +157,10 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     holder.setOnClickListener(R.id.device) {
                         BleCmdManager.getCurrentStatus(item?.bleDevice!!, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("getCurrentStatus success")
+                                LogUtil.i("getCurrentStatus success")
                             }
                             override fun onWriteFailure(exception: BleException?) {
-                                println("getCurrentStatus fail")}
+                                LogUtil.e("getCurrentStatus fail")}
                         })
                     }
 

app/src/main/java/com/grkj/iscs/view/activity/test/ModbusActivity.kt

@@ -82,7 +82,7 @@ class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityMod
                     return@readLockRfid
                 }
                 val rfid = res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
-                println("锁具RFID : $rfid")
+                LogUtil.i("锁具RFID : $rfid")
                 ModBusController.updateLockRfid(mBinding?.slaveIdx?.text.toString().toByte(), mBinding?.lockIdx?.text.toString().toInt(), rfid)
             }
         }
@@ -95,56 +95,56 @@ class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityMod
                     return@readKeyRfid
                 }
                 val rfid = res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
-                println("钥匙RFID : $rfid")
+                LogUtil.i("钥匙RFID : $rfid")
                 ModBusController.updateKeyRfid(1, left, rfid)
             }
         }
 
         mBinding?.openLeftKeyBuckle?.setOnClickListener {
-            println("____________________________________")
+            LogUtil.i("____________________________________")
             if (mBinding?.slaveIdx?.text.toString().isEmpty()) {
                 ToastUtils.tip("请输入设备编号")
                 return@setOnClickListener
             }
             ModBusController.controlKeyBuckle(isOpen = true, true, mBinding?.slaveIdx?.text.toString().toByte()) {
                 LogUtil.i("开左钥匙卡扣 : ${it.toHexStrings()}")
-                println("____________________________________")
+                LogUtil.i("____________________________________")
             }
         }
 
         mBinding?.closeLeftKeyBuckle?.setOnClickListener {
-            println("____________________________________")
+            LogUtil.i("____________________________________")
             if (mBinding?.slaveIdx?.text.toString().isEmpty()) {
                 ToastUtils.tip("请输入设备编号")
                 return@setOnClickListener
             }
             ModBusController.controlKeyBuckle(isOpen = false, true, mBinding?.slaveIdx?.text.toString().toByte()) {
                 LogUtil.i("关左钥匙卡扣 : ${it.toHexStrings()}")
-                println("____________________________________")
+                LogUtil.i("____________________________________")
             }
         }
 
         mBinding?.openRightKeyBuckle?.setOnClickListener {
-            println("____________________________________")
+            LogUtil.i("____________________________________")
             if (mBinding?.slaveIdx?.text.toString().isEmpty()) {
                 ToastUtils.tip("请输入设备编号")
                 return@setOnClickListener
             }
             ModBusController.controlKeyBuckle(isOpen = true, false, mBinding?.slaveIdx?.text.toString().toByte()) {
                 LogUtil.i("开右钥匙卡扣 : ${it.toHexStrings()}")
-                println("____________________________________")
+                LogUtil.i("____________________________________")
             }
         }
 
         mBinding?.closeRightKeyBuckle?.setOnClickListener {
-            println("____________________________________")
+            LogUtil.i("____________________________________")
             if (mBinding?.slaveIdx?.text.toString().isEmpty()) {
                 ToastUtils.tip("请输入设备编号")
                 return@setOnClickListener
             }
             ModBusController.controlKeyBuckle(isOpen = false, false, mBinding?.slaveIdx?.text.toString().toByte()) {
                 LogUtil.i("关右钥匙卡扣 : ${it.toHexStrings()}")
-                println("____________________________________")
+                LogUtil.i("____________________________________")
             }
         }
 

app/src/main/java/com/grkj/iscs/view/presenter/CreateTicketPresenter.kt

@@ -12,6 +12,7 @@ import com.grkj.iscs.model.vo.ticket.TicketTypeRespVO
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
 import com.grkj.iscs.util.ToastUtils
+import com.grkj.iscs.util.log.LogUtil
 
 class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
 
@@ -31,15 +32,15 @@ class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
 //        }
 
         NetApi.getDeptList(0, 10) {
-            println("getDeptList : $it")
+            LogUtil.i("getDeptList : $it")
         }
 
         NetApi.getRoleList(0, 10, USER_ROLE_LOCKER) {
-            println("Locker getRoleList : $it")
+            LogUtil.i("Locker getRoleList : $it")
             mvpView?.updateLockerList(it?.rows?.map { it.nickName!! })
         }
         NetApi.getRoleList(0, 10, USER_ROLE_COLOCKER) {
-            println("Colocker getRoleList : $it")
+            LogUtil.i("Colocker getRoleList : $it")
         }
     }
 
@@ -51,7 +52,7 @@ class CreateTicketPresenter : BasePresenter<ICreateTicketView>() {
 
     fun getSopInfo(sopId: Long, callBack: (List<String?>?) -> Unit) {
         NetApi.getSopInfo(sopId) {
-            println("getSopInfo : $it")
+            LogUtil.i("getSopInfo : $it")
             callBack.invoke(it?.pointDetailVOList?.map { it.pointName })
         }
     }

app/src/main/java/com/grkj/iscs/view/presenter/JobProgressPresenter.kt

@@ -96,7 +96,7 @@ class JobProgressPresenter : BasePresenter<IJobProgressView>() {
             // 3个状态全检查锁和钥匙分配情况，防止第一次拿了钥匙和部分锁
             if (role.jobStatus == JOB_STATUS_NOT_STARTED || role.jobStatus == JOB_STATUS_ACQUIRE_LOCK || role.jobStatus == JOB_STATUS_ACQUIRE_KEY) {
                 NetApi.getTicketEquipDetail(ticketId) { equipDetail ->
-                    println("EquipDetail : $equipDetail")
+                    LogUtil.i("EquipDetail : $equipDetail")
                     // 取锁具、取钥匙
                     val needLockCount = equipDetail?.ticketLockVOList?.count { it.lockId == null } ?: 0
                     val readyLockCount = BusinessManager.mDeviceTakeList.count { it.deviceType == DEVICE_TYPE_LOCK && it.ticketId == ticketId }

app/src/main/java/com/grkj/iscs/view/presenter/LoginPresenter.kt

@@ -74,7 +74,7 @@ class LoginPresenter : BasePresenter<ILoginView>() {
                         ModBusController.readPortalCaseCardRfid(dockBean.addr) { res ->
                             if (res.size >= 11) {
                                 val rfid = res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
-                                println("卡片RFID ： $rfid")
+                                LogUtil.i("卡片RFID ： $rfid")
                                 // TODO 跳转页面处理
                             }
                         }