添加了天气数据的解析for beehome
authorTrillGates <williamtrillgates@gmail.com>
Wed, 8 Dec 2021 03:09:10 +0000 (11:09 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Wed, 8 Dec 2021 03:09:10 +0000 (11:09 +0800)
app/src/main/java/com/ic/fzd/weather/FZDWeatherInfo.java
app/src/main/java/com/ic/protocols/protocolAPIHelper.java
app/src/main/java/com/ic/protocols/protocol_beehome.java

index 2dae509..f6cea8b 100644 (file)
@@ -147,6 +147,21 @@ public class FZDWeatherInfo implements Parcelable {
         return 0;
     }
 
+    @Override
+    public String toString() {
+        return "FZDWeatherInfo{" +
+                "weatherText='" + weatherText + '\'' +
+                ", code='" + code + '\'' +
+                ", currentTempe='" + currentTempe + '\'' +
+                ", lowTemp='" + lowTemp + '\'' +
+                ", highTemp='" + highTemp + '\'' +
+                ", cityName='" + cityName + '\'' +
+                ", windDirection='" + windDirection + '\'' +
+                ", windLev='" + windLev + '\'' +
+                ", dateTime='" + dateTime + '\'' +
+                '}';
+    }
+
     public static final Creator<FZDWeatherInfo> CREATOR = new Creator<FZDWeatherInfo>() {
         @Override
         public FZDWeatherInfo createFromParcel(Parcel in) {
index 291408c..e1d54f9 100644 (file)
@@ -73,6 +73,8 @@ public class protocolAPIHelper {
             case Config.PROTOCOL_JIAI:
                 break;
             case Config.PROTOCOL_BEEHOME:
+                //TODO:获取天气信息
+                connection.send(protocol_beehome.APTQ(runtime));
                 break;
             case Config.PROTOCOL_IC:
                 break;
index 730085d..a5d2b98 100644 (file)
@@ -28,12 +28,15 @@ import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
+import com.ic.fzd.weather.FZDWeatherInfo;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 
+import chestnut.utils.StringUtils;
+
 import static com.enqualcomm.support.Constants.FROM_SERVER;
 import static com.enqualcomm.support.LocationClient.LOCATION_MODE;
 import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
@@ -48,6 +51,7 @@ public class protocol_beehome {
     public static final String defaultServerIP = "en.beehome360.com";
     public static final int defaultServerPort = 5018;
 
+
     /**
      * 解析测试指令
      *
@@ -157,6 +161,8 @@ public class protocol_beehome {
         BPJK,//平台响应
         BPSM,//平台下发短信指令
         APSM,//设备回复是否收到平台短信指令
+        APTQ,//天气信息请求
+        BPTQ,//天气信息响应
     }
 
     private static HashMap<CMD_TYPE, String> cmdStrMap = null;
@@ -252,6 +258,8 @@ public class protocol_beehome {
         cmdStrMap.put(CMD_TYPE.BPJK, "BPJK");
         cmdStrMap.put(CMD_TYPE.BPSM, "BPSM");
         cmdStrMap.put(CMD_TYPE.APSM, "APSM");
+        cmdStrMap.put(CMD_TYPE.APTQ, "APTQ");
+        cmdStrMap.put(CMD_TYPE.BPTQ, "BPTQ");
         //
         cmdMap = new HashMap<>();
         cmdMap.put("AP00", CMD_TYPE.AP00);
@@ -342,6 +350,8 @@ public class protocol_beehome {
         cmdMap.put("BPJK", CMD_TYPE.BPJK);
         cmdMap.put("BPSM", CMD_TYPE.BPSM);
         cmdMap.put("APSM", CMD_TYPE.APSM);
+        cmdMap.put("BPTQ", CMD_TYPE.BPTQ);
+        cmdMap.put("APTQ", CMD_TYPE.APTQ);
     }
 
 
@@ -392,8 +402,8 @@ public class protocol_beehome {
     }
 
 
-    /**/
     public static StringMessage genStringMessage(String cmdName, String msg) {
+        ICLogger.d("msg ==> " + msg);
         //设置cmdName,在这里配置进去的msg没有实际用到
         StringMessage sm = new StringMessage(new String[]{cmdName, msg});
         //用此函数设置要发送的内容
@@ -822,9 +832,29 @@ public class protocol_beehome {
         }
     }
 
-    //关机
-
+    /**
+     * 1.   请求天气(上行协议号:APTQ,响应:BPTQ)(不支持国外)
+     * 示例:
+     * IWAPTQ,460,0,9520,3671,0#
+     * 说明:
+     * IW:标识符APTQ : 命令字符460,0,9520,3671基站信息0:语言标志位   0 默认为中文,1为英文
+     *
+     * @param runtime
+     * @return
+     */
+    public static StringMessage APTQ(Runtime runtime) {
+        //IWAPTQ,460,0,9520,3671,0#
+        return genStringMessage(cmdStrMap.get(CMD_TYPE.APTQ),
+                new StringBuffer(CMDHEADER)
+                        .append(cmdStrMap.get(CMD_TYPE.APTQ))
+                        .append(CMDSPLIT)
+                        .append(runtime.getLBSMultiStationData())
+                        .append(CMDSPLIT)
+                        .append("0")//中文
+                        .toString());
+    }
 
+    //关机
     public static StringMessage AP31(String index) {
         return genStringMessage(cmdStrMap.get(CMD_TYPE.AP31), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP31))
                 .append(CMDSPLIT).append(index)
@@ -2091,12 +2121,52 @@ public class protocol_beehome {
                 .append(CMDEND).toString());
     }
 
+    /**
+     * 处理天气信息
+     * 平台响应: IWBPTQ, 16-09-24,11:00:00,b6e0d4c6,2,-5,-12,22,16-09-25,11:00:00,b6e0d4c6,2,-5,-12,22,16-09-26,11:00:00,b6e0d4c6,2,-5,-12,22,316df15733#
+     * 年-月-日,时:分:秒,天气描述,天气编号,当前温度,最低温,最高温,年-月-日,时:分:秒,天气描述,天气编号,当前温度,最低温,最高温,年-月-日,时:分:秒,天气描述,天气编号,当前温度,最低温,最高温,城市名注:天气描述用Unicode编码,城市名使用Unicode编码,
+     * 第一组为当天,后2组依次为后续2天天气如天气编号及描述对应如下
+     * (天气描述不需要发送括号内的白天晚上)
+     * 因天气接口的变更 返
+     * 回天气类型暂时支持 11 16 26 32
+     * 0:龙卷风1:热带风暴2:飓风3:严重的雷暴4:雷暴5:混合雨雪6:混合降雨和冰雹7:混合雪和雨夹雪8:冻结小雨9:小雨10:冻雨11:阵雨12:阵雨13:雪飘雪14:小雪阵雨15:吹雪16:雪17:冰雹18:雨夹雪19:尘埃20:雾21:霾22:黑烟23:大风24:风25:低温26:多云27:多云(晚上)28:多云(白天)29:局部多云(晚上)30:局部多云(天)31:清爽(晚)32:晴天33:晴朗(晚)34:晴朗(天)35:混合雨和冰雹36:热37:局部地区性雷暴38:零星雷暴39:零星雷暴40:零星阵雨41:大雪42:零星阵雪43:大雪44:多云45:雷阵雨46:阵雪47:局部雷阵雨      
+     *
+     * @param cmd
+     */
+    private void handleBPTQ(String cmd) {
+        //对指令进行切割
+        String[] split = cmd.split(CMDSPLIT);
+        if (split.length == 24) {
+            //先拿到城市数据
+            String cityName = split[split.length - 1];
+            for (int j = 1; j < split.length; j += 7) {
+                //日期
+                String date = split[j];
+                //时间
+                String time = split[j + 1];
+                ICLogger.d("天气日期:" + date + " 时间:" + time);
+                String description = split[j + 2];
+                String weatherCode = split[j + 3];
+                String currentTemp = split[j + 4];
+                String minTemp = split[j + 5];
+                String maxTemp = split[j + 6];
+                FZDWeatherInfo fzdWeatherInfo = new FZDWeatherInfo(
+                        Util.decodeUnicode2Utf8(description), weatherCode, currentTemp, minTemp,
+                        maxTemp, Util.decodeUnicode2Utf8(cityName),
+                        null, null, date + " " + time
+                );
+                ICLogger.d("fzdWeatherInfo ==> " + fzdWeatherInfo);
+            }
+        } else {
+            ICLogger.d("format BPTQ 错误...");
+        }
+    }
+
 
     public void handleBPSQ(String cmd, Connection connection, Runtime runtime) {
         //IWBPSQ,353456789012345,080835,1,60#
         //说明:
         //  080835为序列号,1,是传感器类型(1是心率,2是血压,3是体温,4是血氧),60为间隔时间,单位为秒
-
         String[] list = cmd.split(CMDSPLIT);
         if (list.length >= 5) {
 
@@ -2487,11 +2557,14 @@ public class protocol_beehome {
                 //收到设置短信指令的信息
                 handleBPSM(cmd);
                 break;
+            case BPTQ:
+                //处理下发的天气信息
+                handleBPTQ(cmd);
+                break;
         }
         return ret;
     }
 
-
     public boolean handleCmd(CMD_TYPE type, String cmd, byte[] bytes) {
 
         //只有需要传递二级制数据的才需要这个函数,目前只有BP28需要