From: TrillGates <williamtrillgates@gmail.com>
Date: Sat, 9 Oct 2021 02:40:51 +0000 (+0800)
Subject: parse qr code.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=3da3b8a2d2a198dd97dee66f55dd94ae2a88beb8;p=icsupport.git

parse qr code.
---

diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
index b1cb4890..951b707a 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
@@ -335,6 +335,7 @@ public class DBHelper {
                 String ring = query.getString(3);
                 String status = query.getString(4);
                 String name = query.getString(5);
+                ICLogger.d("alarm name ==> " + name);
                 String notifyLager = query.getString(6);
                 item.id = id;
                 item.time = time;
diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index 36d7f384..eccf8396 100644
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -3240,20 +3240,20 @@ public class protocol_s123 {
 
     //设置通讯录，白名单(10个)
     public void handleBPWL(Connection connection, String cmd, Runtime runtime) {
-//        IWBPWL,867155030001063,357444,9b44529b|13554820016,,,,,,,,,
-/**
- * IWBPWL,353456789012345,080835,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx,
- * D3590D54|135xxxxxxxxxx#
- */
+        //IWBPWL,867155030001063,357444,9b44529b|13554820016,,,,,,,,,
+        /**
+         * IWBPWL,353456789012345,080835,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx,
+         * D3590D54|135xxxxxxxxxx#
+         */
         String[] cmdlist = cmd.split(CMDSPLIT);
         String[] phnums = new String[]{"", "", "", "", "", "", "", "", "", ""};
         StringBuffer sb = new StringBuffer().append("recv phone Numbs ");
@@ -3819,6 +3819,8 @@ public class protocol_s123 {
             case AP99:
                 break;
             case BP99:
+                //下发二维码链接，设置到数据库里，然后设置端生成新的二维码
+                handleBP99(cmd);
                 break;
             case APTQ:
                 break;
@@ -3864,6 +3866,29 @@ public class protocol_s123 {
         return ret;
     }
 
+    /**
+     * 设置二维码
+     *
+     * @param cmd
+     */
+    private void handleBP99(String cmd) {
+        //IWBP99,866671044898063,33936,https://www.baidu.com
+        //解析数据，设置数据
+        String[] split = cmd.split(CMDSPLIT);
+        if (split.length == 4) {
+            //回复
+            //写到数据库，设置那边监听到变化，就会更新的了
+            String indexId = split[2];
+            String value = split[3];
+            //修改数据库
+            updateSettingValue("key_qr_code", value);
+            //返回消息
+            responseWithId(cmdMap.get(CMD_TYPE.AP45), indexId, value);
+        } else {
+            ICLogger.d("parse BP99 error==> " + cmd);
+        }
+    }
+
     /**
      * 静音开关控制
      *
@@ -4259,6 +4284,7 @@ public class protocol_s123 {
                         "W" + weekItem, "CON", "1".equals(isOpen) ? "ON" : "OFF", alarmName);
                 ICLogger.d("alarmItem == > " + alarmName);
                 //入库
+                ICLogger.d(" alarmItem.name==> " + alarmItem.name);
                 ContentValues contentValues = new ContentValues();
                 contentValues.put(ICDatabaseHelper.alarm_name, alarmItem.name);
                 contentValues.put(ICDatabaseHelper.alarm_week, alarmItem.week);
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4ba7258d..df2a3ca6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
 
     <string name="hht_misscall_call">来电提醒</string>
 
-    <string name="findDev">查找设备！</string>
+    <string name="findDev">デバイス検索！</string>
 
     <string name="hwpush_ability_value">successRateAnalytics</string>