From 19f72c40de40ec0e09c67ca45f26d9bcf4bd5ef7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 12 一月 2021 10:43:10 +0800
Subject: [PATCH] 2021-01-12 1.读取状态回复 byte1~8 代表干接点1~8的状态  0:闭合,1:断开

---
 Android_HDL_SDK_TTL_DOC/src/api_mcu.md |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/Android_HDL_SDK_TTL_DOC/src/api_mcu.md b/Android_HDL_SDK_TTL_DOC/src/api_mcu.md
index 791262c..05cae5a 100755
--- a/Android_HDL_SDK_TTL_DOC/src/api_mcu.md
+++ b/Android_HDL_SDK_TTL_DOC/src/api_mcu.md
@@ -416,7 +416,10 @@
 
 璋冪敤璇ユ帴鍙o紝鍙互鍙戦�佽鍙栨柊鐗堟湰MCU灏忔澘骞叉帴鐐圭姸鎬佺殑鎸囦护銆�
 
-娉細璇诲彇鐘舵�佸洖澶� bit0~7 浠h〃骞叉帴鐐�1~8鐨勭姸鎬�  0锛氶棴鍚堬紝1锛氭柇寮�
+娉細璇诲彇鐘舵�佸洖澶� byte1~8 浠h〃骞叉帴鐐�1~8鐨勭姸鎬�  0锛氶棴鍚堬紝1锛氭柇寮�
+
+鏍规嵁闇�瑕� 瑙f瀽闇�瑕佷娇鐢ㄧ殑骞叉帴鐐逛綅缃紝鐩墠鑷冲皯鏀寔8涓紝鍚庨潰鎵╁睍鐨勮瘽澧炲姞鏁扮粍闀垮害
+
 
 **浠g爜鑼冧緥**
 
@@ -424,7 +427,7 @@
     .......
     /**
     * MCU璇诲共鎺ョ偣鐘舵��
-    * 璇诲彇鐘舵�佸洖澶� bit0~7 浠h〃骞叉帴鐐�1~8鐨勭姸鎬�  0锛氶棴鍚堬紝1锛氭柇寮�
+    * 璇诲彇鐘舵�佸洖澶� byte1~8 浠h〃骞叉帴鐐�1~8鐨勭姸鎬�  0锛氶棴鍚堬紝1锛氭柇寮�
     */
     HDLCommand.mcuReadDryContactStatus();
     .......
@@ -446,30 +449,40 @@
      */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMCUDryContactStatusBackEventMain(MCUDryContactStatusBackEvent event) {
-        //bit0~7 浠h〃骞叉帴鐐�1~8鐨勭姸鎬�  0锛氶棴鍚堬紝1锛氭柇寮�
-        byte allStatus = event.getStatus();
-        int dryContact1 = HDLUtlis.getBit(allStatus, 0);
-        int dryContact2 = HDLUtlis.getBit(allStatus, 1);
-        int dryContact3 = HDLUtlis.getBit(allStatus, 2);
-        int dryContact4 = HDLUtlis.getBit(allStatus, 3);
-        int dryContact5 = HDLUtlis.getBit(allStatus, 4);
-        int dryContact6 = HDLUtlis.getBit(allStatus, 5);
-        int dryContact7 = HDLUtlis.getBit(allStatus, 6);
-        int dryContact8 = HDLUtlis.getBit(allStatus, 7);
+        //byte1~8 浠h〃骞叉帴鐐�1~8鐨勭姸鎬�  0锛氶棴鍚堬紝1锛氭柇寮�
+        byte[] allStatus = event.getStatus();
+        if (allStatus.length > 7) {
+            int dryContact1 = allStatus[0];
+            int dryContact2 = allStatus[1];
+            int dryContact3 = allStatus[2];
+            int dryContact4 = allStatus[3];
+            int dryContact5 = allStatus[4];
+            int dryContact6 = allStatus[5];
+            int dryContact7 = allStatus[6];
+            int dryContact8 = allStatus[7];
 
-        //鏍规嵁闇�瑕� 瑙f瀽闇�瑕佷娇鐢ㄧ殑骞叉帴鐐逛綅缃紝鐩墠鏈�澶氭敮鎸�8涓�
-        String message = "";
-        message += "\n" + "骞叉帴鐐�1锛�" + getStatusString(dryContact1);
-        message += "\n" + "骞叉帴鐐�2锛�" + getStatusString(dryContact2);
-        message += "\n" + "骞叉帴鐐�3锛�" + getStatusString(dryContact3);
-        message += "\n" + "骞叉帴鐐�4锛�" + getStatusString(dryContact4);
-        message += "\n" + "骞叉帴鐐�5锛�" + getStatusString(dryContact5);
-        message += "\n" + "骞叉帴鐐�6锛�" + getStatusString(dryContact6);
-        message += "\n" + "骞叉帴鐐�7锛�" + getStatusString(dryContact7);
-        message += "\n" + "骞叉帴鐐�8锛�" + getStatusString(dryContact8);
-        tv_mes.setText(message);
+            //鏍规嵁闇�瑕� 瑙f瀽闇�瑕佷娇鐢ㄧ殑骞叉帴鐐逛綅缃紝鐩墠鑷冲皯鏀寔8涓紝鍚庨潰鎵╁睍鐨勮瘽澧炲姞 byte[] allStatus鏁扮粍闀垮害
+            String message = "";
+            message += "\n" + "骞叉帴鐐�1锛�" + getStatusString(dryContact1);
+            message += "\n" + "骞叉帴鐐�2锛�" + getStatusString(dryContact2);
+            message += "\n" + "骞叉帴鐐�3锛�" + getStatusString(dryContact3);
+            message += "\n" + "骞叉帴鐐�4锛�" + getStatusString(dryContact4);
+            message += "\n" + "骞叉帴鐐�5锛�" + getStatusString(dryContact5);
+            message += "\n" + "骞叉帴鐐�6锛�" + getStatusString(dryContact6);
+            message += "\n" + "骞叉帴鐐�7锛�" + getStatusString(dryContact7);
+            message += "\n" + "骞叉帴鐐�8锛�" + getStatusString(dryContact8);
+            tv_mes.setText(message);
 //        showToast(message);
-        HDLLog.Log(message);
+            HDLLog.Log(message);
+        }
+    }
+  
+    /**
+     * @param statusInt 0锛氶棴鍚堬紝1锛氭柇寮�
+     * @return 闂悎or鏂紑
+     */
+    private String getStatusString(int statusInt) {
+        return statusInt > 0 ? "鏂紑" : "闂悎";
     }
 
 ```
\ No newline at end of file

--
Gitblit v1.8.0