添加项目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 497b2ac..e442beb 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -29,15 +29,15 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>\r
     <exclude-output/>\r
     <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>\r

diff --git a/app/release/ICSer_V683_2011021045_release.apk b/app/release/ICSer_V683_2011021045_release.apk
new file mode 100644 (file)
index 0000000..0627bcc
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 43f8a6c..2f4962f 100644 (file)
--- 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 2e5ed1d..4392864 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -140,6 +140,7 @@
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
                 <action android:name="com.enqualcomm.support.SMSCMD" />
+                <action android:name="com.ic.action.internaltest" />
             </intent-filter>
         </receiver>
         <receiver

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 619d63d..9f028eb 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -383,8 +383,11 @@ public class Config {
 \r
     do_broadCast_message_no_indication = ret;\r
 \r
+    noPPGSensor=(ICJniUtils.isPPGavailable()==0);\r
+    noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);\r
+\r
     //默认关闭NTP\r
-    disable_ntp_server=Util.getSystemProperties("persist.sys.disableNTP","true").equals("true");\r
+    disable_ntp_server=Util.getSystemProperties("persist.sys.disableNTP","false").equals("true");\r
 \r
     c43_branch_name=Util.getSystemProperties("persist.sys.c43.branch");\r
 \r
@@ -416,6 +419,12 @@ public class Config {
       noPPGSensor=false;\r
       noTempSensor=true;\r
       SOSNoNeedDial=true; //采用新写的SOS，协议只需要发送消息，无需控制拨号。\r
+    }else if  ((custom_name.equals("YT")) ){\r
+      noPushTxtNotifyDialog=false;\r
+      noSMSNotifyDialog=false;\r
+      noVoiceNotifyDialog=false;\r
+      noPPGSensor=false;\r
+      noTempSensor=true;\r
     }else if ((custom_name.equals("l004")) ) {\r
       noPushTxtNotifyDialog=true;\r
       noSMSNotifyDialog=true;\r
@@ -447,12 +456,11 @@ public class Config {
       needAllwaysAlarmCutOff=true;\r
       needAllwaysAlarmFenceOut=false;\r
       needTemperature_abnormal_alarm=false;\r
-      noPPGSensor=false;\r
-      noTempSensor=false;\r
+      noPPGSensor=true;\r
+      noTempSensor=true;\r
       C5_noBroadCastActionStrip=true;\r
     }\r
-    noPPGSensor=(ICJniUtils.isPPGavailable()==0);\r
-    noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);\r
+\r
 \r
   }\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java
index 255ede7..0b7fedb 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Constants.java
+++ b/app/src/main/java/com/enqualcomm/support/Constants.java
@@ -253,6 +253,8 @@ public interface Constants {
   public static final String ACTION_SMSCMD_Reply="com.ic.action.fotaUpdateReply";\r
   public static final String KeyReplyData="reply";\r
 \r
+  public static final String ACTION_SMSCMD_TEST="com.ic.action.internaltest";\r
+\r
   public static final int RESULT_ERROR = 500;\r
   \r
   public static final int RESULT_OK = 200;\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index b32a851..cfd600f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -80,6 +80,7 @@ import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;
 import static com.enqualcomm.support.Constants.ACTION_LOCAL_SOS_ACTION;\r
 import static com.enqualcomm.support.Constants.ACTION_LOCATION_ALARM;\r
 import static com.enqualcomm.support.Constants.ACTION_PRACTICE_REPORT_ALARM;\r
+import static com.enqualcomm.support.Constants.ACTION_QUERY_WEATHER;\r
 import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_START;\r
 import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_STOP;\r
 import static com.enqualcomm.support.Constants.ANTI_ALARM;\r
@@ -227,6 +228,10 @@ public class CoreService extends Service {
                        //50ms后开始拨打电话\r
                        mHandler.postDelayed(mTriggerSOSCALLThread,500);\r
                    }\r
+            }else if (ACTION_QUERY_WEATHER.equals(param1Intent.getAction())) {\r
+\r
+                ICLogger.i("ACTION_QUERY_WEATHER ");\r
+                connection.send(protocolAPIHelper.getWeatherMSG(runtime));\r
                 }\r
         }\r
     };\r
