1.修复表盘切换的时候BUG.

2.修复低电量的时候切换Fragment的bug

Signed-off-by: kfl_614 <kfl_614@163.com>

diff --git a/app/build.gradle b/app/build.gradle
index 85f4e93..4eedf9a 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,11 @@ static def getL02ApkBaseName() {
     return "ICL02Launcher"
 }
 
-
 android {
 
     def currentVersionCode = getVersionCode()
     def currentVersionName = releaseTime()
+    def buildVersionType = 1
 
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
@@ -62,9 +62,11 @@ android {
             debuggable = false
             jniDebuggable = false
             manifestPlaceholders = [:]
+            buildConfigField "int", "V_TYPE", "${buildVersionType}"
         }
 
         debug {
+            buildConfigField "int", "V_TYPE", "${buildVersionType}"
             signingConfig signingConfigs.key
         }
     }
@@ -72,9 +74,9 @@ android {
     android.applicationVariants.all { variant ->
         variant.outputs.all {
             if (variant.buildType.name == "release") {
-                outputFileName = "${getL02ApkBaseName()}_V${currentVersionCode}_${currentVersionName}_release.apk"
+                outputFileName = "${getL02ApkBaseName()}_V${buildVersionType}_${currentVersionCode}_${currentVersionName}_release.apk"
             } else {
-                outputFileName = "${getL02ApkBaseName()}_V${currentVersionCode}_${currentVersionName}_debug.apk"
+                outputFileName = "${getL02ApkBaseName()}_V${buildVersionType}_${currentVersionCode}_${currentVersionName}_debug.apk"
             }
         }
     }

diff --git a/app/src/main/java/com/ic/launcher/FragmentManage.java b/app/src/main/java/com/ic/launcher/FragmentManage.java
index 8de3867..dbfabf7 100644 (file)
--- a/app/src/main/java/com/ic/launcher/FragmentManage.java
+++ b/app/src/main/java/com/ic/launcher/FragmentManage.java
@@ -114,17 +114,28 @@ public class FragmentManage {
     }
 
     void quitLowPowerMode(boolean finish) {
+        if (finish) {
+            return;
+        }
 
-        Fragment fragment = getFragmentList(LOW_FRAGMENT_INDEX);
+        Fragment lowFt = getFragmentList(LOW_FRAGMENT_INDEX);
         //如果为空，表示已经不在低电量模式
-        if (fragment == null) {
+        if (lowFt == null) {
             return;
         }
         mAddFt.remove(LOW_FRAGMENT_INDEX);
 
         Fragment mainFt = getCurrMainFragment();
 
-        replaceMainFragment(finish, mainFt);
+        FragmentTransaction ft = ftManager.beginTransaction();
+        ft.remove(lowFt);
+
+        addFragmentList(MAIN_FRAGMENT_INDEX, mainFt);
+
+        ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
+
+        ft.add(R.id.main_content_fl, mainFt);
+        ft.commit();
     }
 
 

diff --git a/app/src/main/java/com/ic/launcher/MainActivity.java b/app/src/main/java/com/ic/launcher/MainActivity.java
index f67c1e5..bfa024b 100644 (file)
--- a/app/src/main/java/com/ic/launcher/MainActivity.java
+++ b/app/src/main/java/com/ic/launcher/MainActivity.java
@@ -72,7 +72,6 @@ public class MainActivity extends AppCompatActivity implements
 
     @Override
     public void onDouble() {
-        if (isLowPower) return;
         startTestProtocol();
     }
 
@@ -127,6 +126,8 @@ public class MainActivity extends AppCompatActivity implements
         //退出低电量模式
         baseModel.getObservableLowPower().observe(this, status -> {
             IcLog.i(TAG, "getObservableLowPower status:" + status);
+            isLowPower = status;
+            isChangeClock = false;
             if (status) {
                 ftManage.gotoLowPowerMode(isFinishing(),lowBatteryValue);
             } else {

diff --git a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
index 4c34ec4..1b13ec0 100644 (file)
--- a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
+++ b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
@@ -2,6 +2,7 @@ package com.ic.launcher.configure.l02;
 
 import android.graphics.Color;
 
+import com.ic.launcher.BuildConfig;
 import com.ic.launcher.R;
 import com.ic.launcher.entity.AppInfoEntity;
 import com.ic.launcher.fragment.LowPowerModeFragment;
@@ -13,11 +14,22 @@ public class L02AppInfo {
 
     private static final int BACK_COLOUR = Color.parseColor("#000000");
 
+    public static List<AppInfoEntity> getAppList(){
+        switch (BuildConfig.V_TYPE){
+            case 0:
+                return mL02DefaultAppList;
+            case 1:
+                return mL02EnAppList;
+            default:
+                return mL02DefaultAppList;
+        }
+    }
+
     /**
      * 拨号的顺序不能变 在低电量模式下会查找这个列表，然后查找索引为1的拨号，
      * 如果要修改 请到 {@link  LowPowerModeFragment} 中一并修改
      **/
-    public static final List<AppInfoEntity> mL02DefaultAppList = new ArrayList<AppInfoEntity>() {
+    private static final List<AppInfoEntity> mL02DefaultAppList = new ArrayList<AppInfoEntity>() {
         {
             //联系人
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_contacts_l02, R.string.app_ContactName,
@@ -38,7 +50,7 @@ public class L02AppInfo {
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
                     "com.ic.blood", "com.ic.blood.BloodActivity"));
             //支付包
-           add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_alipay_l02, R.string.app_AliPay,
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_alipay_l02, R.string.app_AliPay,
                     "com.eg.android.AlipayGphone", "com.alipay.watch.ui.MainActivity"));
             //相机
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_camera_l02, R.string.app_Camera,
@@ -54,4 +66,33 @@ public class L02AppInfo {
                     "com.eqc.settings", "com.eqc.settings.MainActivity"));
         }
     };
+
+    private static final List<AppInfoEntity> mL02EnAppList = new ArrayList<AppInfoEntity>() {
+        {
+            //联系人
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_contacts_l02, R.string.app_ContactName,
+                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.PhoneDirectoryActivity"));
+            //拨号
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_dialer_l02, R.string.app_dialer,
+                    "com.ic.dial", "com.ic.dial.MainActivity"));
+            //运动
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
+                    "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
+            //心率
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
+                    "com.ic.blood", "com.ic.blood.BloodActivity"));
+            //相机
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_camera_l02, R.string.app_Camera,
+                    "com.eqc.camera", "com.eqc.camera.TakePictureActivity"));
+            //相册
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_albumn_l02, R.string.app_Album,
+                    "com.eqc.gallery", "com.eqc.gallery.ui.LocalAlbumDetail"));
+            //短信
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_sms_l02, R.string.app_Sms,
+                    "com.zmapp.sms", "com.zmapp.sms.MainActivity"));
+            //设置
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_settings_l02, R.string.main_manu_settings,
+                    "com.eqc.settings", "com.eqc.settings.MainActivity"));
+        }
+    };
 }

