From: kfl_614 Date: Fri, 26 Jun 2020 07:03:33 +0000 (+0800) Subject: 1.修复表盘切换的时候BUG. X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=f19237aef781b37f645c76dd5b7223a799c6ffce;p=launcher4.git 1.修复表盘切换的时候BUG. 2.修复低电量的时候切换Fragment的bug Signed-off-by: kfl_614 --- diff --git a/app/build.gradle b/app/build.gradle index 85f4e93..4eedf9a 100644 --- 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 --- 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 --- 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 --- 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 getAppList(){ + switch (BuildConfig.V_TYPE){ + case 0: + return mL02DefaultAppList; + case 1: + return mL02EnAppList; + default: + return mL02DefaultAppList; + } + } + /** * 拨号的顺序不能变 在低电量模式下会查找这个列表，然后查找索引为1的拨号， * 如果要修改 请到 {@link LowPowerModeFragment} 中一并修改 **/ - public static final List mL02DefaultAppList = new ArrayList() { + private static final List mL02DefaultAppList = new ArrayList() { { //联系人 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 mL02EnAppList = new ArrayList() { + { + //联系人 + 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 mObsTime; private MediatorLiveData 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 --- 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 --- 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 --- 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 --- 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 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 --- 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}"/> + android:textSize="@dimen/app_list_name_text_size"/> 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 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 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 index 0000000..0ecd0ab --- /dev/null +++ b/app/src/main/res/values-en/dimens.xml @@ -0,0 +1,13 @@ + + + + 48dp + + 26dp + 42dp + + 26dp + 42dp + + 52sp + \ 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 index 0000000..77de000 --- /dev/null +++ b/app/src/main/res/values-en/strings.xml @@ -0,0 +1,128 @@ + + Watch + + + Health + failed to run Application ! + + + Settings + My Family + My Friends + Network is not available + Get data failed, please wait + Weather forecast + Today + Tomorrow + Yesterday + No qr code + Low Power Mode + Please insert the SIM card + Steps + Steps + Cal + km + History + Today + Goal + Please enter the goal number of steps + Invalid input value + Height + Weight + cm + kg + Pedometer settings + 0 + Average step + Sum step + lb + mile + inch + foot + Have Reached Target Steps + + Dial + Background + Dialer + Contacts + Call + VoLTE Call + Message + VideoCall + We chat + Chat + Camera + Photos + map + Buddy + GrindingEars + AnsweredQuestions + AiKnowledge + EncyclopediaKnowledge + MagicEncyclopedia + Weather + VoiceAssistant + Tool + Settings + English + Story + Recorder + Music + Timer + Calculator + Calendar + Clear + Fitness + Wishing Star + QR Code + Heart Rate + Chat + AliPay + Blood Pressure + Drama + remote app + Download Remote App + + No contact, please check the network + Contacts + + Change brightness + Change volume + Classroom mode + + System upgrade + Find the new version, whether to upgrade to + Find the new version, whether to upgrade? + YES + NO + "?" + + SIM blocked + Select main menu style + Multi icon + Single icon + Sorry, the program is abnormal and will quit! + Please wait... + Mon + Tue + Wed + Thu + Fri + Sat + Sun + All + + HP + LP + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml deleted file mode 100644 index f89192b..0000000 --- a/app/src/main/res/values-es/strings.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - Health - failed to run Application ! - Reloj - Configuración - Mi familia - Mi amigo - Ahora no hay red disponible - No se pueden obtener datos, por favor espere - Clima - Hoy - Mañana - Ayer - Sin QR código - Modo de batería baja - No hay tarjeta de SIM actualmente - Paso - Paso - Caloría - Kilómetro - Registros recientes - Hoy - Objetivo - Por favor ingrese el número de pasos de meta - Valor de entrada es inválido - Altura - Peso - Centímetro - Kilo - Configuraciones personales - 0 - Paso medio - Paso total - Libra - Milla - Pulgada - Pie - Ha llegado los pasos destinados - El tema del reloj - El tema - Dialer - Persona de contacto - Teléfono - HD llamada - Mensaje - Vídeo llamada - Wechat - Micro chat - Fotografía - Álbum de fotos - Guía - Hacer amigos - Reproductor multimedia - Repuesta a todas las preguntas - El conocimiento amado - Conocimiento de enciclopedia - Enciclopedia mágica - Clima - Asistente de voz - Herramienta - Configutación - Escucha inglés - Historia - Grabadora - Música - Cronómetro - Calculadora - Calendario - Limpia la memoria - Deporte - Estrella de deseo - QR código - Frecuencia cardíaca - Presión arterial - Drama - remote app - Download Remote App - Sin persona de contacto, por favor revisa la red - Persona de contacto - Cambia el brillo - Cambia el volumen - Modo de aula - Actualización del sistema - Descubre una nueva versión, si actualiza a - ¿Descubre una nueva versión, si actualiza? - Confirmar - Cancelar - "?" - SIM blocked - Select main menu style - Multi icon - Single icon - Sorry, the program is abnormal and will quit! - Please wait... - Mon - Tue - Wed - Thu - Fri - Sat - Sun - - High Pressure - Low Pressure - 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 index 0000000..b2198e8 --- /dev/null +++ b/app/src/main/res/values-zh-rCN/dimens.xml @@ -0,0 +1,13 @@ + + + + 48dp + + 26dp + 42dp + + 26dp + 42dp + + 62sp + \ 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 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -8,4 +8,6 @@ 26dp 42dp + + 62sp \ 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 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,129 +1,128 @@ + -Watch - + 爱健康 + 应用程序启动失败 - Health - failed to run Application ! + 手表 + + 设置 + 我的家人 + 我的朋友 - Settings -My Family -My Friends -Network is not available -Get data failed, please wait -Weather forecast -Today -Tomorrow -Yesterday -No qr code -Low Power Mode -Please insert the SIM card -Steps -Steps -Cal -km -History -Today -Goal -Please enter the goal number of steps -Invalid input value -Height -Weight -cm -kg -Pedometer settings -0 -Average step -Sum step -lb -mile -inch -foot -Have Reached Target Steps - -Dial -Background -℃ -Dialer -Contacts -Call -VoLTE Call -Message -VideoCall -We chat -Chat -Camera -Photos -map -Buddy -GrindingEars -AnsweredQuestions -AiKnowledge -EncyclopediaKnowledge -MagicEncyclopedia -Weather -VoiceAssistant -Tool -Settings -English -Story -Recorder -Music -Timer -Calculator -Calendar -Clear -Fitness -Wishing Star -QR Code -Heart Rate -Chat -AliPay -Blood Pressure -Drama -remote app -Download Remote App - -No contact, please check the network -Contacts - -Change brightness -Change volume -Classroom mode - -System upgrade -Find the new version, whether to upgrade to -Find the new version, whether to upgrade? -YES -NO -"?" - -SIM blocked -Select main menu style -Multi icon -Single icon -Sorry, the program is abnormal and will quit! -Please wait... -Mon -Tue -Wed -Thu -Fri -Sat -Sun -All + 当前无可用网络 + 无法获取数据，请稍候 + 天气 + 今天 + 明天 + 昨天 -HP -LP - + 没有二维码 + 低电量模式 + 当前无 SIM 卡 + + æ­¥ + æ­¥ + 卡 + 公里 + 最近记录 + 今日 + 目标 + 请输入目标步数 + 输入值无效 + 身高 + 体重 + 厘米 + 千克 + 个人设置 + 0 + 平均步数 + 总步数 + 磅 + 英里 + 英寸 + 英尺 + 已达到目标步数 + + 时钟主题 + 菜单背景 + + 拨号 + 联系人 + 电话 + 高清通话 + 短信 + 视频通话 + 微信 + 微聊 + 照相 + 相册 + 指路 + 交友 + 磨耳朵 + 有问必答 + 爱知识 + 百科知识 + 魔法百科 + 天气 + 语音助手 + 工具 + 设置 + 听英语 + 故事 + 录音机 + 音乐 + 秒表 + 计算器 + 日历 + 清理内存 + 运动 + 许愿星 + CID + 心率 + 聊天 + 支付宝 + 血压 + 戏曲 + APP下载 + 下载手机应用 APP + + + 无联系人,请检测网络 + 联系人 + + + 更改亮度 + 更改音量 + 课堂模式 + + + 系统升级 + 发现新版本，是否升级到 + 发现新版本，是否升级？ + 确定 + 取消 + ？ + + + æ­¤ SIM 卡不支持 + 主菜单风格 + 多图标 + 单图标 + 很抱歉,程序出现异常,即将退出 + 请稍候… + 星期一 + 星期二 + 星期三 + 星期四 + 星期五 + 星期六 + 星期日 + + + 所有人 + + + 高压 + 低压 + \ No newline at end of file diff --git a/app/version_code.properties b/app/version_code.properties index 9f80442..c7ad18b 100644 --- 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