From: TrillGates Date: Fri, 26 Nov 2021 03:19:12 +0000 (+0800) Subject: 修改了时区 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ece09cbe5ca735fa0671ff4973c61e5056b6e853;p=icsupport.git 修改了时区 --- diff --git a/app/release/ICSer_V922_2111241457_release.apk b/app/release/ICSer_V923_2111261026_release.apk similarity index 77% rename from app/release/ICSer_V922_2111241457_release.apk rename to app/release/ICSer_V923_2111261026_release.apk index a86eda82..51cb6a6c 100644 Binary files a/app/release/ICSer_V922_2111241457_release.apk and b/app/release/ICSer_V923_2111261026_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index ba8078da..75aa3821 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":922,"versionName":"2111241457","enabled":true,"outputFile":"ICSer_V922_2111241457_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V922_2111241457_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":923,"versionName":"2111261026","enabled":true,"outputFile":"ICSer_V923_2111261026_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V923_2111261026_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java index c91dc4a1..5a90f587 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java @@ -36,6 +36,11 @@ public class TimeUtil { return (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date(System.currentTimeMillis())); } + public static String getUTCTimeForCameraMark() { + return (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")) + .format(new Date(System.currentTimeMillis() - TimeZone.getDefault().getRawOffset())); + } + public static String getSystemTime() { return getSystemTime(System.currentTimeMillis()); } 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 dcade1bd..3beaa3aa 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -285,7 +285,7 @@ public class protocol_beehome { //用此函数设置要发送的内容 sm.refresh(msg); //设置信息创建时间 - sm.setDate(TimeUtil.getSystemDateYYMMDD(), TimeUtil.getSystemTimeHHmmss()); + sm.setDate(TimeUtil.getUTCSystemDateYYMMDD(), TimeUtil.getUTCSystemTimeHHmmss()); return sm; } @@ -469,8 +469,8 @@ public class protocol_beehome { * 00:第一个0:是否需要回复地址信息,0:不回复,1回复. * HOME|74-DE-2B-44-88-8C|97&HOME1|74-DE-2B-44-88-8C|97&HOME2|74-DE-2B-44-88-8C|97&HOME3|74-DE-2B-44-88-8C|97# */ - return genStringMessage(cmdMap.get(CMD_TYPE.AP10), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP10)).append(TimeUtil.getShortDate()) - .append(ds.getGPSData()).append(TimeUtil.getShortTime()).append(ds.getGPSHeading()) + return genStringMessage(cmdMap.get(CMD_TYPE.AP10), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP10)).append(TimeUtil.getUTCSystemDateYYMMDD()) + .append(ds.getGPSData()).append(TimeUtil.getUTCSystemTimeHHmmss()).append(ds.getGPSHeading()) .append(String.format("%03d", abs(ds.getSignalStrength()))) .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0") .append(ds.getProtection()).append(ds.getWorkModeStr()).append(CMDSPLIT) @@ -489,9 +489,9 @@ public class protocol_beehome { // Home|74-DE-2B-44-88-8C|97& Home1|74-DE-2B-44-88-8C|97&Home2|74-DE-2B-44-88-8C|97& Home3|74-DE-2B-44-88-8C|97# // IWAP01191230A2232.9807N11404.9355E000.1161320000.0006000910000000,460,00,9520,3671,# return genStringMessage(cmdMap.get(CMD_TYPE.AP01), - new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP01)).append(TimeUtil.getShortDate()) + new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP01)).append(TimeUtil.getUTCSystemDateYYMMDD()) .append(ds.getGPSData()) - .append(TimeUtil.getShortTime()).append(ds.getGPSHeading()).append(String.format("%03d", abs(ds.getSignalStrength()))) + .append(TimeUtil.getUTCSystemTimeHHmmss()).append(ds.getGPSHeading()).append(String.format("%03d", abs(ds.getSignalStrength()))) .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0") .append(ds.getProtection()).append(ds.getWorkModeStr()).append(CMDSPLIT) .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString()); @@ -1067,12 +1067,12 @@ public class protocol_beehome { //设置工作模式 public void handleBP33(Connection connection, Runtime runtime, String cmd) { - //IWBP33,867155030001063,560555,1 - //IW:标识符 - //BP33 : 命令字符 - //353456789012345:IMEI号,设备唯一ID - //080835:指令流水号 - //1:设备工作模式,1:正常模式,2:省电模式,3:紧急模式 + //IWBP33,867155030001063,560555,1 + //IW:标识符 + //BP33 : 命令字符 + //353456789012345:IMEI号,设备唯一ID + //080835:指令流水号 + //1:设备工作模式,1:正常模式,2:省电模式,3:紧急模式 String[] cmdList = cmd.split(","); if (cmdList.length == 4) { @@ -1258,8 +1258,8 @@ public class protocol_beehome { //立即定位反馈 public static StringMessage AP16(String cmdindex) { - //IWAP16,080835# - //080835:指令流水号 + //IWAP16,080835# + //080835:指令流水号 return genStringMessage(cmdMap.get(CMD_TYPE.AP16), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP16)) .append(CMDSPLIT).append(cmdindex) .append(CMDEND).toString()); @@ -1457,7 +1457,7 @@ public class protocol_beehome { //回复UI消息,表示已经接收到 voiceContent.status = 3; - voiceContent.serverTime = TimeUtil.getSystemTime3(); + voiceContent.serverTime = TimeUtil.getUTCSystemDateYYMMDD() + TimeUtil.getUTCSystemTimeHHmmss(); voiceContent.preview = String.valueOf(Util.getDuration(voiceContent.content)); runtime.getDbHelper().updateMessage(voiceContent, uri2); @@ -1919,7 +1919,7 @@ public class protocol_beehome { StringBuilder sb = new StringBuilder(CMDHEADER).append(cmdMap.get(CMD_TYPE.APJK)); sb.append(CMDSPLIT); //添加时间 - sb.append(TimeUtil.getSystemTimeForCameraMark()).append(CMDSPLIT); + sb.append(TimeUtil.getUTCTimeForCameraMark()).append(CMDSPLIT); sb.append(type).append(CMDSPLIT); if (type == 1) { //血压 diff --git a/app/version_code.properties b/app/version_code.properties index 1bffc9ee..a11567f7 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Wed Nov 24 14:57:35 CST 2021 -VERSION_CODE=922 +#Fri Nov 26 10:26:51 CST 2021 +VERSION_CODE=923