@@ -691,6 +696,28 @@ public class CoreService extends Service {
 //                    runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true);\r
 //                }\r
             }\r
+        }else if (Config.custom_name.equals("YT")) {\r
+\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);\r
+            Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);\r
+            Config.enableSleep=true;\r
+\r
+            if (Config.getConfigInitFlag(this)==0) {\r
+                Config.setPPGTestCycle(this, 0);\r
+                Config.setTemperatureTestCycle(runtime, 0);\r
+                Config.setConfigInitFlag(this, 1);\r
+\r
+                int contactcount=runtime.getDbHelper().getContactCount(getContentResolver());\r
+                ICLogger.i("=====Contact count "+contactcount);\r
+                if(contactcount==0){ //如果没有SOS\r
+                    ICLogger.i("=====add hotline 96885 ");\r
+                    ArrayList<Contact> contactArray=new ArrayList<Contact>();\r
+                    contactArray.add(new Contact(Contact.CATEGORY_CALL, this.getResources().getString(R.string.hotline), "96885"));\r
+                    runtime.getDbHelper().saveContacts(contactArray,false,false,false,false,false,true);\r
+                }\r
+            }\r
         }else if (Config.custom_name.equals("SGL")) { //C5项目\r
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_ESCAPE,true);\r
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF,true);\r
@@ -815,6 +842,7 @@ public class CoreService extends Service {
 \r
         //添加SOSMSG 接收\r
         intentFilter = new IntentFilter();\r
+        intentFilter.addAction(ACTION_QUERY_WEATHER);\r
         intentFilter.addAction(ACTION_SEND_EMEGENCY_LOCATION_START);\r
         intentFilter.addAction(ACTION_LOCAL_SOS_ACTION);\r
         registerReceiver(broadcastSOSReceiver,intentFilter);\r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 712d8af..dcd3240 100644 (file)
--- 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;\r
 import static com.enqualcomm.support.Constants.ACTION_SMSCMD;\r
 import static com.enqualcomm.support.Constants.ACTION_SMSCMD_Reply;\r
+import static com.enqualcomm.support.Constants.ACTION_SMSCMD_TEST;\r
 import static com.enqualcomm.support.Constants.ACTION_SMS_RECEIVED;\r
 import static com.enqualcomm.support.Constants.ACTION_START_FOTA_UPDATE;\r
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;\r
@@ -128,13 +129,18 @@ public class ICSmsManager  extends BroadcastReceiver {
 \r
 \r
         String action = intent.getAction();\r
+        ICLogger.i(" onReceive Action "+action);\r
         if (ACTION_SMSCMD.equals(action)) {\r
             String cmd = intent.getStringExtra("smsCmd");\r
             handleSMS_CMD("", cmd);\r
-        }else if (ACTION_SMSCMD_Reply.equals(action)){\r
-            String replydata=intent.getStringExtra(KeyReplyData);\r
-            sendSMS(cell_number_to_reply,replydata);\r
-            cell_number_to_reply="";\r
+        }else if (ACTION_SMSCMD_Reply.equals(action)) {\r
+            String replydata = intent.getStringExtra(KeyReplyData);\r
+            sendSMS(cell_number_to_reply, replydata);\r
+            cell_number_to_reply = "";\r
+        }else if (ACTION_SMSCMD_TEST.equals(action)){\r
+            String cmd = intent.getStringExtra("cmd");\r
+            String arg = intent.getStringExtra("arg1");\r
+            handle_test_cmd(cmd,arg);\r
         }else if (ACTION_SMS_RECEIVED.equals(action)) {\r
             long currenttime = System.currentTimeMillis();\r
 //            if (currenttime - ICSmsManager.preTimeMillis > 30000L) {\r
@@ -1176,4 +1182,18 @@ public class ICSmsManager  extends BroadcastReceiver {
             e.printStackTrace();\r
         }\r
     }\r
+\r
+\r
+    private void handle_test_cmd(String cmd,String arg){\r
+\r
+        ICLogger.i("receive test Cmd "+cmd+" arg "+arg);\r
+        if(cmd.startsWith("testDialog,")) {\r
+            String list[]=cmd.split(",");\r
+            int msgtype=0;\r
+            try {\r
+                msgtype = Integer.parseInt(list[1]);\r
+            }catch ( Exception e){}\r
+            CoreService.getInstance().getRuntime().getContextProxy().sendMsgBroadcast(arg, msgtype);\r
+        }\r
+    }\r
 }
\ 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 d08f72c..79d0f1f 100644 (file)
--- 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;\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret = null;\r
+                ret = protocol_ic.APTQ(runtime);\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=null;\r

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 a44141f..6759e89 100644 (file)
--- 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());\r
             connection.send(AP14(index,phnums));\r
             ArrayList<Contact> contactArray=new ArrayList<Contact>();\r