diff --git a/app/src/main/java/com/ic/launcher/fragment/AppListFragment.java b/app/src/main/java/com/ic/launcher/fragment/AppListFragment.java
index 18f3420..b445799 100644 (file)
--- a/app/src/main/java/com/ic/launcher/fragment/AppListFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/AppListFragment.java
@@ -2,6 +2,7 @@ package com.ic.launcher.fragment;
 
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Rect;
 import android.os.Bundle;
 
@@ -16,9 +17,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
 
 import android.os.SystemClock;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Toast;
@@ -157,7 +160,7 @@ public class AppListFragment extends Fragment {
         indicatorAdapter = new IndicatorAdapter(state);
         LinearLayoutManager mLayoutManager = new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false);
         indicatorRv.setLayoutManager(mLayoutManager);
-        indicatorRv.addItemDecoration(new SpacesItemDecoration(6));
+        indicatorRv.addItemDecoration(new SpacesItemDecoration((getWidthPixels()/(state.length*2))-4));
         indicatorRv.setAdapter(indicatorAdapter);
     }
 
@@ -246,4 +249,11 @@ public class AppListFragment extends Fragment {
         }
         return null;
     }
+
+    private int getWidthPixels(){
+        WindowManager manager = getActivity().getWindowManager();
+        DisplayMetrics outMetrics = new DisplayMetrics();
+        manager.getDefaultDisplay().getMetrics(outMetrics);
+        return outMetrics.widthPixels;
+    }
 }

