修改R指令为退出护理，修改Y指令为取消呼叫，修改?指令为换药

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/activity/MainActivity.kt

@@ -1071,27 +1071,7 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
 
                     "Y" -> {
                         //换药按键
-                        val func = findKeyFunc("Y")
-                        if (func != null) {
-                            Log.e(TAG, "keyId: ${func.value}")
-                            sendEvent(addr, func.value)
-                        } else {
-                            Log.e(TAG, "error func: Y换药按键")
-                        }
-                    }
 
-                    "R" -> {
-                        //清除所有事件
-                        //退出护理
-                        val mac = addr.toUpperCase(Locale.ROOT)
-                        if (nursingMap.containsKey(mac)) {
-                            nursingMap.remove(mac)
-                            sendNursingEnd(addr)
-                        }
-                    }
-
-                    "?" -> {
-                        //拔针按键
                         //印尼项目定义为呼叫取消
                         if (Constant.CALL_STATE == Constant.CALL_CALLING) {
                             if (addr.equals(curDeviceUart, true)) {
@@ -1117,6 +1097,29 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                             SerialPortHelper.closeDoorLight(doorAddr)
                         }
                     }
+
+                    "R" -> {
+                        //清除所有事件
+                        //退出护理
+                        val mac = addr.toUpperCase(Locale.ROOT)
+                        if (nursingMap.containsKey(mac)) {
+                            nursingMap.remove(mac)
+                            sendNursingEnd(addr)
+                        }
+                    }
+
+                    "?" -> {
+                        //拔针按键
+
+                        //印尼项目定义为换药按键
+                        val func = findKeyFunc("?")
+                        if (func != null) {
+                            Log.e(TAG, "keyId: ${func.value}")
+                            sendEvent(addr, func.value)
+                        } else {
+                            Log.e(TAG, "error func: ?按键")
+                        }
+                    }
                 }
             } else {
                 //这里实际上是执行了“E”指令