+\r
+            if(Config.custom_name.equals("YT")) {\r
+                ICLogger.i("=====add hotline 96885 ");\r
+                contactArray.add(new Contact(Contact.CATEGORY_CALL, runtime.getContextProxy().context.getResources().getString(R.string.hotline), "96885"));\r
+            }\r
             for (int i=0; i< phnums.length;i++){\r
                 String[] tmp= phnums[i].split("\\|");\r
                 if (tmp.length==2){\r

diff --git a/app/src/main/res/layout/dialog_misscall_layout.xml b/app/src/main/res/layout/dialog_misscall_layout.xml
index 30e6776..4b70b36 100644 (file)
--- 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"\r
             android:gravity="center"\r
             android:text="@string/title_alert"\r
-            android:textSize="24sp"\r
+            android:textSize="30sp"\r
             android:visibility="visible" />\r
         <LinearLayout android:gravity="center" android:id="@+id/noticeContent" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
 \r
             <TextView\r
                 android:id="@+id/message"\r
-                style="@style/text_16_666666"\r
+                style="@style/text_18_ffffff"\r
                 android:layout_width="fill_parent"\r
                 android:layout_height="wrap_content"\r
                 android:background="#88ffffff"\r
@@ -27,12 +27,39 @@
                 android:paddingTop="15.0dip"\r
                 android:paddingRight="20.0dip"\r
                 android:paddingBottom="15.0dip"\r
-                android:textSize="18sp" />\r
+                android:textSize="25sp" />\r
         </LinearLayout>\r
-        <View android:background="#ffd0d0d0" android:layout_width="fill_parent" android:layout_height="1.0px" />\r
-        <LinearLayout android:gravity="center" android:layout_gravity="bottom" android:orientation="horizontal" android:background="@drawable/bg_bombbox" android:layout_width="fill_parent" android:layout_height="60.0dip">\r
-            <Button android:textColor="#ff000000" android:gravity="center" android:id="@+id/positiveButton" android:background="@drawable/btn_query" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/ok" style="@style/text_16_666666" />\r
-            <ImageButton android:gravity="center" android:id="@+id/negativeButton" android:background="#00000000" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20.0dip" android:src="@drawable/btn_cancel_selector" android:text="@string/cancel" style="@style/text_15_666666_sdw" />\r
+        <View\r
+            android:background="#ffd0d0d0"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="1.0px" />\r
+        <LinearLayout\r
+            android:gravity="center"\r
+            android:layout_gravity="bottom"\r
+            android:orientation="horizontal"\r
+            android:background="@drawable/bg_bombbox"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="60.0dip">\r
+            <Button\r
+                android:textColor="#ff000000"\r
+                android:gravity="center"\r
+                android:id="@+id/positiveButton"\r
+                android:background="@drawable/btn_query"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:text="@string/ok"\r
+                style="@style/text_16_666666" />\r
+            <ImageButton\r
+                android:gravity="center"\r
+                android:id="@+id/negativeButton"\r
+                android:background="#00000000"\r
+                android:visibility="gone"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:layout_marginLeft="20.0dip"\r
+                android:src="@drawable/btn_cancel_selector"\r
+                android:text="@string/cancel"\r
+                style="@style/text_15_666666_sdw" />\r
         </LinearLayout>\r
     </LinearLayout>\r
 </FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/dialog_normal_layout.xml b/app/src/main/res/layout/dialog_normal_layout.xml
index 8cf1aa9..d42f780 100644 (file)
--- a/app/src/main/res/layout/dialog_normal_layout.xml
+++ b/app/src/main/res/layout/dialog_normal_layout.xml
@@ -1,15 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<FrameLayout android:orientation="vertical" android:padding="20.0dip" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent"\r
+<FrameLayout\r
+    android:orientation="vertical"\r
+    android:padding="20.0dip"\r
+    android:clickable="true"\r
+    android:layout_width="fill_parent"\r
+    android:layout_height="fill_parent"\r
   xmlns:android="http://schemas.android.com/apk/res/android">\r
-    <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@drawable/dialog_bottom_bg" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-        <TextView android:gravity="center" android:id="@id/title" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="40.0dip" android:text="@string/title_alert" style="@style/text_18_ffffff" />\r
-        <LinearLayout android:gravity="center" android:id="@id/noticeContent" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-            <TextView android:gravity="center|left" android:id="@id/message" android:background="#88ffffff" android:paddingLeft="20.0dip" android:paddingTop="15.0dip" android:paddingRight="20.0dip" android:paddingBottom="15.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="120.0dip" android:lineSpacingMultiplier="1.5" style="@style/text_16_666666" />\r
+    <LinearLayout\r
+        android:layout_gravity="center"\r
+        android:orientation="vertical"\r
+        android:background="@drawable/dialog_bottom_bg"\r
+        android:layout_width="fill_parent"\r
+        android:layout_height="wrap_content">\r
+        <TextView\r
+            android:gravity="center"\r
+            android:id="@id/title"\r
+            android:visibility="visible"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="40.0dip"\r
+            android:text="@string/title_alert"\r
+            style="@style/text_18_ffffff"\r
+            android:textSize="30sp" />\r
+        <LinearLayout\r
+            android:gravity="center"\r
+            android:id="@id/noticeContent"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="wrap_content">\r
+            <TextView\r
+                android:gravity="center|left"\r
+                android:id="@id/message"\r
+                android:background="#88ffffff"\r
+                android:paddingLeft="20.0dip"\r
+                android:paddingTop="15.0dip"\r
+                android:paddingRight="20.0dip"\r
+                android:paddingBottom="15.0dip"\r
+                android:layout_width="fill_parent"\r
+                android:layout_height="wrap_content"\r
+                android:minHeight="120.0dip"\r
+                android:lineSpacingMultiplier="1.5"\r
+                style="@style/text_16_666666"\r
+                android:textSize="25sp"/>\r
         </LinearLayout>\r
-        <View android:background="#ffd0d0d0" android:layout_width="fill_parent" android:layout_height="1.0px" />\r
-        <LinearLayout android:gravity="center" android:layout_gravity="bottom" android:orientation="horizontal" android:background="@drawable/bg_bombbox" android:layout_width="fill_parent" android:layout_height="60.0dip">\r
-            <ImageButton android:gravity="center" android:id="@id/positiveButton" android:background="#00000000" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/btn_ok_selector" android:text="@string/ok" android:layout_weight="1.0" style="@style/text_15_ffffff_sdw" />\r
-            <ImageButton android:gravity="center" android:id="@id/negativeButton" android:background="#00000000" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="20.0dip" android:src="@drawable/btn_cancel_selector" android:text="@string/cancel" android:layout_weight="1.0" style="@style/text_15_666666_sdw" />\r
+        <View\r
+            android:background="#ffd0d0d0"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="1.0px" />\r
+        <LinearLayout\r
+            android:gravity="center"\r
+            android:layout_gravity="bottom"\r
+            android:orientation="horizontal"\r
+            android:background="@drawable/bg_bombbox"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="60.0dip">\r
+            <ImageButton\r
+                android:gravity="center"\r
+                android:id="@id/positiveButton"\r
+                android:background="#00000000"\r
+                android:layout_width="0.0dip"\r
+                android:layout_height="wrap_content"\r
+                android:src="@drawable/btn_ok_selector"\r
+                android:text="@string/ok"\r
+                android:layout_weight="1.0" style="@style/text_15_ffffff_sdw" />\r
+            <ImageButton\r
+                android:gravity="center"\r
+                android:id="@id/negativeButton"\r
+                android:background="#00000000"\r
+                android:layout_width="0.0dip"\r
+                android:layout_height="wrap_content"\r
+                android:layout_marginLeft="20.0dip"\r
+                android:src="@drawable/btn_cancel_selector"\r
+                android:text="@string/cancel"\r
+                android:layout_weight="1.0"\r
+                style="@style/text_15_666666_sdw" />\r
         </LinearLayout>\r
     </LinearLayout>\r
 </FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/notification_wechat_layout.xml b/app/src/main/res/layout/notification_wechat_layout.xml
index 3e1e4da..413f04f 100644 (file)
--- a/app/src/main/res/layout/notification_wechat_layout.xml
+++ b/app/src/main/res/layout/notification_wechat_layout.xml
@@ -1,20 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<FrameLayout android:orientation="vertical" android:padding="20.0dip" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent"\r
+<FrameLayout\r
+    android:orientation="vertical"\r
+    android:padding="20.0dip"\r
+    android:clickable="true"\r
+    android:layout_width="fill_parent"\r
+    android:layout_height="fill_parent"\r
   xmlns:android="http://schemas.android.com/apk/res/android">\r
-    <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@drawable/notification_bottom_bg" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-        <RelativeLayout android:gravity="center" android:orientation="horizontal" android:id="@+id/noticeTitle" android:background="@drawable/notification_title_bottom_bg" android:layout_width="fill_parent" android:layout_height="60.0dip">\r
-            <ImageView android:id="@+id/funcImg" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:src="@drawable/btn_cancel_selector" android:layout_alignParentLeft="true" />\r
-            <TextView android:textSize="30.0sp" android:gravity="center|left" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_toRightOf="@id/funcImg" android:lineSpacingMultiplier="1.5" />\r
-            <TextView android:textSize="30.0sp" android:gravity="center" android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="5.0dip" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:lineSpacingMultiplier="1.5" />\r
+    <LinearLayout\r
+        android:layout_gravity="center"\r
+        android:orientation="vertical"\r
+        android:background="@drawable/notification_bottom_bg"\r
+        android:layout_width="fill_parent"\r
+        android:layout_height="wrap_content">\r
+        <RelativeLayout\r
+            android:gravity="center"\r
+            android:orientation="horizontal"\r
+            android:id="@+id/noticeTitle"\r
+            android:background="@drawable/notification_title_bottom_bg"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="60.0dip">\r
+            <ImageView\r
+                android:id="@+id/funcImg"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:layout_marginLeft="5.0dip"\r
+                android:src="@drawable/btn_cancel_selector"\r
+                android:layout_alignParentLeft="true" />\r
+            <TextView\r
+                android:textSize="30.0sp"\r
+                android:gravity="center|left"\r
+                android:id="@id/title"\r
+                android:layout_width="fill_parent"\r
+                android:layout_height="fill_parent"\r
+                android:layout_toRightOf="@id/funcImg"\r
+                android:lineSpacingMultiplier="1.5" />\r
+            <TextView\r
+                android:textSize="30.0sp"\r
+                android:gravity="center"\r
+                android:id="@+id/time"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:layout_marginRight="5.0dip"\r
+                android:layout_alignParentRight="true"\r
+                android:layout_centerVertical="true"\r
+                android:lineSpacingMultiplier="1.5" />\r
         </RelativeLayout>\r
-        <LinearLayout android:gravity="center" android:orientation="vertical" android:id="@+id/noticeContent" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-            <TextView android:textSize="30.0sp" android:gravity="center|left" android:id="@+id/message" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:minHeight="50.0dip" android:lineSpacingMultiplier="1.5" />\r
-            <TextView android:textSize="30.0sp" android:gravity="center|left" android:id="@+id/content" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:minHeight="50.0dip" android:lineSpacingMultiplier="1.5" style="@style/text_16_999b97" />\r
+        <LinearLayout\r
+            android:gravity="center"\r
+            android:orientation="vertical"\r
+            android:id="@+id/noticeContent"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="wrap_content">\r
+            <TextView\r
+                android:textSize="30.0sp"\r
+                android:gravity="center|left"\r
+                android:id="@+id/message"\r
+                android:layout_width="fill_parent"\r
+                android:layout_height="wrap_content"\r
+                android:layout_marginLeft="5.0dip"\r
+                android:minHeight="50.0dip"\r
+                android:lineSpacingMultiplier="1.5" />\r
+            <TextView\r
+                android:textSize="30.0sp"\r
+                android:gravity="center|left"\r
+                android:id="@+id/content"\r
+                android:layout_width="fill_parent"\r
+                android:layout_height="wrap_content"\r
+                android:layout_marginLeft="5.0dip"\r
+                android:minHeight="50.0dip"\r
+                android:lineSpacingMultiplier="1.5"\r
+                style="@style/text_16_999b97" />\r
         </LinearLayout>\r
-        <View android:background="@drawable/notification_end_bottom_bg" android:layout_width="fill_parent" android:layout_height="1.0px" />\r
-        <LinearLayout android:gravity="center" android:layout_gravity="bottom" android:orientation="horizontal" android:background="@drawable/bg_bombbox" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-            <ImageButton android:gravity="center" android:id="@+id/positiveButton" android:background="#00000000" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/btn_ok_selector" android:text="@string/ok" android:layout_weight="1.0" style="@style/text_15_ffffff_sdw" />\r
-            <ImageButton android:gravity="center" android:id="@+id/negativeButton" android:background="#00000000" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="20.0dip" android:src="@drawable/btn_cancel_selector" android:text="@string/cancel" android:layout_weight="1.0" style="@style/text_15_666666_sdw" />\r
+        <View\r
+            android:background="@drawable/notification_end_bottom_bg"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="1.0px" />\r
+        <LinearLayout\r
+            android:gravity="center"\r
+            android:layout_gravity="bottom"\r
+            android:orientation="horizontal"\r
+            android:background="@drawable/bg_bombbox"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="wrap_content">\r
+            <ImageButton\r
+                android:gravity="center"\r
+                android:id="@+id/positiveButton"\r
+                android:background="#00000000"\r
+                android:layout_width="0.0dip"\r
+                android:layout_height="wrap_content"\r
+                android:src="@drawable/btn_ok_selector"\r
+                android:text="@string/ok"\r
+                android:layout_weight="1.0"\r
+                style="@style/text_15_ffffff_sdw" />\r
+            <ImageButton\r
+                android:gravity="center"\r
+                android:id="@+id/negativeButton"\r
+                android:background="#00000000"\r
+                android:layout_width="0.0dip"\r
+                android:layout_height="wrap_content"\r
+                android:layout_marginLeft="20.0dip"\r
+                android:src="@drawable/btn_cancel_selector"\r
+                android:text="@string/cancel"\r
+                android:layout_weight="1.0"\r
+                style="@style/text_15_666666_sdw" />\r
         </LinearLayout>\r
     </LinearLayout>\r
 </FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 288978d..2fd62e8 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -125,5 +125,14 @@
     <string name="alarm_cross_boundary">您已越界!</string>
     <string name="alarm_wristband_off">腕带已脱落</string>
     <string name="alarm_wristband_on">腕带已佩戴</string>
+    <string name="hotline">服务热线</string>
 
+
+    <string name="notification_title">通知消息</string>
+    <string name="notification_button_str">知道了</string>
+    <string name="dialog_notification_title">消息提醒</string>
+    <string name="dialog_btn_close">关闭</string>
+    <string name="dialog_btn_open">阅读</string>
+
+    <string name="sedentary_name">久坐提醒</string>
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f4c45f..f5fa8ad 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="family_group">FamilyGroup</string>
     <string name="all_group">GroupAll</string>
 
-    <string name="sms_title">SMS Message</string>
+    <string name="sms_title">SMS</string>
     <string name="sms_notify">You have new Message！</string>
     <string name="hht_call_end"> \'s not answered call!</string>
 
@@ -126,4 +126,16 @@
     <string name="alarm_wristband_off">Wristband has fallen off</string>
     <string name="alarm_wristband_on">Wristband has been wear</string>
 
+    <string name="hotline">HotLine</string>
+
+
+
+    <string name="notification_title">通知消息</string>
+    <string name="notification_button_str">知道了</string>
+    <string name="dialog_notification_title">消息提醒</string>
+    <string name="dialog_btn_close">关闭</string>
+    <string name="dialog_btn_open">阅读</string>
+
+    <string name="sedentary_name">久坐提醒</string>
+
 </resources>

diff --git a/app/version_code.properties b/app/version_code.properties
index b45d51b..9602900 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Oct 28 16:32:43 CST 2020\r
-VERSION_CODE=682\r
+#Mon Nov 02 10:45:45 CST 2020\r
+VERSION_CODE=683\r