From: TrillGates Date: Wed, 29 Dec 2021 11:25:01 +0000 (+0800) Subject: 解决pt460天气解析的问题 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a6814266ed35a393856d0a59d6db24422a0c31bc;p=icsupport.git 解决pt460天气解析的问题 --- diff --git a/app/release/ICSer_V943_2112282014_release.apk b/app/release/ICSer_V945_2112291920_release.apk similarity index 77% rename from app/release/ICSer_V943_2112282014_release.apk rename to app/release/ICSer_V945_2112291920_release.apk index a98526a8..6dcdc412 100644 Binary files a/app/release/ICSer_V943_2112282014_release.apk and b/app/release/ICSer_V945_2112291920_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 8fd67078..81e518cd 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":943,"versionName":"2112282014","enabled":true,"outputFile":"ICSer_V943_2112282014_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V943_2112282014_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":945,"versionName":"2112291920","enabled":true,"outputFile":"ICSer_V945_2112291920_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V945_2112291920_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java b/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java index 3fc70d35..fa2c051c 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java +++ b/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java @@ -25,8 +25,8 @@ public class voicePacket { int filetype = 1; int datatype = 3; - String Sender=""; - String durationHex="00"; + String Sender = ""; + String durationHex = "00"; String time = null; String Name = null; String appendIndex = null; @@ -45,14 +45,21 @@ public class voicePacket { return packetCount; } - public void setDurationHex(String duration){ - durationHex=duration; + public void setDurationHex(String duration) { + durationHex = duration; } - public String getDurationHex(){ return durationHex;} - public void setSender(String sender){ - Sender=sender; + + public String getDurationHex() { + return durationHex; + } + + public void setSender(String sender) { + Sender = sender; + } + + public String getSender() { + return Sender; } - public String getSender(){return Sender;} public void setPacketTime(String _time) { time = _time; @@ -120,19 +127,16 @@ public class voicePacket { packetCount = _packetCount; } if (_packetCount == packetCount && Name.equals(_Name)) { - boolean packetfound = false; + boolean packetFund = false; for (voicepacketItem item : packetArray) { if (item.currentId == _currentId) { - packetfound = true; + packetFund = true; } } - if (packetfound) + if (packetFund) return false; - packetArray.add(new voicepacketItem(_currentId, _packetLen, _packetData)); - } - return ret; } diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java index 71baff52..9ca5b74d 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -12,6 +12,7 @@ import android.support.v4.app.ActivityCompat; import android.text.TextUtils; import com.enqualcomm.support.Config; +import com.enqualcomm.support.Constants; import com.enqualcomm.support.CoreService; import com.enqualcomm.support.LocationClient; import com.enqualcomm.support.bean.Alarm; @@ -33,8 +34,8 @@ import com.enqualcomm.support.utils.DeviceInfoUtil; 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 com.ic.iclooger.ICLogger; +import com.ic.s123.GenericWeatherInfo; import java.io.File; import java.io.FileOutputStream; @@ -48,8 +49,6 @@ import java.util.List; import static com.enqualcomm.support.Constants.ACTION_ALARM_ALARM_CHANGE; import static com.enqualcomm.support.Constants.FROM_SERVER; import static com.enqualcomm.support.LocationClient.LOCATION_MODE; -import static com.ic.protocols.protocol_beehome.CMD_TYPE.AP05; -import static com.ic.protocols.protocol_beehome.CMD_TYPE.AP32; import static java.lang.Math.abs; public class protocol_beehome { @@ -94,7 +93,7 @@ public class protocol_beehome { public void doAP05() { ICLogger.d("doAP05..."); String ap05Msg = AP05(true); - StringMessage stringMessage = genStringMessage(cmdStrMap.get(AP05), ap05Msg); + StringMessage stringMessage = genStringMessage(cmdStrMap.get(CMD_TYPE.AP05), ap05Msg); mConnection.send(stringMessage); } @@ -248,7 +247,7 @@ public class protocol_beehome { cmdStrMap.put(CMD_TYPE.AP31, "AP31"); cmdStrMap.put(CMD_TYPE.BP31, "BP31"); cmdStrMap.put(CMD_TYPE.BP32, "BP32"); - cmdStrMap.put(AP32, "AP32"); + cmdStrMap.put(CMD_TYPE.AP32, "AP32"); cmdStrMap.put(CMD_TYPE.AP33, "AP33"); cmdStrMap.put(CMD_TYPE.BP33, "BP33"); cmdStrMap.put(CMD_TYPE.AP34, "AP34"); @@ -1199,7 +1198,7 @@ public class protocol_beehome { // AP05命令L02服务器不适用 public static String AP05(boolean recFlat) { - return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP05)) + return new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP05)) .append(CMDSPLIT).append(recFlat ? 1 : 0) .append(CMDEND).toString(); } @@ -1637,7 +1636,7 @@ public class protocol_beehome { * 1:当前设备收到的是第几个包 * 1:表示设备接受数据成功,0表示设备接受数据失败 */ - String Name; + String name; String appendIndex; int packetCount; int currentId; @@ -1648,7 +1647,10 @@ public class protocol_beehome { if (msg.length >= 6) { try { - Name = msg[1]; + name = msg[1]; + if (TextUtils.isEmpty(name)) { + name = "group"; + } appendIndex = msg[2]; packetCount = Integer.parseInt(msg[3]); currentId = Integer.parseInt(msg[4]); @@ -1656,7 +1658,7 @@ public class protocol_beehome { packetData = Util.subArray(bytes, msg[0].length() + msg[1].length() + msg[2].length() + msg[3].length() + msg[4].length() + msg[5].length() + 6, bytes.length - 1); StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("recv BP28 name = ").append(Name) + stringBuffer.append("recv BP28 name = ").append(name) .append(",appendIndex = ").append(appendIndex) .append(",packetCount = ").append(packetCount) .append(",currentId = ").append(currentId) @@ -1664,8 +1666,8 @@ public class protocol_beehome { .append(",packetDatalen = ").append(packetData.length); log(stringBuffer.toString()); - connection.send(AP28(Name, appendIndex, packetCount, currentId, 1)); - voicePacket.getInstance().appendVoice(Name, appendIndex, packetCount, currentId, packetLen, packetData); + connection.send(AP28(name, appendIndex, packetCount, currentId, 1)); + voicePacket.getInstance().appendVoice(name, appendIndex, packetCount, currentId, packetLen, packetData); log("================" + voicePacket.getInstance().toString()); if (voicePacket.getInstance().isFinished()) { String dir = Environment.getExternalStorageDirectory() + "/Android/VoiceCache"; @@ -2271,30 +2273,58 @@ public class protocol_beehome { */ private void handleBPTQ(String cmd) { //对指令进行切割 - String[] split = cmd.split(CMDSPLIT); - if (split.length == 23) { - //先拿到城市数据 - 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); + String[] cmdList = cmd.split(CMDSPLIT); + if (cmdList.length == 23) { + + StringBuilder sb = new StringBuilder(); + StringBuilder msg = new StringBuilder(); + String cityName = Util.decodeUnicode2Utf8(cmdList[22]); + List weatherInfo = new ArrayList<>(); + for (int i = 0; i < 3; i++) { + String DayTime = cmdList[1 + i * 7] + " " + cmdList[2 + i * 7]; + String date = "20" + cmdList[1 + i * 7].trim(); + String weather_name = Util.decodeUnicode2Utf8(cmdList[3 + i * 7].trim()); + String weather_id = cmdList[4 + i * 7]; + String temp_current = cmdList[5 + i * 7]; + String temp_high = cmdList[6 + i * 7]; + String temp_low = cmdList[7 + i * 7]; + + sb.append(" " + DayTime); + sb.append(",天气:" + weather_name); + sb.append(",ID " + weather_id); + sb.append(",当前温度 " + temp_current); + sb.append(",最高温度 " + temp_high); + sb.append(",最低温度 " + temp_low); + sb.append("\n"); + + msg.append(date); + msg.append("," + weather_name); + msg.append("," + weather_id); + msg.append("," + temp_current); + msg.append("," + temp_high); + msg.append("," + temp_low); + msg.append(";"); + + //返回数据给UI + GenericWeatherInfo itemFirst = new GenericWeatherInfo(DayTime, + weather_name, weather_id, temp_current, temp_low, temp_high, cityName); + //封装数据 + weatherInfo.add(itemFirst); + } + ICLogger.i(cityName + " \n" + sb.toString()); + + msg.insert(0, cityName + ";"); + String weatherStr = msg.toString(); + if (weatherStr.endsWith(";")) { + weatherStr = weatherStr.substring(0, weatherStr.lastIndexOf(";")); } + Intent intent = new Intent(Constants.ACTION_WEATHER_RECEIVED); + intent.putExtra(Constants.KEY_Weather, weatherStr); + ICLogger.i("send Broadcast " + Constants.ACTION_WEATHER_RECEIVED + "\n" + weatherStr + "\n"); + CoreService.getInstance().sendBroadcast(intent); + mRuntime.updateS123Weather(weatherInfo); } else { - ICLogger.d("format BPTQ 错误..."); + ICLogger.i(" BPTQ Format error!"); } } @@ -2358,8 +2388,8 @@ public class protocol_beehome { * @return */ private StringMessage AP32(String cmdIndex) { - return genStringMessage(cmdStrMap.get(AP32), - new StringBuilder(CMDHEADER).append(cmdMap.get(AP32)) + return genStringMessage(cmdStrMap.get(CMD_TYPE.AP32), + new StringBuilder(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP32)) .append(CMDSPLIT).append(cmdIndex).append(CMDEND).toString()); } diff --git a/app/version_code.properties b/app/version_code.properties index 88c499d4..37aec343 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Dec 28 20:14:43 CST 2021 -VERSION_CODE=943 +#Wed Dec 29 19:20:52 CST 2021 +VERSION_CODE=945