From: snickersun <scy@incartech.cn>
Date: Fri, 7 Aug 2020 12:20:55 +0000 (+0800)
Subject: 添加中英文区别。
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=b37f2b76229159e6329133f4b41ad2059fb0ddd6;p=protocol_srv.git

添加中英文区别。
修复 SOS可能关闭不了GPS的问题。
---

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 383bd688..59e34866 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -217,9 +217,12 @@ public class Config {
  // }
 
   public static void loadModCycleSettings(Runtime runtime){
+    ICLogger.i("current Cycles PPG "+ runtime.getPpgTestCycle()+" , LocationCycle "+runtime.getLocationInstance().getLocation_cycle()+" LocationMode "+runtime.getLocationInstance().getWorkingMod());
     runtime.setPpgTestCycle(Config.getPPGTestCycle(runtime.getContextProxy().context));
     runtime.getLocationInstance().setLocation_cycle(Config.getLocationCycle(runtime.getContextProxy().context));
     runtime.getLocationInstance().setWorkingMod(Config.getLocationMode(runtime.getContextProxy().context));
+    ICLogger.i("current Cycles PPG "+ runtime.getPpgTestCycle()+" , LocationCycle "+runtime.getLocationInstance().getLocation_cycle()+" LocationMode "+runtime.getLocationInstance().getWorkingMod());
+
   }
 
   public static void loadHearBeatSetting(Runtime runtime){
@@ -299,6 +302,7 @@ public class Config {
   }
 
   public static void setLocationMode(Context context,int mode){
+    ICLogger.i("setLocationMode "+mode);
     SharPreferenceUtil.setPrefInt(context,KeyLocationMode,mode);
   }
 
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 9cb2fd41..249f2662 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -921,6 +921,7 @@ public class CoreService extends Service {
             } else if (ACTION_SEND_EMEGENCY_LOCATION_STOP.equals(paramIntent.getAction())) {
                 //stop Emegency location Stop
                 Config.loadModCycleSettings(runtime); //回复之前的 工作模式即可
+                LocationClient.setForceLocation(1);
                 setLocationAlarm(runtime.getLocationInstance().getWorkingMod());//同时重置alarm并触发定位
 
             }else if(ACTION_CHECK_ANTIOFF_EVENT.equals(paramIntent.getAction())){
diff --git a/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
index 93f4f20b..07e610c7 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
@@ -2,6 +2,7 @@ package com.enqualcomm.support.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.preference.PreferenceManager;
 
 public class SharPreferenceUtil {
@@ -73,4 +74,61 @@ public class SharPreferenceUtil {
         SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
         return sp.getInt(key, value);
     }
+
+//// 其他应用读取写入访问的方法
+//    public static String getPrefStringPublic(Context context, String key, String value) {
+//
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
+//            return sp.getString(key, value);
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        return value;
+//    }
+//    public static void setPrefStringPublic(Context context, String key, String value) {
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
+//            sp.edit().putString(key, value).commit();
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//    }
+//    public static void setPrefIntPublic(Context context, String key, int value) {
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
+//            sp.edit().putInt(key, value).commit();
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//    }
+//    public static int getPrefIntPublic(Context context, String key, int value) {
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
+//            return sp.getInt(key, value);
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//        return value;
+//    }
+
 }
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..b70cc736
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,128 @@
+<resources>
+    <string name="app_name">ICProtocolServer</string>
+    <string name="program_abnormal">抱歉，程序出错将推出！</string>
+    <string name="app_died_str">很抱歉,程序出现异常,即将退出</string>
+
+    <string name="app_label_hasnot_been_installed">"%1$没有安装！"</string>
+
+    <string name="cancel">取消</string>
+
+    <string name="cloudpush_app_name">推送服务</string>
+
+    <string name="family_group">家庭群组</string>
+    <string name="all_group">所有人</string>
+
+    <string name="sms_title">短信提醒</string>
+    <string name="sms_notify">您有新短消息！</string>
+    <string name="hht_call_end">的未接来电</string>
+
+
+    <string name="hht_call_start">您有</string>
+
+    <string name="hht_misscall_call">来电提醒</string>
+
+    <string name="findDev">查找设备！</string>
+
+    <string name="hwpush_ability_value">successRateAnalytics</string>
+
+    <string name="hwpush_cancel">Cancel</string>
+
+    <string name="hwpush_collect">Favorite</string>
+
+    <string name="hwpush_collect_tip">A Favorites icon will be created on the home screen. You can touch the icon to view all your favorite notifications.</string>
+
+    <string name="hwpush_collect_tip_known">OK</string>
+
+    <string name="hwpush_delete">Delete</string>
+
+    <string name="hwpush_deltitle">Delete notifications</string>
+
+    <string name="hwpush_dialog_limit_message">A maximum of 1000 favorite notifications can be saved. Delete some notifications before you can add new ones. Go to your favorite notifications list?</string>
+
+    <string name="hwpush_dialog_limit_ok">Go</string>
+
+    <string name="hwpush_dialog_limit_title">Note</string>
+
+    <string name="hwpush_forward">Forward</string>
+
+    <string name="hwpush_goback">Back</string>
+
+    <string name="hwpush_loading_title">Loading... Please wait.</string>
+
+    <string name="hwpush_msg_collect">Favorites</string>
+
+    <string name="hwpush_msg_favorites">Favorite notifications</string>
+
+    <string name="hwpush_no_collection">No favorite notifications</string>
+
+    <string name="hwpush_refresh">Refresh</string>
+
+    <string name="hwpush_request_provider_permission">Store messages</string>
+
+    <string name="hwpush_richmedia">Rich media</string>
+
+    <string name="hwpush_selectall">Select all</string>
+
+    <string name="hwpush_unselectall">Deselect all</string>
+
+    <string name="no_name">未命名</string>
+
+    <string name="notification_call">电话</string>
+
+    <string name="notification_current">现在</string>
+
+    <string name="notification_missed_call">个未接电话</string>
+
+    <string name="notification_time_unit">分钟前</string>
+
+    <string name="notification_wechat">微聊</string>
+
+    <string name="notification_wechat_content">发来新消息</string>
+
+    <string name="notification_wechat_emoj">[表情]</string>
+
+    <string name="notification_wechat_pic">[图片]</string>
+
+    <string name="notification_wechat_video">[视频]</string>
+
+    <string name="notification_wechat_voice">[语音]</string>
+
+    <string name="ok">确定</string>
+
+    <string name="please_buy">您暂未激活该功能哦，快去APP上激活吧~</string>
+
+    <string name="ringtone_spring_ding_dong">spring_ding_dong.mp3</string>
+
+    <string name="search_menu_title">搜索</string>
+
+    <string name="setting_title">微聊消息</string>
+
+    <string name="start_video_call">正在发起视频通话...</string>
+
+    <string name="statistics">统计</string>
+
+    <string name="status_bar_notification_info_overflow">999+</string>
+
+    <string name="ticker">\"微聊消息:\" + \"您有新微聊消息，请注意查收！\"</string>
+
+    <string name="title_alert">主题</string>
+
+    <string name="video_disconnect">The call has been disconnected because the watch is overheated</string>
+
+    <string name="video_disconnect2">Dear, to protect your eyes, the call will be disconnected</string>
+
+    <string name="video_display_name">宝贝</string>
+
+    <string name="voiceMessage">来自 :</string>
+
+    <string name="voiceMessageEnd">的微聊消息</string>
+
+    <string name="alarm_low_battery">电量低，请充电</string>
+    <string name="alarm_lock_success">锁定成功</string>
+    <string name="alarm_unbind_success">恭喜您解矫成功</string>
+    <string name="alarm_Illegal_unlock">非法解锁</string>
+    <string name="alarm_out_wall">您已越界，请尽快返回</string>
+    <string name="alarm_wristband_off">腕带已脱落</string>
+    <string name="alarm_wristband_on">腕带已佩戴</string>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6fc2d0d..71cce27a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,27 +1,27 @@
 <resources>
     <string name="app_name">ICProtocolServer</string>
     <string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
-    <string name="app_died_str">很抱歉,程序出现异常,即将退出</string>
+    <string name="app_died_str">Sorry, Program Error, will quit!</string>
 
     <string name="app_label_hasnot_been_installed">"%1$s hasn't been installed"</string>
 
-    <string name="cancel">取消</string>
+    <string name="cancel">Cancel</string>
 
     <string name="cloudpush_app_name">Push Service</string>
 
-    <string name="family_group">家庭群组</string>
-    <string name="all_group">所有人</string>
+    <string name="family_group">FamilyGroup</string>
+    <string name="all_group">GroupAll</string>
 
-    <string name="sms_title">短信提醒</string>
-    <string name="sms_notify">您有新短消息！</string>
-    <string name="hht_call_end">的未接来电</string>
+    <string name="sms_title">SMS Message</string>
+    <string name="sms_notify">You have new Message！</string>
+    <string name="hht_call_end"> \'s not answered call!</string>
 
 
-    <string name="hht_call_start">您有</string>
+    <string name="hht_call_start">You have </string>
 
-    <string name="hht_misscall_call">来电提醒</string>
+    <string name="hht_misscall_call">Missed Call</string>
 
-    <string name="findDev">查找设备！</string>
+    <string name="findDev">Find Device!</string>
 
     <string name="hwpush_ability_value">successRateAnalytics</string>
 
@@ -65,19 +65,19 @@
 
     <string name="hwpush_unselectall">Deselect all</string>
 
-    <string name="no_name">未命名</string>
+    <string name="no_name">no Name</string>
 
-    <string name="notification_call">电话</string>
+    <string name="notification_call">PhoneNum</string>
 
-    <string name="notification_current">现在</string>
+    <string name="notification_current">Now</string>
 
-    <string name="notification_missed_call">个未接电话</string>
+    <string name="notification_missed_call"> Missed calls!</string>
 
-    <string name="notification_time_unit">分钟前</string>
+    <string name="notification_time_unit">minutes before</string>
 
-    <string name="notification_wechat">微聊</string>
+    <string name="notification_wechat">Chat </string>
 
-    <string name="notification_wechat_content">发来新消息</string>
+    <string name="notification_wechat_content"> new Message!</string>
 
     <string name="notification_wechat_emoj">[表情]</string>
 
@@ -87,7 +87,7 @@
 
     <string name="notification_wechat_voice">[语音]</string>
 
-    <string name="ok">确定</string>
+    <string name="ok">OK</string>
 
     <string name="please_buy">您暂未激活该功能哦，快去APP上激活吧~</string>
 
@@ -95,7 +95,7 @@
 
     <string name="search_menu_title">Search</string>
 
-    <string name="setting_title">微聊消息</string>
+    <string name="setting_title">Chat Message </string>
 
     <string name="start_video_call">正在发起视频通话...</string>
 
@@ -113,7 +113,16 @@
 
     <string name="video_display_name">宝贝</string>
 
-    <string name="voiceMessage">来自 :</string>
+    <string name="voiceMessage">From :</string>
+
+    <string name="voiceMessageEnd"> Chat message!</string>
+
+    <string name="alarm_low_battery">Low battery, please charge!</string>
+    <string name="alarm_lock_success">Locking success!</string>
+    <string name="alarm_unbind_success">Congratulations on your successful unbind!</string>
+    <string name="alarm_Illegal_unlock">Illegal to unlock!</string>
+    <string name="alarm_out_wall">You have crossed the line, please return as soon as possible!</string>
+    <string name="alarm_wristband_off">Wristband has fallen off</string>
+    <string name="alarm_wristband_on">Wristband has been wear</string>
 
-    <string name="voiceMessageEnd">的微聊消息</string>
 </resources>