From: snickersun Date: Mon, 2 Nov 2020 07:56:26 +0000 (+0800) Subject: 添加项目Q3F YT的所有初始化 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=23524696221465d27d3d967a08d5050fe77c5825;p=protocol_srv.git 添加项目Q3F YT的所有初始化 protocol_ic 给客户“Q3F YT” 添加 96885默认热线 protocolAPIHelper 添加protocol_ic APTQ，天气查询 Config C5-SGL 默认关闭心率和体温功能 另心率和体温的配置先通过实际函数检测初始化，然后再用config覆盖。以config的配置为优先。 优化Dialog的显示，增大文字大小。 GPS优化关闭流程，如果系统默认开启协议中未开启，也可以正常关闭。 ICSmsManager 添加测试命令 com.ic.action.internaltest 测试弹窗 --- diff --git a/app/app.iml b/app/app.iml index 497b2ac8..e442bebb 100644 --- a/app/app.iml +++ b/app/app.iml @@ -29,15 +29,15 @@ - - + + - - + + diff --git a/app/release/ICSer_V683_2011021045_release.apk b/app/release/ICSer_V683_2011021045_release.apk new file mode 100644 index 00000000..0627bcc0 Binary files /dev/null and b/app/release/ICSer_V683_2011021045_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 43f8a6c1..2f4962fd 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":682,"versionName":"2010281632","enabled":true,"outputFile":"ICSer_V682_2010281632_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V682_2010281632_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":683,"versionName":"2011021045","enabled":true,"outputFile":"ICSer_V683_2011021045_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V683_2011021045_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2e5ed1d2..43928644 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -140,6 +140,7 @@ + contactArray=new ArrayList(); + contactArray.add(new Contact(Contact.CATEGORY_CALL, this.getResources().getString(R.string.hotline), "96885")); + runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true); + } + } }else if (Config.custom_name.equals("SGL")) { //C5项目 Config.ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE,true); Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true); @@ -815,6 +842,7 @@ public class CoreService extends Service { //添加SOSMSG 接收 intentFilter = new IntentFilter(); + intentFilter.addAction(ACTION_QUERY_WEATHER); intentFilter.addAction(ACTION_SEND_EMEGENCY_LOCATION_START); intentFilter.addAction(ACTION_LOCAL_SOS_ACTION); registerReceiver(broadcastSOSReceiver,intentFilter); diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 712d8afb..dcd3240f 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -55,6 +55,7 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static com.enqualcomm.support.Config.upload_logs_via_ftp; import static com.enqualcomm.support.Constants.ACTION_SMSCMD; import static com.enqualcomm.support.Constants.ACTION_SMSCMD_Reply; +import static com.enqualcomm.support.Constants.ACTION_SMSCMD_TEST; import static com.enqualcomm.support.Constants.ACTION_SMS_RECEIVED; import static com.enqualcomm.support.Constants.ACTION_START_FOTA_UPDATE; import static com.enqualcomm.support.Constants.DIALOG_ACTION; @@ -128,13 +129,18 @@ public class ICSmsManager extends BroadcastReceiver { String action = intent.getAction(); + ICLogger.i(" onReceive Action "+action); if (ACTION_SMSCMD.equals(action)) { String cmd = intent.getStringExtra("smsCmd"); handleSMS_CMD("", cmd); - }else if (ACTION_SMSCMD_Reply.equals(action)){ - String replydata=intent.getStringExtra(KeyReplyData); - sendSMS(cell_number_to_reply,replydata); - cell_number_to_reply=""; + }else if (ACTION_SMSCMD_Reply.equals(action)) { + String replydata = intent.getStringExtra(KeyReplyData); + sendSMS(cell_number_to_reply, replydata); + cell_number_to_reply = ""; + }else if (ACTION_SMSCMD_TEST.equals(action)){ + String cmd = intent.getStringExtra("cmd"); + String arg = intent.getStringExtra("arg1"); + handle_test_cmd(cmd,arg); }else if (ACTION_SMS_RECEIVED.equals(action)) { long currenttime = System.currentTimeMillis(); // if (currenttime - ICSmsManager.preTimeMillis > 30000L) { @@ -1176,4 +1182,18 @@ public class ICSmsManager extends BroadcastReceiver { e.printStackTrace(); } } + + + private void handle_test_cmd(String cmd,String arg){ + + ICLogger.i("receive test Cmd "+cmd+" arg "+arg); + if(cmd.startsWith("testDialog,")) { + String list[]=cmd.split(","); + int msgtype=0; + try { + msgtype = Integer.parseInt(list[1]); + }catch ( Exception e){} + CoreService.getInstance().getRuntime().getContextProxy().sendMsgBroadcast(arg, msgtype); + } + } } \ 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 d08f72c1..79d0f1f4 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -541,7 +541,7 @@ public class protocolAPIHelper { ret=null; break; case Config.PROTOCOL_IC: - ret = null; + ret = protocol_ic.APTQ(runtime); break; case Config.PROTOCOL_FZD: ret=null; diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java index a44141f6..6759e89b 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -861,6 +861,11 @@ public class protocol_ic { ICLogger.i(sb.toString()); connection.send(AP14(index,phnums)); ArrayList contactArray=new ArrayList(); + + if(Config.custom_name.equals("YT")) { + ICLogger.i("=====add hotline 96885 "); + contactArray.add(new Contact(Contact.CATEGORY_CALL, runtime.getContextProxy().context.getResources().getString(R.string.hotline), "96885")); + } for (int i=0; i< phnums.length;i++){ String[] tmp= phnums[i].split("\\|"); if (tmp.length==2){ diff --git a/app/src/main/res/layout/dialog_misscall_layout.xml b/app/src/main/res/layout/dialog_misscall_layout.xml index 30e6776b..4b70b360 100644 --- a/app/src/main/res/layout/dialog_misscall_layout.xml +++ b/app/src/main/res/layout/dialog_misscall_layout.xml @@ -10,13 +10,13 @@ android:layout_height="40.0dip" android:gravity="center" android:text="@string/title_alert" - android:textSize="24sp" + android:textSize="30sp" android:visibility="visible" /> + android:textSize="25sp" /> - - -