From: k.liang Date: Thu, 21 Oct 2021 09:36:48 +0000 (+0800) Subject: AA-增加白名单来电过滤 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=80d30f213fb2c970a80392ca6cce51f871c86c20;p=icsupport.git AA-增加白名单来电过滤 --- diff --git a/app/release/output.json b/app/release/output.json index 4fd5c880..9fc28d15 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":974,"versionName":"2110141506","enabled":true,"outputFile":"ICSer_V974_2110141506_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V974_2110141506_release.apk","properties":{}}] +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":981,"versionName":"2110211647","enabled":true,"outputFile":"ICSer_V981_2110211647_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V981_2110211647_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 43007c52..fdebb129 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -470,7 +470,7 @@ public class protocolAPIHelper { ret = null; break; case PROTOCOL_ANAN: - ret = protocol_anan.APTP(body_temp, tempout); + ret = protocol_anan.APTP(temp_adusted, tempout); break; } return ret; diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java index 0f19e9d0..f27fa7e1 100644 --- a/app/src/main/java/com/ic/protocols/protocol_anan.java +++ b/app/src/main/java/com/ic/protocols/protocol_anan.java @@ -1156,6 +1156,10 @@ public class protocol_anan { } else { ProfileManager.restoreSilent(mRuntime.getContextProxy().context, audioManager); } + ContentValues tempValues = new ContentValues(); + tempValues.put(ICDatabaseHelper.sKey, "aa_free_of_distractions"); + tempValues.put(ICDatabaseHelper.sValue, trigger); + mRuntime.getContextProxy().getResolver().insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), tempValues); String cmdCode = split[2]; int index = cmd.indexOf(cmdCode); //回复服务器 @@ -1698,7 +1702,7 @@ public class protocol_anan { String index = cmdlist[2]; ICLogger.i(sb.toString()); - connection.send(AP14(index, phnums)); + connection.send(AP14(index, phnums));//回复服务器 ArrayList contactArray = new ArrayList<>(); if (Config.custom_name.equals("YT")) { ICLogger.i("=====add hotline 96885 "); @@ -2017,7 +2021,7 @@ public class protocol_anan { } - public static StringMessage APTP(double body_temp, double tempout) { + public static StringMessage APTP(double temp_adusted, double tempout) { //体温上行 //IWAPTP,34.3,27.3# //设备: IWAPTP,36.3,33,132# @@ -2026,7 +2030,7 @@ public class protocol_anan { //35.3:测量体温 (摄氏度) //33,132:温补用的参数,此处不用,可以用0 来代替。 目前是代表的腕温,室外温度 return genStringMessage(cmdMap.get(protocol_anan.CMD_TYPE.APTP), new StringBuffer(CMDHEADER).append(cmdMap.get(protocol_anan.CMD_TYPE.APTP)) - .append(CMDSPLIT).append(String.format("%1$.1f", body_temp)) + .append(CMDSPLIT).append(String.format("%1$.1f", temp_adusted)) .append(CMDSPLIT).append(String.format("%1$.1f", tempout)) .append(CMDEND).toString()); } diff --git a/app/version_code.properties b/app/version_code.properties index e72240cb..2f4c53fb 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,3 +1,2 @@ -#Fri Oct 15 19:40:40 CST 2021 -VERSION_CODE=977 - +#Thu Oct 21 16:47:49 CST 2021 +VERSION_CODE=981