diff --git a/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java b/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java
index 9e5187b..b698670 100644 (file)
--- a/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/LowPowerModeFragment.java
@@ -80,7 +80,7 @@ public class LowPowerModeFragment extends Fragment {
     }
 
     private ILowPowerCallPhoneListener callListener = () -> {
-        AppInfoEntity entity = L02AppInfo.mL02DefaultAppList.get(1);
+        AppInfoEntity entity = L02AppInfo.getAppList().get(1);
         if (entity != null) {
             try {
                 Intent intent = new Intent(Intent.ACTION_MAIN);

diff --git a/app/src/main/java/com/ic/launcher/fragment/clock/Clock12DialFragment.java b/app/src/main/java/com/ic/launcher/fragment/clock/Clock12DialFragment.java
index 2602289..6bacb94 100644 (file)
--- a/app/src/main/java/com/ic/launcher/fragment/clock/Clock12DialFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/clock/Clock12DialFragment.java
@@ -10,16 +10,12 @@ import android.view.ViewGroup;
 
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.ic.launcher.IcLauncherApplication;
 import com.ic.launcher.R;
 import com.ic.launcher.fragment.BaseFragment;
-import com.ic.launcher.listener.ILowPowerStateListener;
 import com.ic.launcher.mode.AnalogColorModel;
 import com.ic.launcher.mode.BaseModel;
-import com.ic.launcher.util.IcLog;
 import com.ic.launcher.widget.ClockDrawableView;
 
 
@@ -31,15 +27,9 @@ public class Clock12DialFragment extends BaseFragment {
         return new Clock12DialFragment();
     }
 
-    private ILowPowerStateListener lowPower;
-
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-
-        if (context instanceof ILowPowerStateListener) {
-            lowPower = (ILowPowerStateListener) context;
-        }
     }
 
     @Override
@@ -54,12 +44,6 @@ public class Clock12DialFragment extends BaseFragment {
         analogModel.getObservableHourList().observe(this,hours ->{
             clockDrawableView.onTimeChanged(hours[0],hours[1],hours[2]);
         });
-
-        baseModel.getObservableLowPower().observe(this,status ->{
-            if(status){
-                lowPower.onLowChange(true);
-            }
-        });
     }
 
     @Override

diff --git a/app/src/main/java/com/ic/launcher/fragment/clock/Clock6DialFragment.java b/app/src/main/java/com/ic/launcher/fragment/clock/Clock6DialFragment.java
index 7f3c3f9..f66e098 100644 (file)
--- a/app/src/main/java/com/ic/launcher/fragment/clock/Clock6DialFragment.java
+++ b/app/src/main/java/com/ic/launcher/fragment/clock/Clock6DialFragment.java
@@ -23,7 +23,6 @@ import com.ic.launcher.widget.ClockDrawableView;
 public class Clock6DialFragment extends BaseFragment {
 
     private ClockDrawableView clockDrawableView;
-    private ILowPowerStateListener lowPower;
 
     public static Clock6DialFragment newInstance() {
         return new Clock6DialFragment();
@@ -32,10 +31,6 @@ public class Clock6DialFragment extends BaseFragment {
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-
-        if (context instanceof ILowPowerStateListener) {
-            lowPower = (ILowPowerStateListener) context;
-        }
     }
 
     @Override
@@ -50,12 +45,6 @@ public class Clock6DialFragment extends BaseFragment {
         analogModel.getObservableHourList().observe(this,hours ->{
             clockDrawableView.onTimeChanged(hours[0],hours[1],hours[2]);
         });
-
-        baseModel.getObservableLowPower().observe(this,status ->{
-            if(status){
-                lowPower.onLowChange(true);
-            }
-        });
     }
 
     @Override

diff --git a/app/src/main/java/com/ic/launcher/presenter/AppListPresenter.java b/app/src/main/java/com/ic/launcher/presenter/AppListPresenter.java
index 93a152a..496a6f5 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/AppListPresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/AppListPresenter.java
@@ -47,8 +47,8 @@ public class AppListPresenter{
     }
 
     public void updateSystemApp() {
-        mObsAppInfoList.setValue(L02AppInfo.mL02DefaultAppList);
-        boolean[] state = new boolean[L02AppInfo.mL02DefaultAppList.size()];
+        mObsAppInfoList.setValue(L02AppInfo.getAppList());
+        boolean[] state = new boolean[L02AppInfo.getAppList().size()];
         for (int i = 0; i < state.length; i++) {
             state[i] = false;
         }
@@ -57,12 +57,12 @@ public class AppListPresenter{
     }
 
     public void startAppActivity(int index) {
-        if (index < 0 || index > L02AppInfo.mL02DefaultAppList.size()) {
+        if (index < 0 || index > L02AppInfo.getAppList().size()) {
             mObsActivityError.setValue(mErrorInfo);
             return;
         }
 
-        AppInfoEntity entity = L02AppInfo.mL02DefaultAppList.get(index);
+        AppInfoEntity entity = L02AppInfo.getAppList().get(index);
         String pck = entity.getPackageName();
         String activity = entity.getActivityName();
 

diff --git a/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java b/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java
index 92013d4..5639f57 100644 (file)
--- a/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java
+++ b/app/src/main/java/com/ic/launcher/presenter/TimeDatePresenter.java
@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MediatorLiveData;
 
+import com.ic.launcher.R;
 import com.ic.launcher.util.IcLog;
 
 import org.threeten.bp.Instant;
@@ -31,6 +32,7 @@ public class TimeDatePresenter extends PresenterCycle {
 
     private static final String TAG = "TimeDatePresenter";
     private static final DateTimeFormatter MMDD = DateTimeFormatter.ofPattern("MM-dd");
+    private static final String[]  WEEK_SRT = new String[7];
 
     private MediatorLiveData<int[]> mObsTime;
     private MediatorLiveData<String> mObsYear;
@@ -93,6 +95,14 @@ public class TimeDatePresenter extends PresenterCycle {
         IcLog.i(TAG, "TimeDatePresenter");
         mContext = context;
 
+        WEEK_SRT[0] = context.getString(R.string.monday);
+        WEEK_SRT[1] = context.getString(R.string.tuesday);
+        WEEK_SRT[2] = context.getString(R.string.wednesday);
+        WEEK_SRT[3] = context.getString(R.string.thursday);
+        WEEK_SRT[4] = context.getString(R.string.friday);
+        WEEK_SRT[5] = context.getString(R.string.saturday);
+        WEEK_SRT[6] = context.getString(R.string.sunday);
+
         mObsTime = new MediatorLiveData<>();
         mObsYear = new MediatorLiveData<>();
         mObsWeek = new MediatorLiveData<>();
@@ -174,8 +184,31 @@ public class TimeDatePresenter extends PresenterCycle {
     private void computeMainClockTime(LocalDateTime localDateTime) {
 
         mObsYear.setValue(localDateTime.format(MMDD));
+        switch (localDateTime.getDayOfWeek()){
+            case MONDAY:
+                mObsWeek.setValue(WEEK_SRT[0]);
+                break;
+            case TUESDAY:
+                mObsWeek.setValue(WEEK_SRT[1]);
+                break;
+            case WEDNESDAY:
+                mObsWeek.setValue(WEEK_SRT[2]);
+                break;
+            case THURSDAY:
+                mObsWeek.setValue(WEEK_SRT[3]);
+                break;
+            case FRIDAY:
+                mObsWeek.setValue(WEEK_SRT[4]);
+                break;
+            case SATURDAY:
+                mObsWeek.setValue(WEEK_SRT[5]);
+                break;
+            case SUNDAY:
+                mObsWeek.setValue(WEEK_SRT[6]);
+                break;
+        }
 
-        mObsWeek.setValue(localDateTime.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.getDefault()));
+        //mObsWeek.setValue(localDateTime.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.getDefault()));
 
         int hour = localDateTime.getHour();
         int minute = localDateTime.getMinute();
@@ -213,7 +246,6 @@ public class TimeDatePresenter extends PresenterCycle {
         @Override
         void onThreadExecute() {
             if (secondMessage != null) {
-                //IcLog.i(TAG, "LoopSecondThread....................");
                 secondMessage.sendEmptyMessage(1);
             }
         }

diff --git a/app/src/main/java/com/ic/launcher/widget/WidgetBatteryStateView.java b/app/src/main/java/com/ic/launcher/widget/WidgetBatteryStateView.java
index e93b89e..9d44498 100644 (file)
--- a/app/src/main/java/com/ic/launcher/widget/WidgetBatteryStateView.java
+++ b/app/src/main/java/com/ic/launcher/widget/WidgetBatteryStateView.java
@@ -68,7 +68,7 @@ public class WidgetBatteryStateView extends LinearLayout {
     }
 
 
-    @BindingAdapter(value = {"app:batteryValue", "app:batteryDrawable", "app:batteryCharge"}, requireAll = false)
+    @BindingAdapter(value = {"batteryValue", "batteryDrawable", "batteryCharge"}, requireAll = false)
     public static void updateBatteryState(WidgetBatteryStateView view, String value, int imgRes, boolean charge) {
         if (view != null) {
             view.updateBatteryValue(value);

diff --git a/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java b/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
index e037107..c9d56b7 100644 (file)
--- a/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
+++ b/app/src/main/java/com/ic/launcher/widget/WidgetPhoneStateView.java
@@ -61,7 +61,7 @@ public class WidgetPhoneStateView extends LinearLayout {
 
     }
 
-    @BindingAdapter(value = {"app:signalDrawable", "app:netTypeDrawable", "app:transportDrawable", "app:phoneShow"}, requireAll = false)
+    @BindingAdapter(value = {"signalDrawable", "netTypeDrawable", "transportDrawable", "phoneShow"}, requireAll = false)
     public static void updatePhoneState(WidgetPhoneStateView view, int signal, int netType, int transport,boolean isShow) {
         if (view != null) {
             view.updateSinalDrawable(signal);

diff --git a/app/src/main/java/com/ic/launcher/widget/WidgetTimeImageView.java b/app/src/main/java/com/ic/launcher/widget/WidgetTimeImageView.java
index c9cc62b..bcaae88 100644 (file)
--- a/app/src/main/java/com/ic/launcher/widget/WidgetTimeImageView.java
+++ b/app/src/main/java/com/ic/launcher/widget/WidgetTimeImageView.java
@@ -69,7 +69,7 @@ public class WidgetTimeImageView extends RelativeLayout {
         }
     }
 
-    @BindingAdapter(value = {"app:hourTenResId","app:hourBitResId","app:minuteTenResId","app:minuteBitResId"}, requireAll = false)
+    @BindingAdapter(value = {"hourTenResId","hourBitResId","minuteTenResId","minuteBitResId"}, requireAll = false)
     public static void updateTimeImage(WidgetTimeImageView view, int hourTen,int hourBit,int minuteTen,int minuteBit) {
         if (view != null) {
             view.updateTime(hourTen,hourBit,minuteTen,minuteBit);

diff --git a/app/src/main/java/com/ic/launcher/widget/WidgetTimeTextView.java b/app/src/main/java/com/ic/launcher/widget/WidgetTimeTextView.java
index 18bc38d..e14f906 100644 (file)
--- a/app/src/main/java/com/ic/launcher/widget/WidgetTimeTextView.java
+++ b/app/src/main/java/com/ic/launcher/widget/WidgetTimeTextView.java
@@ -61,7 +61,7 @@ public class WidgetTimeTextView extends RelativeLayout {
         }
     }
 
-    @BindingAdapter(value = {"app:timeImageText"}, requireAll = false)
+    @BindingAdapter(value = {"timeImageText"}, requireAll = false)
     public static void updateTimeText(WidgetTimeTextView view, ArrayList<Integer> timeRes) {
         if (view != null) {
             view.updateTextTime(timeRes);

diff --git a/app/src/main/res/layout/fragment_l02_main.xml b/app/src/main/res/layout/fragment_l02_main.xml
index 347eacb..0793555 100644 (file)
--- a/app/src/main/res/layout/fragment_l02_main.xml
+++ b/app/src/main/res/layout/fragment_l02_main.xml
@@ -128,7 +128,7 @@
             android:layout_below="@id/l02_time_image"
             android:layout_marginStart="8dp"
             android:layout_toEndOf="@id/l02_time_sp"
-            android:text="@{watchWeek}" />
+            android:text="@{watchWeek}"/>
 
         <ImageView
             android:id="@+id/l02_heart_img"

diff --git a/app/src/main/res/layout/item_app_layout.xml b/app/src/main/res/layout/item_app_layout.xml
index a31aee4..2845908 100644 (file)
--- a/app/src/main/res/layout/item_app_layout.xml
+++ b/app/src/main/res/layout/item_app_layout.xml
@@ -36,7 +36,7 @@
             android:layout_centerHorizontal="true"
             android:text="@{appTitle}"
             android:textColor="#FFFFFF"
-            android:textSize="62sp"/>
+            android:textSize="@dimen/app_list_name_text_size"/>
     </RelativeLayout>
 
 </layout>

diff --git a/app/src/main/res/raw-en/chrg_connect.mp3 b/app/src/main/res/raw-en/chrg_connect.mp3
new file mode 100644 (file)
index 0000000..ba716ad
Binary files /dev/null and b/app/src/main/res/raw-en/chrg_connect.mp3 differ

diff --git a/app/src/main/res/raw-en/chrg_remove.mp3 b/app/src/main/res/raw-en/chrg_remove.mp3
new file mode 100644 (file)
index 0000000..99de4f4
Binary files /dev/null and b/app/src/main/res/raw-en/chrg_remove.mp3 differ

diff --git a/app/src/main/res/values-en/dimens.xml b/app/src/main/res/values-en/dimens.xml
new file mode 100644 (file)
index 0000000..0ecd0ab
--- /dev/null
+++ b/app/src/main/res/values-en/dimens.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+    <dimen name="status_bar_height_dm">48dp</dimen>
+
+    <dimen name="viewpager_next_item_visible">26dp</dimen>
+    <dimen name="viewpager_current_item_horizontal_margin">42dp</dimen>
+
+    <dimen name="app_next_item_visible">26dp</dimen>
+    <dimen name="app_current_item_horizontal_margin">42dp</dimen>
+
+    <dimen name="app_list_name_text_size">52sp</dimen>
+</resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
new file mode 100644 (file)
index 0000000..77de000
--- /dev/null
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,128 @@
+<resources>
+       <string name="app_name">Watch</string>
+       <!-- 主菜单文本 -->
+
+       <string name="app_name_heart">Health</string>
+       <string name="error_start_activity">failed to run Application !</string>
+
+
+       <string name="main_manu_settings">Settings</string>
+       <string name="main_manu_family">My Family</string>
+       <string name="main_manu_friend">My Friends</string>
+       <string name="weather_network_not_available">Network is not available</string>
+       <string name="weather_get_data_failed">Get data failed, please wait</string>
+       <string name="weather_forecast">Weather forecast</string>
+       <string name="weather_today">Today</string>
+       <string name="weather_tomorrow">Tomorrow</string>
+       <string name="weather_yesterday">Yesterday</string>
+       <string name="no_qr_code">No qr code</string>
+       <string name="low_power_mode">Low Power Mode</string>
+       <string name="please_insert_sim_card">Please insert the SIM card</string>
+       <string name="pedometer_unit_step">Steps</string>
+       <string name="pedometer_setting_unit_step">Steps</string>
+       <string name="pedometer_unit_calorie">Cal</string>
+       <string name="pedometer_unit_km">km</string>
+       <string name="pedometer_history_7days">History</string>
+       <string name="pedometer_today">Today</string>
+       <string name="pedometer_goal">Goal</string>
+       <string name="pedometer_input_goal">Please enter the goal number of steps</string>
+       <string name="pedometer_invalid_input">Invalid input value</string>
+       <string name="pedometer_height">Height</string>
+       <string name="pedometer_weight">Weight</string>
+       <string name="pedometer_unit_cm">cm</string>
+       <string name="pedometer_unit_kg">kg</string>
+       <string name="pedometer_personal_info_settings">Pedometer settings</string>
+       <string name="_0">0</string>
+       <string name="averagestep">Average step</string>
+       <string name="sumstep">Sum step</string>
+       <string name="pedometer_unit_lb">lb</string>
+       <string name="pedometer_unit_mile">mile</string>
+       <string name="pedometer_unit_inch">inch</string>
+       <string name="pedometer_unit_foot">foot</string>
+       <string name="reached_step_goal">Have Reached Target Steps</string>
+       <!--
+    <string name="history">history</string>
+    <string name="analysis">analysis</string>
+    <string name="Monday">Monday</string>
+    <string name="Tuesday">Tuesday</string>
+    <string name="Wednesday">Wednesday</string>
+    <string name="Thursday">Thursday</string>
+    <string name="Friday">Friday</string>
+    <string name="Saturday">Saturday</string>
+    <string name="Sunday">Sunday</string>
+    <string name="today">today</string>
+    -->
+       <string name="select_clock_theme">Dial</string>
+       <string name="select_main_menu_background">Background</string>
+       <string name="app_dialer">Dialer</string>
+       <string name="app_ContactName">Contacts</string>
+       <string name="app_TelePhone">Call</string>
+       <string name="app_VoLTE">VoLTE Call</string>
+       <string name="app_Sms">Message</string>
+       <string name="app_VideoCall">VideoCall</string>
+       <string name="app_Wechat">We chat</string>
+       <string name="app_Chat">Chat</string>
+       <string name="app_Camera">Camera</string>
+       <string name="app_Album">Photos</string>
+       <string name="app_Guiding">map</string>
+       <string name="app_MakeFriends">Buddy</string>
+       <string name="app_GrindingEars">GrindingEars</string>
+       <string name="app_AnsweredQuestions">AnsweredQuestions</string>
+       <string name="app_AiKnowledge">AiKnowledge</string>
+       <string name="app_EncyclopediaKnowledge">EncyclopediaKnowledge</string>
+       <string name="app_MagicEncyclopedia">MagicEncyclopedia</string>
+       <string name="app_Weather">Weather</string>
+       <string name="app_VoiceAssistant">VoiceAssistant</string>
+       <string name="app_Tool">Tool</string>
+       <string name="app_Settings">Settings</string>
+       <string name="app_English">English</string>
+       <string name="app_Story">Story</string>
+       <string name="app_Recorder">Recorder</string>
+       <string name="app_Music">Music</string>
+       <string name="app_StopWatch">Timer</string>
+       <string name="app_Calculator">Calculator</string>
+       <string name="app_Calendar">Calendar</string>
+       <string name="app_clearRam">Clear</string>
+       <string name="app_Sport">Fitness</string>
+       <string name="app_xu_yuan_xing">Wishing Star</string>
+       <string name="app_qr_code">QR Code</string>
+       <string name="app_HeartRate">Heart Rate</string>
+       <string name="app_custom_Chat">Chat</string>
+       <string name="app_AliPay">AliPay</string>
+       <string name="app_BloodPressure">Blood Pressure</string>
+       <string name="app_drama">Drama</string>
+       <string name="app_down_remote_app">remote app</string>
+       <string name="down_remote_app">Download Remote App</string>
+       <!--iMessage begin-->
+       <string name="imessage_remind">No contact, please check the network</string>
+       <string name="imessage_contact">Contacts</string>
+       <!--iMessage end-->
+       <string name="change_brightness">Change brightness</string>
+       <string name="change_volume">Change volume</string>
+       <string name="silent_mode">Classroom mode</string>
+       <!--系统升级提示-->
+       <string name="system_upgrade">System upgrade</string>
+       <string name="is_upgrade_version">Find the new version, whether to upgrade to</string>
+       <string name="system_upgrade_tips">Find the new version, whether to upgrade?</string>
+       <string name="yes">YES</string>
+       <string name="no">NO</string>
+       <string name="question_mark">"?"</string>
+       <!--系统升级提示-->
+       <string name="sim_blocked">SIM blocked</string>
+       <string name="select_main_menu_style">Select main menu style</string>
+       <string name="main_menu_style_multi_icon">Multi icon</string>
+       <string name="main_menu_style_single_icon">Single icon</string>
+       <string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
+       <string name="please_wait">Please wait...</string>
+       <string name="monday">Mon</string>
+       <string name="tuesday">Tue</string>
+       <string name="wednesday">Wed</string>
+       <string name="thursday">Thu</string>
+       <string name="friday">Fri</string>
+       <string name="saturday">Sat</string>
+       <string name="sunday">Sun</string>
+       <string name="all_group">All</string>
+
+       <string name="ic_high_pressure">HP</string>
+       <string name="ic_low_pressure">LP</string>
+</resources>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
deleted file mode 100644 (file)
index f89192b..0000000
--- a/app/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-       <string name="app_name_heart">Health</string>
-       <string name="error_start_activity">failed to run Application !</string>
-       <string name="app_name">Reloj</string>
-       <string name="main_manu_settings">Configuración</string>
-       <string name="main_manu_family">Mi familia</string>
-       <string name="main_manu_friend">Mi amigo</string>
-       <string name="weather_network_not_available">Ahora no hay red disponible</string>
-       <string name="weather_get_data_failed">No se pueden obtener datos, por favor espere</string>
-       <string name="weather_forecast">Clima</string>
-       <string name="weather_today">Hoy</string>
-       <string name="weather_tomorrow">Mañana</string>
-       <string name="weather_yesterday">Ayer</string>
-       <string name="no_qr_code">Sin QR código</string>
-       <string name="low_power_mode">Modo de batería baja</string>
-       <string name="please_insert_sim_card">No hay tarjeta de SIM actualmente</string>
-       <string name="pedometer_unit_step">Paso</string>
-       <string name="pedometer_setting_unit_step">Paso</string>
-       <string name="pedometer_unit_calorie">Caloría</string>
-       <string name="pedometer_unit_km">Kilómetro</string>
-       <string name="pedometer_history_7days">Registros recientes</string>
-       <string name="pedometer_today">Hoy</string>
-       <string name="pedometer_goal">Objetivo</string>
-       <string name="pedometer_input_goal">Por favor ingrese el número de pasos de meta</string>
-       <string name="pedometer_invalid_input">Valor de entrada es inválido</string>
-       <string name="pedometer_height">Altura</string>
-       <string name="pedometer_weight">Peso</string>
-       <string name="pedometer_unit_cm">Centímetro</string>
-       <string name="pedometer_unit_kg">Kilo</string>
-       <string name="pedometer_personal_info_settings">Configuraciones personales</string>
-       <string name="_0">0</string>
-       <string name="averagestep">Paso medio</string>
-       <string name="sumstep">Paso total</string>
-       <string name="pedometer_unit_lb">Libra</string>
-       <string name="pedometer_unit_mile">Milla</string>
-       <string name="pedometer_unit_inch">Pulgada</string>
-       <string name="pedometer_unit_foot">Pie</string>
-       <string name="reached_step_goal">Ha llegado los pasos destinados</string>
-       <string name="select_clock_theme">El tema del reloj</string>
-       <string name="select_main_menu_background">El tema </string>
-       <string name="app_dialer">Dialer</string>
-       <string name="app_ContactName">Persona de contacto</string>
-       <string name="app_TelePhone">Teléfono</string>
-       <string name="app_VoLTE">HD llamada</string>
-       <string name="app_Sms">Mensaje</string>
-       <string name="app_VideoCall">Vídeo llamada</string>
-       <string name="app_Wechat">Wechat</string>
-       <string name="app_Chat">Micro chat</string>
-       <string name="app_Camera">Fotografía</string>
-       <string name="app_Album">Álbum de fotos</string>
-       <string name="app_Guiding">Guía</string>
-       <string name="app_MakeFriends">Hacer amigos</string>
-       <string name="app_GrindingEars">Reproductor multimedia</string>
-       <string name="app_AnsweredQuestions">Repuesta a todas las preguntas</string>
-       <string name="app_AiKnowledge">El conocimiento amado</string>
-       <string name="app_EncyclopediaKnowledge">Conocimiento de enciclopedia </string>
-       <string name="app_MagicEncyclopedia">Enciclopedia mágica</string>
-       <string name="app_Weather">Clima</string>
-       <string name="app_VoiceAssistant">Asistente de voz</string>
-       <string name="app_Tool">Herramienta</string>
-       <string name="app_Settings">Configutación</string>
-       <string name="app_English">Escucha inglés</string>
-       <string name="app_Story">Historia</string>
-       <string name="app_Recorder">Grabadora</string>
-       <string name="app_Music">Música</string>
-       <string name="app_StopWatch">Cronómetro</string>
-       <string name="app_Calculator">Calculadora</string>
-       <string name="app_Calendar">Calendario</string>
-       <string name="app_clearRam">Limpia la memoria</string>
-       <string name="app_Sport">Deporte</string>
-       <string name="app_xu_yuan_xing">Estrella de deseo</string>
-       <string name="app_qr_code">QR código</string>
-       <string name="app_HeartRate">Frecuencia cardíaca</string>
-       <string name="app_BloodPressure">Presión arterial</string>
-       <string name="app_drama">Drama</string>
-    <string name="app_down_remote_app">remote app</string>
-    <string name="down_remote_app">Download Remote App</string>
-       <string name="imessage_remind">Sin persona de contacto, por favor revisa la red</string>
-       <string name="imessage_contact">Persona de contacto</string>
-       <string name="change_brightness">Cambia el brillo</string>
-       <string name="change_volume">Cambia el volumen</string>
-       <string name="silent_mode">Modo de aula</string>
-       <string name="system_upgrade">Actualización del sistema</string>
-       <string name="is_upgrade_version">Descubre una nueva versión, si actualiza a</string>
-       <string name="system_upgrade_tips">¿Descubre una nueva versión, si actualiza?</string>
-       <string name="yes">Confirmar</string>
-       <string name="no">Cancelar</string>
-       <string name="question_mark">"?"</string>
-       <string name="sim_blocked">SIM blocked</string>
-    <string name="select_main_menu_style">Select main menu style</string>
-    <string name="main_menu_style_multi_icon">Multi icon</string>
-    <string name="main_menu_style_single_icon">Single icon</string>
-    <string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
-       <string name="please_wait">Please wait...</string>
-       <string name="monday">Mon</string>
-       <string name="tuesday">Tue</string>
-       <string name="wednesday">Wed</string>
-       <string name="thursday">Thu</string>
-       <string name="friday">Fri</string>
-       <string name="saturday">Sat</string>
-       <string name="sunday">Sun</string>
-
-       <string name="ic_high_pressure">High Pressure</string>
-       <string name="ic_low_pressure">Low Pressure</string>
-</resources>

diff --git a/app/src/main/res/values-zh-rCN/dimens.xml b/app/src/main/res/values-zh-rCN/dimens.xml
new file mode 100644 (file)
index 0000000..b2198e8
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/dimens.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+    <dimen name="status_bar_height_dm">48dp</dimen>
+
+    <dimen name="viewpager_next_item_visible">26dp</dimen>
+    <dimen name="viewpager_current_item_horizontal_margin">42dp</dimen>
+
+    <dimen name="app_next_item_visible">26dp</dimen>
+    <dimen name="app_current_item_horizontal_margin">42dp</dimen>
+
+    <dimen name="app_list_name_text_size">62sp</dimen>
+</resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9fe43d4..b2198e8 100644 (file)
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,4 +8,6 @@
 
     <dimen name="app_next_item_visible">26dp</dimen>
     <dimen name="app_current_item_horizontal_margin">42dp</dimen>
+
+    <dimen name="app_list_name_text_size">62sp</dimen>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 335935f..7220a70 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,129 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-<string name="app_name">Watch</string>
-<!-- 主菜单文本 -->
+    <string name="app_name_heart" translatable="false">爱健康</string>
+    <string name="error_start_activity" translatable="false">应用程序启动失败</string>
 
-    <string name="app_name_heart">Health</string>
-    <string name="error_start_activity">failed to run Application !</string>
+    <string name="app_name" translatable="false">手表</string>
 
+    <!-- 主菜单文本 -->
+    <string name="main_manu_settings" translatable="false">设置</string>
+    <string name="main_manu_family" translatable="false">我的家人</string>
+    <string name="main_manu_friend" translatable="false">我的朋友</string>
 
-    <string name="main_manu_settings">Settings</string>
-<string name="main_manu_family">My Family</string>
-<string name="main_manu_friend">My Friends</string>
-<string name="weather_network_not_available">Network is not available</string>
-<string name="weather_get_data_failed">Get data failed, please wait</string>
-<string name="weather_forecast">Weather forecast</string>
-<string name="weather_today">Today</string>
-<string name="weather_tomorrow">Tomorrow</string>
-<string name="weather_yesterday">Yesterday</string>
-<string name="no_qr_code">No qr code</string>
-<string name="low_power_mode">Low Power Mode</string>
-<string name="please_insert_sim_card">Please insert the SIM card</string>
-<string name="pedometer_unit_step">Steps</string>
-<string name="pedometer_setting_unit_step">Steps</string>
-<string name="pedometer_unit_calorie">Cal</string>
-<string name="pedometer_unit_km">km</string>
-<string name="pedometer_history_7days">History</string>
-<string name="pedometer_today">Today</string>
-<string name="pedometer_goal">Goal</string>
-<string name="pedometer_input_goal">Please enter the goal number of steps</string>
-<string name="pedometer_invalid_input">Invalid input value</string>
-<string name="pedometer_height">Height</string>
-<string name="pedometer_weight">Weight</string>
-<string name="pedometer_unit_cm">cm</string>
-<string name="pedometer_unit_kg">kg</string>
-<string name="pedometer_personal_info_settings">Pedometer settings</string>
-<string name="_0">0</string>
-<string name="averagestep">Average step</string>
-<string name="sumstep">Sum step</string>
-<string name="pedometer_unit_lb">lb</string>
-<string name="pedometer_unit_mile">mile</string>
-<string name="pedometer_unit_inch">inch</string>
-<string name="pedometer_unit_foot">foot</string>
-<string name="reached_step_goal">Have Reached Target Steps</string>
-<!--
-<string name="history">history</string>
-<string name="analysis">analysis</string>
-<string name="Monday">Monday</string>
-<string name="Tuesday">Tuesday</string>
-<string name="Wednesday">Wednesday</string>
-<string name="Thursday">Thursday</string>
-<string name="Friday">Friday</string>
-<string name="Saturday">Saturday</string>
-<string name="Sunday">Sunday</string>
-<string name="today">today</string>
--->
-<string name="select_clock_theme">Dial</string>
-<string name="select_main_menu_background">Background</string>
-<string name="unit_celsius_degree" translatable="false">℃</string>
-<string name="app_dialer">Dialer</string>
-<string name="app_ContactName">Contacts</string>
-<string name="app_TelePhone">Call</string>
-<string name="app_VoLTE">VoLTE Call</string>
-<string name="app_Sms">Message</string>
-<string name="app_VideoCall">VideoCall</string>
-<string name="app_Wechat">We chat</string>
-<string name="app_Chat">Chat</string>
-<string name="app_Camera">Camera</string>
-<string name="app_Album">Photos</string>
-<string name="app_Guiding">map</string>
-<string name="app_MakeFriends">Buddy</string>
-<string name="app_GrindingEars">GrindingEars</string>
-<string name="app_AnsweredQuestions">AnsweredQuestions</string>
-<string name="app_AiKnowledge">AiKnowledge</string>
-<string name="app_EncyclopediaKnowledge">EncyclopediaKnowledge</string>
-<string name="app_MagicEncyclopedia">MagicEncyclopedia</string>
-<string name="app_Weather">Weather</string>
-<string name="app_VoiceAssistant">VoiceAssistant</string>
-<string name="app_Tool">Tool</string>
-<string name="app_Settings">Settings</string>
-<string name="app_English">English</string>
-<string name="app_Story">Story</string>
-<string name="app_Recorder">Recorder</string>
-<string name="app_Music">Music</string>
-<string name="app_StopWatch">Timer</string>
-<string name="app_Calculator">Calculator</string>
-<string name="app_Calendar">Calendar</string>
-<string name="app_clearRam">Clear</string>
-<string name="app_Sport">Fitness</string>
-<string name="app_xu_yuan_xing">Wishing Star</string>
-<string name="app_qr_code">QR Code</string>
-<string name="app_HeartRate">Heart Rate</string>
-<string name="app_custom_Chat">Chat</string>
-<string name="app_AliPay">AliPay</string>
-<string name="app_BloodPressure">Blood Pressure</string>
-<string name="app_drama">Drama</string>
-<string name="app_down_remote_app">remote app</string>
-<string name="down_remote_app">Download Remote App</string>
-<!--iMessage begin-->
-<string name="imessage_remind">No contact, please check the network</string>
-<string name="imessage_contact">Contacts</string>
-<!--iMessage end-->
-<string name="change_brightness">Change brightness</string>
-<string name="change_volume">Change volume</string>
-<string name="silent_mode">Classroom mode</string>
-<!--系统升级提示-->
-<string name="system_upgrade">System upgrade</string>
-<string name="is_upgrade_version">Find the new version, whether to upgrade to</string>
-<string name="system_upgrade_tips">Find the new version, whether to upgrade?</string>
-<string name="yes">YES</string>
-<string name="no">NO</string>
-<string name="question_mark">"?"</string>
-<!--系统升级提示-->
-<string name="sim_blocked">SIM blocked</string>
-<string name="select_main_menu_style">Select main menu style</string>
-<string name="main_menu_style_multi_icon">Multi icon</string>
-<string name="main_menu_style_single_icon">Single icon</string>
-<string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
-<string name="please_wait">Please wait...</string>
-<string name="monday">Mon</string>
-<string name="tuesday">Tue</string>
-<string name="wednesday">Wed</string>
-<string name="thursday">Thu</string>
-<string name="friday">Fri</string>
-<string name="saturday">Sat</string>
-<string name="sunday">Sun</string>
-<string name="all_group">All</string>
+    <string name="weather_network_not_available" translatable="false">当前无可用网络</string>
+    <string name="weather_get_data_failed" translatable="false">无法获取数据，请稍候</string>
+    <string name="weather_forecast" translatable="false">天气</string>
+    <string name="weather_today" translatable="false">今天</string>
+    <string name="weather_tomorrow" translatable="false">明天</string>
+    <string name="weather_yesterday" translatable="false">昨天</string>
 
-<string name="ic_high_pressure">HP</string>
-<string name="ic_low_pressure">LP</string>
-</resources>
+    <string name="no_qr_code" translatable="false">没有二维码</string>
+    <string name="low_power_mode" translatable="false">低电量模式</string>
+    <string name="please_insert_sim_card" translatable="false">当前无 SIM 卡</string>
+
+    <string name="pedometer_unit_step" translatable="false">步</string>
+    <string name="pedometer_setting_unit_step" translatable="false">步</string>
+    <string name="pedometer_unit_calorie" translatable="false">卡</string>
+    <string name="pedometer_unit_km" translatable="false">公里</string>
+    <string name="pedometer_history_7days" translatable="false">最近记录</string>
+    <string name="pedometer_today" translatable="false">今日</string>
+    <string name="pedometer_goal" translatable="false">目标</string>
+    <string name="pedometer_input_goal" translatable="false">请输入目标步数</string>
+    <string name="pedometer_invalid_input" translatable="false">输入值无效</string>
+    <string name="pedometer_height" translatable="false">身高</string>
+    <string name="pedometer_weight" translatable="false">体重</string>
+    <string name="pedometer_unit_cm" translatable="false">厘米</string>
+    <string name="pedometer_unit_kg" translatable="false">千克</string>
+    <string name="pedometer_personal_info_settings" translatable="false">个人设置</string>
+    <string name="_0" translatable="false">0</string>
+    <string name="averagestep">平均步数</string>
+    <string name="sumstep">总步数</string>
+    <string name="pedometer_unit_lb">磅</string>
+    <string name="pedometer_unit_mile">英里</string>
+    <string name="pedometer_unit_inch">英寸</string>
+    <string name="pedometer_unit_foot">英尺</string>
+    <string name="reached_step_goal">已达到目标步数</string>
+
+    <string name="select_clock_theme">时钟主题</string>
+    <string name="select_main_menu_background">菜单背景</string>
+
+    <string name="app_dialer">拨号</string>
+    <string name="app_ContactName" translatable="false">联系人</string>
+    <string name="app_TelePhone">电话</string>
+    <string name="app_VoLTE">高清通话</string>
+    <string name="app_Sms">短信</string>
+    <string name="app_VideoCall">视频通话</string>
+    <string name="app_Wechat">微信</string>
+    <string name="app_Chat">微聊</string>
+    <string name="app_Camera">照相</string>
+    <string name="app_Album">相册</string>
+    <string name="app_Guiding">指路</string>
+    <string name="app_MakeFriends">交友</string>
+    <string name="app_GrindingEars">磨耳朵</string>
+    <string name="app_AnsweredQuestions">有问必答</string>
+    <string name="app_AiKnowledge">爱知识</string>
+    <string name="app_EncyclopediaKnowledge">百科知识</string>
+    <string name="app_MagicEncyclopedia">魔法百科</string>
+    <string name="app_Weather">天气</string>
+    <string name="app_VoiceAssistant">语音助手</string>
+    <string name="app_Tool">工具</string>
+    <string name="app_Settings">设置</string>
+    <string name="app_English">听英语</string>
+    <string name="app_Story">故事</string>
+    <string name="app_Recorder">录音机</string>
+    <string name="app_Music">音乐</string>
+    <string name="app_StopWatch">秒表</string>
+    <string name="app_Calculator">计算器</string>
+    <string name="app_Calendar">日历</string>
+    <string name="app_clearRam">清理内存</string>
+    <string name="app_Sport">运动</string>
+    <string name="app_xu_yuan_xing">许愿星</string>
+    <string name="app_qr_code">CID</string>
+    <string name="app_HeartRate">心率</string>
+    <string name="app_custom_Chat">聊天</string>
+    <string name="app_AliPay">支付宝</string>
+    <string name="app_BloodPressure">血压</string>
+    <string name="app_drama">戏曲</string>
+    <string name="app_down_remote_app">APP下载</string>
+    <string name="down_remote_app">下载手机应用 APP</string>
+
+    <!--iMessage begin-->
+    <string name="imessage_remind">无联系人,请检测网络</string>
+    <string name="imessage_contact">联系人</string>
+    <!--iMessage end-->
+
+    <string name="change_brightness">更改亮度</string>
+    <string name="change_volume">更改音量</string>
+    <string name="silent_mode">课堂模式</string>
+
+    <!--系统升级提示-->
+    <string name="system_upgrade" translatable="false">系统升级</string>
+    <string name="is_upgrade_version" translatable="false">发现新版本，是否升级到</string>
+    <string name="system_upgrade_tips" translatable="false">发现新版本，是否升级？</string>
+    <string name="yes" translatable="false">确定</string>
+    <string name="no" translatable="false">取消</string>
+    <string name="question_mark" translatable="false">？</string>
+    <!--系统升级提示-->
+
+    <string name="sim_blocked" translatable="false">此 SIM 卡不支持</string>
+    <string name="select_main_menu_style" translatable="false">主菜单风格</string>
+    <string name="main_menu_style_multi_icon" translatable="false">多图标</string>
+    <string name="main_menu_style_single_icon" translatable="false">单图标</string>
+    <string name="program_abnormal" translatable="false">很抱歉,程序出现异常,即将退出</string>
+    <string name="please_wait" translatable="false">请稍候…</string>
+    <string name="monday" translatable="false">星期一</string>
+    <string name="tuesday" translatable="false">星期二</string>
+    <string name="wednesday" translatable="false">星期三</string>
+    <string name="thursday" translatable="false">星期四</string>
+    <string name="friday" translatable="false">星期五</string>
+    <string name="saturday" translatable="false">星期六</string>
+    <string name="sunday" translatable="false">星期日</string>
+
+
+    <string name="all_group" translatable="false">所有人</string>
+
+    <!--IC ADD-->
+    <string name="ic_high_pressure" translatable="false">高压</string>
+    <string name="ic_low_pressure" translatable="false">低压</string>
+</resources>
\ No newline at end of file

diff --git a/app/version_code.properties b/app/version_code.properties
index 9f80442..c7ad18b 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Apr 10 15:47:43 CST 2020
-VERSION_CODE=42
+#Tue Jun 23 15:04:37 CST 2020
+VERSION_CODE=55