Browse Source

新增适配金立手机版本,增加google tts语速设置,部分ui界面优化等

weizhengliang 6 months ago
parent
commit
c727df3681
29 changed files with 383 additions and 134 deletions
  1. 1 1
      android_mobile/build.gradle
  2. 11 20
      android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt
  3. 40 0
      android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/activity/WatchUserSettingActivity.java
  4. 7 4
      android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/adapter/WatchCallRecordsItemAdapter.kt
  5. 11 0
      android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/settingconfig/SettingConfig.java
  6. 12 10
      android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/ui/SingleCallFragment.java
  7. 15 0
      android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/util/SpeechUtil.java
  8. 4 4
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/adapter_room_item.xml
  9. 9 6
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/adapter_watch_call_records_item.xml
  10. 5 5
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/adapter_watch_contacts_item.xml
  11. 4 5
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/event_list_item.xml
  12. 3 3
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/password_dialog_lay.xml
  13. 3 3
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/server_config_dialog_lay.xml
  14. 1 1
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/spinner_item.xml
  15. 7 9
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/takeover_item.xml
  16. 76 36
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/user_setting_layout.xml
  17. 2 2
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_call_records.xml
  18. 5 5
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_home2.xml
  19. 30 16
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_register.xml
  20. 2 2
      android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_contacts_lay.xml
  21. 6 0
      app/build.gradle
  22. 96 0
      app/src/main/gionee/AndroidManifest.xml
  23. 7 0
      build.gradle
  24. 5 0
      resource/src/main/res/drawable/ic_arrow_left.xml
  25. 5 0
      resource/src/main/res/drawable/ic_arrow_right.xml
  26. 3 0
      resource/src/main/res/values-es/strings.xml
  27. 4 0
      resource/src/main/res/values-ru/strings.xml
  28. 6 2
      resource/src/main/res/values-zh/strings.xml
  29. 3 0
      resource/src/main/res/values/strings.xml

+ 1 - 1
android_mobile/build.gradle

@@ -59,7 +59,7 @@ android {
             main.java.srcDirs += 'src/main/yd_w_xiaomi_2/aidl'
             main.res.srcDirs += 'src/main/yd_w_xiaomi_2/res'
             main.manifest.srcFile 'src/main/yd_w_xiaomi_2/AndroidManifest.xml'
-        } else if ("yd_w_xiaomi_2_chile" == app_device_type) {
+        } else if ("yd_w_xiaomi_2_chile" == app_device_type || "yd_w_gionee_2_chile" == app_device_type) {
             main.java.srcDirs += 'src/main/yd_w_xiaomi_2_chile/code'
             main.java.srcDirs += 'src/main/yd_w_xiaomi_2_chile/aidl'
             main.res.srcDirs += 'src/main/yd_w_xiaomi_2_chile/res'

+ 11 - 20
android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -130,6 +130,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
         initCountDownTimer()
 
+        if (DaemonEnv.app == null && !WdKeepAliveService.instanceCreated) {
+            DaemonEnv.init(this)
+            Log.d(TAG, "开始 WdKeepAliveService")
+            DaemonEnv.startServiceSafely(this, WdKeepAliveService::class.java)
+        }
+
         if (SettingConfig.getSipEnabled(BaseApplication.appContext)) {
             linphoneManager = LinphoneManager.getInstance(BaseApplication.appContext)
             linphoneManager?.start()
@@ -278,12 +284,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         }
 
         tv_server_ip.text = CommonUtils.getUrl(BaseApplication.appContext)
-
-        /*if (DaemonEnv.app == null && !WdKeepAliveService.instanceCreated) {
-            DaemonEnv.init(this)
-            Log.d(TAG, "开始 WdKeepAliveService")
-            DaemonEnv.startServiceSafely(this, WdKeepAliveService::class.java)
-        }*/
     }
 
 
@@ -368,14 +368,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             JanusConstant.STUN_SERVER = arrayOf<String>(serverIpInfo.stunServer)
             //JanusConstant.TURN_SERVER = data.turnServer
 
-            //成功获取到数据后再启动keepService并连接tcp服务器
-            /*if (DaemonEnv.app == null && !Strings.isNullOrEmpty(Constants.tcpServer) && !WdKeepAliveService.instanceCreated) {
-                Log.d(TAG, "开始 WdKeepAliveService")
-                //保活守护进程
-                DaemonEnv.init(this)
-                DaemonEnv.startServiceSafely(this, WdKeepAliveService::class.java)
-            }*/
-
             if (serverIpInfo.sipPublicIp != null) {
                 Constants.sip_ip = serverIpInfo.sipPublicIp
             }
@@ -540,12 +532,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         Constants.deviceId = data.id
         Constants.deviceType = data.deviceType
 
-        if (DaemonEnv.app == null && !WdKeepAliveService.instanceCreated) {
-            DaemonEnv.init(this)
-            Log.d(TAG, "开始 WdKeepAliveService")
-            DaemonEnv.startServiceSafely(this, WdKeepAliveService::class.java)
-        }
-
         loadingDialog.dismiss()
         watch_activity_register_layout.visibility = View.GONE
         watch_activity_home_linyout.visibility = View.VISIBLE
@@ -778,6 +764,11 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         tv_language_settings.setOnClickListener {
             LanguageSetDialogHelper.showDialog(activity)
         }
+
+        tv_system_settings.setOnClickListener {
+            val intent = Intent(Settings.ACTION_SETTINGS)
+            startActivity(intent)
+        }
     }
 
     override fun enableHeadsetVoiceMsg(): Boolean {

+ 40 - 0
android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/activity/WatchUserSettingActivity.java

@@ -9,6 +9,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Spinner;
@@ -54,6 +55,10 @@ public class WatchUserSettingActivity extends Activity {
     private RadioGroup callExDoorway;
     private RadioButton callExOn, callExOff;
 
+    private TextView tvTtsRate;
+    private ImageView ttsRateDecrease, ttsRateIncrease;
+    private int ttsRate;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         //切换语言
@@ -102,6 +107,41 @@ public class WatchUserSettingActivity extends Activity {
         TextView tvVoiceMode = findViewById(R.id.tv_voice_type);
         tvVoiceMode.setText(Constants.Companion.getVoice_type());
 
+        ttsRate = SettingConfig.getTtsSpeechRate(BaseApplication.appContext);
+        tvTtsRate = findViewById(R.id.tv_speech_rate_value);
+        tvTtsRate.setText("" + ttsRate);
+        ttsRateIncrease = findViewById(R.id.speech_rate_increase);
+        ttsRateDecrease = findViewById(R.id.speech_rate_decrease);
+        ttsRateIncrease.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (ttsRate < 10) {
+                    ttsRate++;
+                } else {
+                    ttsRate = 10;
+                }
+                tvTtsRate.setText("" + ttsRate);
+                SettingConfig.setTtsSpeechRate(BaseApplication.appContext, ttsRate);
+            }
+        });
+        ttsRateDecrease.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (ttsRate > 1) {
+                    ttsRate--;
+                } else {
+                    ttsRate = 1;
+                }
+                tvTtsRate.setText("" + ttsRate);
+                SettingConfig.setTtsSpeechRate(BaseApplication.appContext, ttsRate);
+            }
+        });
+
+        if ("com.google.android.tts".equalsIgnoreCase(SpeechUtil.getInstance().getSpeechEngine())) {
+            findViewById(R.id.ll_speech_rate).setVisibility(View.VISIBLE);
+            findViewById(R.id.tv_speech_rate).setVisibility(View.VISIBLE);
+        }
+
         if (SettingConfig.getVoiceCallType(BaseApplication.appContext) == SettingConfig.PHONE_CALL) {
             callYes.setChecked(true);
         } else {

+ 7 - 4
android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/adapter/WatchCallRecordsItemAdapter.kt

@@ -11,6 +11,7 @@ import com.wdkl.ncs.android.component.home.databinding.AdapterWatchCallRecordsIt
 import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.component.home.util.TimeTransition
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
+import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
@@ -73,15 +74,17 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
             binding.callStatusImagev.visibility = View.INVISIBLE
 
             if (!TextUtils.isEmpty(itemData.fromMemberName)) {
-                binding.sickbedTv.text = "From: " + itemData.fromFrameFullName + " " + itemData.fromMemberName
+                val fromName = itemData.fromFrameFullName + " " + itemData.fromMemberName
+                binding.sickbedTv.text = BaseApplication.appContext.getString(R.string.record_from, fromName)
             } else {
-                binding.sickbedTv.text = "From: " + itemData.fromFrameFullName
+                binding.sickbedTv.text = BaseApplication.appContext.getString(R.string.record_from, itemData.fromFrameFullName)
             }
 
             if (!TextUtils.isEmpty(itemData.toMemberName)) {
-                binding.nameTv.text = "To: " + itemData.toFrameFullName + " " + itemData.toMemberName
+                val toName = itemData.toFrameFullName + " " + itemData.toMemberName
+                binding.nameTv.text = BaseApplication.appContext.getString(R.string.record_to, toName)
             } else {
-                binding.nameTv.text = "To: " + itemData.toFrameFullName
+                binding.nameTv.text = BaseApplication.appContext.getString(R.string.record_to, itemData.toFrameFullName)
             }
 
             if (itemData.actionType == TcpType.EVENT.name) {

+ 11 - 0
android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/settingconfig/SettingConfig.java

@@ -36,6 +36,8 @@ public class SettingConfig {
 
     private static final String KEY_SP_CALL_EX_DOORWAY = "KEY_SP_CALL_EX_DOORWAY";
 
+    private static final String KEY_TTS_SPEECH_RATE = "KEY_TTS_SPEECH_RATE";
+
     public static int getLanguageId(Context context) {
         //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
         return getSP(context).getInt(KEY_LANGUAGE_ID, 3);
@@ -77,6 +79,15 @@ public class SettingConfig {
         getEditor(context).putBoolean(KEY_SP_CALL_EX_DOORWAY, enable).apply();
     }
 
+    public static int getTtsSpeechRate(Context context) {
+        return getSP(context).getInt(KEY_TTS_SPEECH_RATE, 8);
+    }
+
+    public static void setTtsSpeechRate(Context context, int rate) {
+        getEditor(context).putInt(KEY_TTS_SPEECH_RATE, rate).apply();
+    }
+
+
     /**
      * 获取转发时间
      *

+ 12 - 10
android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/ui/SingleCallFragment.java

@@ -447,6 +447,18 @@ public abstract class SingleCallFragment extends Fragment {
 
             TcpModel tcpModel = (TcpModel) messageEvent.getMessage();
             Log.i(TAG, "收到数据222: " + tcpModel.toJson());
+            if (tcpModel.getAction() == TcpAction.VoiceAction.FAILED) {
+                handler.sendEmptyMessageDelayed(FINISH_CURRENT, 1000);
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(SingleCallFragment.this.getContext(), R.string.call_failed, Toast.LENGTH_SHORT).show();
+                    }
+                });
+
+                return;
+            }
+
             int curInteractionId = -1;
             if (tcpModel.getData() != null) {
                 InteractionVO interactionVO = new Gson().fromJson(tcpModel.getData().toString(), InteractionVO.class);
@@ -496,16 +508,6 @@ public abstract class SingleCallFragment extends Fragment {
                         }
                     });
                 }
-            } else if (tcpModel.getAction() == TcpAction.VoiceAction.FAILED) {
-                //if (curInteractionId == interactionId) {
-                    handler.sendEmptyMessageDelayed(FINISH_CURRENT, 1000);
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast.makeText(SingleCallFragment.this.getContext(), R.string.call_failed, Toast.LENGTH_SHORT).show();
-                        }
-                    });
-                //}
             } else if (tcpModel.getAction() == TcpAction.VoiceAction.CANCEL || tcpModel.getAction() == TcpAction.VoiceAction.VOICE_OFF) {
                 if (curInteractionId == Constants.Companion.getInteractionId()) {
                     handler.sendEmptyMessageDelayed(FINISH_CURRENT, 100);

+ 15 - 0
android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/util/SpeechUtil.java

@@ -10,6 +10,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 
+import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig;
 import com.wdkl.ncs.android.middleware.common.Constants;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.middleware.tcp.enums.CommunicationEnum;
@@ -145,6 +146,14 @@ public class SpeechUtil {
         SpeechUtil.getInstance().init(BaseApplication.appContext, speechCallback);
     }
 
+    public String getSpeechEngine() {
+        if (textToSpeech != null) {
+            return textToSpeech.getDefaultEngine();
+        }
+
+        return "";
+    }
+
     public void newSpeech(String text, boolean emergency) {
         synchronized (lockObject) {
             if (Constants.Companion.getTtsState() == 2) {
@@ -164,6 +173,12 @@ public class SpeechUtil {
                 return;
             }
 
+            if ("com.google.android.tts".equalsIgnoreCase(textToSpeech.getDefaultEngine())) {
+                float rate = (float) SettingConfig.getTtsSpeechRate(BaseApplication.appContext)/10;
+                textToSpeech.setSpeechRate(rate);
+                Log.e(TAG, "set speech rate: " + rate);
+            }
+
             params.putInt(TextToSpeech.Engine.KEY_PARAM_STREAM, AudioManager.STREAM_MUSIC);
             int speakStatus = textToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, params, "uniqueId");
             Log.d(TAG, "startSpeak status: " + speakStatus + ", text: " + text);

+ 4 - 4
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/adapter_room_item.xml

@@ -4,7 +4,7 @@
     <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="68dp"
         android:layout_marginBottom="1dp"
         android:background="#FFFFFF">
 
@@ -26,15 +26,15 @@
 
             <Button
                 android:id="@+id/btn_call_out"
-                android:layout_width="50dp"
-                android:layout_height="22dp"
+                android:layout_width="56dp"
+                android:layout_height="24dp"
                 android:layout_marginRight="10dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:textColor="@color/grgray"
                 android:background="@drawable/javashop_btn_balck_line_bg"
                 android:text="@string/str_call"
-                android:textSize="12sp"
+                android:textSize="10sp"
                 android:singleLine="true"/>
 
         </RelativeLayout>

+ 9 - 6
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/adapter_watch_call_records_item.xml

@@ -3,7 +3,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
         android:background="@drawable/item_selector"
         android:layout_marginTop="2dp">
 
@@ -26,8 +26,8 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="9dp"
+            android:layout_marginEnd="8dp"
+            android:gravity="center_vertical"
             android:layout_toEndOf="@+id/tab_linyout">
 
             <RelativeLayout
@@ -40,7 +40,8 @@
                     android:id="@+id/sickbed_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="14sp" />
+                    android:textSize="12sp"
+                    android:textColor="#07689f" />
 
                 <TextView
                     android:id="@+id/call_time_tv"
@@ -64,7 +65,8 @@
                     android:id="@+id/name_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="14sp" />
+                    android:textSize="12sp"
+                    android:textColor="#11999e" />
 
                 <LinearLayout
                     android:id="@+id/incident_linlyou"
@@ -83,7 +85,7 @@
                     <TextView
                         android:id="@+id/project_tv"
                         android:layout_width="wrap_content"
-                        android:layout_height="20dp"
+                        android:layout_height="22dp"
                         android:paddingLeft="5dp"
                         android:paddingRight="5dp"
                         android:gravity="center"
@@ -106,6 +108,7 @@
                 android:layout_below="@+id/nursing_project_relalyout"
                 android:layout_alignParentEnd="true"
                 android:layout_marginTop="4dp"
+                android:layout_marginStart="6dp"
                 android:orientation="horizontal">
 
                 <TextView

+ 5 - 5
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/adapter_watch_contacts_item.xml

@@ -4,7 +4,7 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/item_relayout"
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="68dp"
         android:layout_marginBottom="1dp"
         android:background="@drawable/item_selector">
 
@@ -29,7 +29,7 @@
                 android:layout_marginTop="4dp"
                 android:text="--"
                 android:textColor="#F78B8F"
-                android:textSize="16sp" />
+                android:textSize="14sp" />
         </LinearLayout>
 
         <ImageView
@@ -44,8 +44,8 @@
 
         <Button
             android:id="@+id/awci_btn_call_out"
-            android:layout_width="50dp"
-            android:layout_height="22dp"
+            android:layout_width="56dp"
+            android:layout_height="24dp"
             android:layout_marginRight="10dp"
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@+id/right_arrow"
@@ -53,7 +53,7 @@
             android:singleLine="true"
             android:text="@string/str_call"
             android:textColor="@color/grgray"
-            android:textSize="12sp" />
+            android:textSize="10sp" />
 
         <ImageView
             android:id="@+id/right_arrow"

+ 4 - 5
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/event_list_item.xml

@@ -57,11 +57,11 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:orientation="horizontal"
                 android:layout_marginEnd="10dp"
-                android:gravity="right"
+                android:gravity="end"
                 android:layout_weight="1">
 
                 <TextView
@@ -71,7 +71,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:textColor="@color/warn_orange"
-                    android:textSize="20sp"/>
+                    android:textSize="16sp"/>
 
             </LinearLayout>
 
@@ -88,8 +88,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:layout_marginEnd="5dp"
-                android:gravity="end"
-                android:layout_weight="1">
+                android:gravity="end">
 
                 <ImageView
                     android:visibility="gone"

+ 3 - 3
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/password_dialog_lay.xml

@@ -40,7 +40,7 @@
             android:padding="4dp"
             android:text="@string/str_delete"
             android:textColor="@color/main_color"
-            android:textSize="16sp" />
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/btn_cancel"
@@ -51,7 +51,7 @@
             android:padding="4dp"
             android:text="@string/str_cancel"
             android:textColor="@color/main_color"
-            android:textSize="16sp" />
+            android:textSize="14sp" />
 
         <TextView
             android:id="@+id/btn_confirm"
@@ -62,7 +62,7 @@
             android:padding="4dp"
             android:text="@string/str_confirm"
             android:textColor="@color/main_color"
-            android:textSize="16sp" />
+            android:textSize="14sp" />
     </LinearLayout>
 
 </LinearLayout>

+ 3 - 3
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/server_config_dialog_lay.xml

@@ -43,7 +43,7 @@
                 android:padding="4dp"
                 android:gravity="center_horizontal"
                 android:text="@string/str_delete"
-                android:textSize="16sp"
+                android:textSize="14sp"
                 android:textColor="@color/main_color"/>
 
             <TextView
@@ -54,7 +54,7 @@
                 android:padding="4dp"
                 android:gravity="center_horizontal"
                 android:text="@string/str_cancel"
-                android:textSize="16sp"
+                android:textSize="14sp"
                 android:textColor="@color/main_color"/>
             <TextView
                 android:id="@+id/btn_confirm"
@@ -64,7 +64,7 @@
                 android:padding="4dp"
                 android:gravity="center_horizontal"
                 android:text="@string/str_confirm"
-                android:textSize="16sp"
+                android:textSize="14sp"
                 android:textColor="@color/main_color"/>
         </LinearLayout>
     </LinearLayout>

+ 1 - 1
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/spinner_item.xml

@@ -6,4 +6,4 @@
     android:gravity="center"
     android:ellipsize="marquee"
     android:textAlignment="inherit"
-    android:textSize="16sp"/>
+    android:textSize="14sp"/>

+ 7 - 9
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/takeover_item.xml

@@ -17,7 +17,6 @@
                 android:id="@+id/clerk_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
                 android:textColor="#F78B8F"
                 android:textSize="16sp" />
@@ -27,7 +26,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="@string/str_empty"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -36,7 +34,7 @@
             android:layout_height="match_parent"
             android:layout_marginRight="10dp"
             android:layout_weight="1"
-            android:gravity="right|center_vertical">
+            android:gravity="end|center_vertical">
 
             <ImageView
                 android:id="@+id/ti_voice_recorder"
@@ -48,23 +46,23 @@
 
             <Button
                 android:id="@id/btn_user_change"
-                android:layout_width="54dp"
-                android:layout_height="22dp"
+                android:layout_width="56dp"
+                android:layout_height="24dp"
                 android:background="@drawable/javashop_btn_balck_line_bg"
                 android:text="@string/str_replace"
                 android:textColor="@color/grgray"
-                android:textSize="12sp"
+                android:textSize="10sp"
                 android:singleLine="true"/>
 
             <Button
                 android:id="@+id/btn_call_out"
-                android:layout_width="54dp"
-                android:layout_height="22dp"
+                android:layout_width="56dp"
+                android:layout_height="24dp"
                 android:layout_marginLeft="5dp"
                 android:background="@drawable/javashop_btn_balck_line_bg"
                 android:text="@string/str_call"
                 android:textColor="@color/grgray"
-                android:textSize="12sp"
+                android:textSize="10sp"
                 android:singleLine="true"/>
 
         </LinearLayout>

+ 76 - 36
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/user_setting_layout.xml

@@ -37,7 +37,7 @@
                     android:orientation="horizontal">
                     <TextView
                         android:text="@string/version_title"
-                        android:textSize="14sp"
+                        android:textSize="12sp"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
@@ -45,10 +45,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right">
+                        android:gravity="end">
                         <TextView
                             android:id="@+id/tv_app_version"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
@@ -60,7 +60,7 @@
                     android:orientation="horizontal">
                     <TextView
                         android:text="@string/device_id"
-                        android:textSize="14sp"
+                        android:textSize="12sp"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
@@ -68,10 +68,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right">
+                        android:gravity="end">
                         <TextView
                             android:id="@+id/tv_device_id"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             android:textColor="@color/javashop_color_searcher_tv_gray"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
@@ -84,7 +84,7 @@
                     android:orientation="horizontal">
                     <TextView
                         android:text="@string/device_identifier"
-                        android:textSize="14sp"
+                        android:textSize="12sp"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
@@ -92,10 +92,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right">
+                        android:gravity="end">
                         <TextView
                             android:id="@+id/tv_device_imei"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             android:textColor="@color/javashop_color_searcher_tv_gray"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
@@ -108,7 +108,7 @@
                     android:orientation="horizontal">
                     <TextView
                         android:text="@string/server_title"
-                        android:textSize="14sp"
+                        android:textSize="12sp"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
@@ -116,10 +116,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right">
+                        android:gravity="end">
                         <TextView
                             android:id="@+id/tv_server_ip"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             android:textColor="@color/javashop_color_searcher_tv_gray"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
@@ -132,7 +132,7 @@
                     android:orientation="horizontal">
                     <TextView
                         android:text="@string/device_ip"
-                        android:textSize="14sp"
+                        android:textSize="12sp"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
@@ -140,10 +140,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right">
+                        android:gravity="end">
                         <TextView
                             android:id="@+id/tv_device_ip"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             android:textColor="@color/javashop_color_searcher_tv_gray"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
@@ -161,16 +161,16 @@
                         android:layout_height="wrap_content"
                         android:text="@string/tts_state"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
-                        android:textSize="14sp" />
+                        android:textSize="12sp" />
 
                     <TextView
                         android:id="@+id/tv_tts_status"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right"
+                        android:gravity="end"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
-                        android:textSize="14sp" />
+                        android:textSize="12sp" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -183,16 +183,16 @@
                         android:layout_height="wrap_content"
                         android:text="@string/call_type"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
-                        android:textSize="14sp" />
+                        android:textSize="12sp" />
 
                     <TextView
                         android:id="@+id/tv_phone_type"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right"
+                        android:gravity="end"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
-                        android:textSize="14sp" />
+                        android:textSize="12sp" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -205,16 +205,16 @@
                         android:layout_height="wrap_content"
                         android:text="@string/voice_type"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
-                        android:textSize="14sp" />
+                        android:textSize="12sp" />
 
                     <TextView
                         android:id="@+id/tv_voice_type"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right"
+                        android:gravity="end"
                         android:textColor="@color/javashop_color_searcher_tv_gray"
-                        android:textSize="14sp" />
+                        android:textSize="12sp" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -240,7 +240,7 @@
                     android:layout_gravity="center_horizontal"
                     android:background="@drawable/javashop_btn_balck_line_bg"
                     android:text="@string/str_user_change"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
 
                 <Button
                     android:id="@+id/btn_app_restart"
@@ -251,7 +251,7 @@
                     android:layout_toRightOf="@id/view_center_base"
                     android:background="@drawable/javashop_btn_balck_line_bg"
                     android:text="@string/register_restart"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
 
                 <Button
                     android:id="@+id/btn_check_update"
@@ -264,7 +264,7 @@
                     android:layout_below="@id/btn_user_change"
                     android:background="@drawable/javashop_btn_balck_line_bg"
                     android:text="@string/check_update"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
 
                 <Button
                     android:id="@+id/btn_system_setting"
@@ -277,7 +277,7 @@
                     android:layout_toRightOf="@id/view_center_base"
                     android:background="@drawable/javashop_btn_balck_line_bg"
                     android:text="@string/str_system_settings"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
 
                 <Button
                     android:id="@+id/btn_update_contact"
@@ -290,7 +290,7 @@
                     android:layout_below="@id/btn_system_setting"
                     android:background="@drawable/javashop_btn_balck_line_bg"
                     android:text="@string/contatc_update_title"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
 
                 <Button
                     android:id="@+id/btn_phone_number"
@@ -303,7 +303,7 @@
                     android:layout_toRightOf="@id/view_center_base"
                     android:background="@drawable/javashop_btn_balck_line_bg"
                     android:text="@string/phone_number_title"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/tv_call_title"
@@ -345,7 +345,7 @@
                     android:layout_below="@id/btn_update_contact"
                     android:layout_marginTop="16dp"
                     android:text="@string/str_call_transfer_title"
-                    android:textSize="16sp" />
+                    android:textSize="14sp" />
 
                 <RadioGroup
                     android:id="@+id/group_call_transfer"
@@ -374,7 +374,7 @@
                     android:layout_below="@id/group_call_transfer"
                     android:layout_marginTop="16dp"
                     android:text="@string/setting_call_ex_doorway"
-                    android:textSize="16sp" />
+                    android:textSize="14sp" />
 
                 <RadioGroup
                     android:id="@+id/group_call_ex_doorway"
@@ -403,7 +403,7 @@
                     android:layout_below="@id/group_call_ex_doorway"
                     android:layout_marginTop="16dp"
                     android:text="@string/media_button_message"
-                    android:textSize="16sp"
+                    android:textSize="14sp"
                     android:visibility="gone"/>
 
                 <RadioGroup
@@ -428,13 +428,53 @@
                 </RadioGroup>
 
                 <TextView
-                    android:id="@+id/tv_language_title"
+                    android:id="@+id/tv_speech_rate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/group_im_channel"
                     android:layout_marginTop="10dp"
+                    android:text="@string/speech_rate_text"
+                    android:textSize="14sp"
+                    android:visibility="gone"/>
+
+                <LinearLayout
+                    android:id="@+id/ll_speech_rate"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tv_speech_rate"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:visibility="gone">
+                    <ImageView
+                        android:id="@+id/speech_rate_decrease"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:src="@drawable/ic_arrow_left"/>
+                    <TextView
+                        android:id="@+id/tv_speech_rate_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="10dp"
+                        android:text="8"
+                        android:textSize="16sp" />
+                    <ImageView
+                        android:id="@+id/speech_rate_increase"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:src="@drawable/ic_arrow_right"/>
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tv_language_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/ll_speech_rate"
+                    android:layout_marginTop="10dp"
                     android:text="@string/language_set_mode"
-                    android:textSize="16sp" />
+                    android:textSize="14sp" />
 
                 <RadioGroup
                     android:id="@+id/group_language_mode"
@@ -467,7 +507,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/language_set_title"
-                        android:textSize="16sp" />
+                        android:textSize="14sp" />
 
                     <Spinner
                         android:id="@+id/spinner_language_select"

+ 2 - 2
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_call_records.xml

@@ -10,8 +10,8 @@
             android:id="@+id/refresh"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="6px"
-            android:layout_marginRight="6px"
+            android:layout_marginLeft="6dp"
+            android:layout_marginRight="6dp"
             bind:srlEnableLoadMore="true"
             bind:srlEnableRefresh="true">
 

+ 5 - 5
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_home2.xml

@@ -44,7 +44,7 @@
                         android:layout_marginTop="10dp"
                         android:text="@string/custom_title"
                         android:textColor="#ffffff"
-                        android:textSize="16dp" />
+                        android:textSize="16sp" />
 
                 </LinearLayout>
 
@@ -70,7 +70,7 @@
                         android:layout_marginTop="10dp"
                         android:text="@string/call_list"
                         android:textColor="#ffffff"
-                        android:textSize="16dp" />
+                        android:textSize="16sp" />
 
                 </LinearLayout>
 
@@ -156,7 +156,7 @@
                             android:paddingStart="5dp"
                             android:paddingEnd="5dp"
                             android:textColor="#ffffff"
-                            android:textSize="16sp"
+                            android:textSize="14sp"
                             android:singleLine="true"
                             android:ellipsize="marquee"
                             android:focusable="true"
@@ -168,7 +168,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
                             android:textColor="#ffffff"
-                            android:textSize="16sp"
+                            android:textSize="14sp"
                             android:visibility="gone"/>
 
                         <TextView
@@ -177,7 +177,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
                             android:textColor="#ffffff"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             android:visibility="gone"/>
                     </LinearLayout>
                 </RelativeLayout>

+ 30 - 16
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_register.xml

@@ -60,54 +60,68 @@
             <TextView
                 android:id="@+id/tv_register_ok"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
                 android:layout_marginLeft="30dp"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginRight="30dp"
-                android:layout_marginBottom="20dp"
                 android:background="#ffffff"
                 android:gravity="center"
                 android:text="@string/register_done"
-                android:textSize="18sp" />
+                android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/tv_restart_app"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
                 android:layout_marginLeft="30dp"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginRight="30dp"
-                android:layout_marginBottom="20dp"
                 android:background="#ffffff"
                 android:gravity="center"
                 android:text="@string/register_restart"
-                android:textSize="18sp" />
+                android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/tv_config_server"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
                 android:layout_marginLeft="30dp"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginRight="30dp"
-                android:layout_marginBottom="20dp"
                 android:background="#ffffff"
                 android:gravity="center"
                 android:text="@string/register_config_server"
-                android:textSize="18sp" />
+                android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/tv_language_settings"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
                 android:layout_marginLeft="30dp"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginRight="30dp"
-                android:layout_marginBottom="20dp"
                 android:background="#ffffff"
                 android:gravity="center"
                 android:text="@string/str_language_settings"
-                android:textSize="18sp" />
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_system_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginRight="30dp"
+                android:layout_marginBottom="20dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:text="@string/str_system_settings"
+                android:textSize="14sp" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>

+ 2 - 2
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_contacts_lay.xml

@@ -24,7 +24,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="@string/str_bed"
-                android:textSize="20sp"/>
+                android:textSize="18sp"/>
 
             <RadioButton
                 android:id="@+id/rb_tab_room"
@@ -37,7 +37,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="@string/str_room"
-                android:textSize="20sp"/>
+                android:textSize="18sp"/>
         </RadioGroup>
 
         <TextView

+ 6 - 0
app/build.gradle

@@ -45,6 +45,12 @@ android {
     }
     sourceSets {
         main.java.srcDirs += 'src/main/code'
+
+        if ("yd_w_gionee_2_chile" == app_device_type) {
+            main.manifest.srcFile 'src/main/gionee/AndroidManifest.xml'
+        } else {
+            main.manifest.srcFile 'src/main/AndroidManifest.xml'
+        }
     }
     lintOptions{
         checkReleaseBuilds false

+ 96 - 0
app/src/main/gionee/AndroidManifest.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.wdkl.app.ncs">
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
+
+    <!--  亮屏和解锁权限   -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+
+    <!-- Needed for full screen intent in incoming call notifications -->
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_nurse_launch"
+        android:label="@string/wdkl_app_name"
+        android:supportsRtl="true"
+        tools:replace="android:label"
+        android:requestLegacyExternalStorage="true"
+        android:name="com.wdkl.app.ncs.application.Application"
+        android:theme="@style/MyAppTheme">
+        <meta-data
+            android:name="com.enation.javashop.imagepluin.cache.MyGlideModule"
+            android:value="GlideModule" />
+        <meta-data
+            android:name="design_width_in_dp"
+            android:value="280"/>
+        <meta-data
+            android:name="design_height_in_dp"
+            android:value="320"/>
+
+<!--        <activity android:name="com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity"-->
+<!--            >-->
+<!--        <activity android:name="com.wdkl.ncs.android.component.home.activity.WatchRegisterActivity">-->
+<!--        <activity android:name="com.starrtc.demo.demo.SplashActivity">-->
+        <activity android:name="com.wdkl.ncs.android.component.home.activity.WatchHome2Activity"
+            android:showOnLockScreen="true"
+            android:showWhenLocked="true"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait"
+            android:configChanges="keyboardHidden|orientation|screenSize|navigation|keyboard">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+                <!-- 设置成主题界面 -->
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <receiver
+            android:name="com.wdkl.ncs.android.component.home.service.WdBootReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter android:priority="1000">
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
+
+        <!--sip call-->
+        <activity android:name="com.wdkl.ncs.host.activity.SipTestActivity" />
+        <activity android:name="com.wdkl.ncs.host.activity.CallActivity" />
+
+        <service
+            android:name="com.wdkl.ncs.host.sip.core.LinCoreService"
+            android:foregroundServiceType="phoneCall|camera|microphone"
+            android:label="@string/app_name"
+            android:stopWithTask="false" />
+
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="2.2" />
+        <meta-data android:name="android.app.background_running" android:value="true"/>
+    </application>
+
+</manifest>

+ 7 - 0
build.gradle

@@ -70,6 +70,13 @@ buildscript {
         //小米手机版本
         ext.app_version_code = 161
         ext.app_version = "1.4.12_rm"
+    } else if (app_device_type == "yd_w_gionee_2_chile") {
+        ext.build_tools_version = "30.0.2"
+        ext.support_library_version = "28.0.0"
+
+        //金立手机
+        ext.app_version_code = 165
+        ext.app_version = "1.4.15_gn"
     } else if (app_device_type == "yd_watch_2") {
         ext.build_tools_version = "26.0.2"
         ext.support_library_version = "26.1.0"

+ 5 - 0
resource/src/main/res/drawable/ic_arrow_left.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#241B1B"
+    android:viewportHeight="20" android:viewportWidth="20"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
+</vector>

+ 5 - 0
resource/src/main/res/drawable/ic_arrow_right.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#241B1B"
+    android:viewportHeight="20" android:viewportWidth="20"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
+</vector>

+ 3 - 0
resource/src/main/res/values-es/strings.xml

@@ -209,6 +209,7 @@
     <string name="language_set_title">Selección de idioma:</string>
     <string name="language_set_mode">Sincronizar idioma del servidor:</string>
     <string name="str_language_settings">Seleccionar idioma</string>
+    <string name="speech_rate_text">TTS rate:</string>
 
     <string name="contact_start_load">Comenzar carga de contacto</string>
     <string name="contact_start_update">Comenzar actualización, por favor, espere.</string>
@@ -240,4 +241,6 @@
 
     <string name="network_connect">Conectado</string>
     <string name="network_disconnect">Desconectado</string>
+    <string name="record_from">From: %s</string>
+    <string name="record_to">To: %s</string>
 </resources>

+ 4 - 0
resource/src/main/res/values-ru/strings.xml

@@ -196,6 +196,8 @@
     <string name="language_set_title">Набор языков:</string>
     <string name="language_set_mode">Синхронизировать язык с сервера:</string>
     <string name="str_language_settings">Языковые настройки</string>
+    <string name="speech_rate_text">TTS rate:</string>
+
     <string name="str_call_transfer_title">Call transfer:</string>
     <string name="setting_call_ex_doorway">Call extend doorway:</string>
 
@@ -229,4 +231,6 @@
 
     <string name="network_connect">Connected</string>
     <string name="network_disconnect">Disconnect</string>
+    <string name="record_from">From: %s</string>
+    <string name="record_to">To: %s</string>
 </resources>

+ 6 - 2
resource/src/main/res/values-zh/strings.xml

@@ -86,8 +86,8 @@
     <string name="call_error">通话错误</string>
     <string name="call_reject">对方拒绝</string>
     <string name="call_busy">对方忙线中</string>
-    <string name="call_incoming">来电.</string>
-    <string name="call_failed">对方离线或不存在,呼叫失败</string>
+    <string name="call_incoming">来电</string>
+    <string name="call_failed">呼叫失败</string>
     <string name="call_end">通话结束</string>
     <string name="str_call_accept">接听</string>
     <string name="str_call_transfer">转接</string>
@@ -209,6 +209,8 @@
     <string name="language_set_title">语言设置:</string>
     <string name="language_set_mode">是否同步服务器语言:</string>
     <string name="str_language_settings">语言设置</string>
+    <string name="speech_rate_text">TTS 语速:</string>
+
     <string name="speech_sample_text">这是一个文字转语音示例</string>
 
     <string name="contatc_update_title">更新通讯录</string>
@@ -240,4 +242,6 @@
 
     <string name="network_connect">网络正常</string>
     <string name="network_disconnect">网络断开</string>
+    <string name="record_from">来自: %s</string>
+    <string name="record_to">发给: %s</string>
 </resources>

+ 3 - 0
resource/src/main/res/values/strings.xml

@@ -209,6 +209,7 @@
     <string name="language_set_title">Language set:</string>
     <string name="language_set_mode">Sync language from server:</string>
     <string name="str_language_settings">Language set</string>
+    <string name="speech_rate_text">TTS rate:</string>
 
     <string name="contact_start_load">Start load contact</string>
     <string name="contact_start_update">Start update, wait a moment.</string>
@@ -240,4 +241,6 @@
 
     <string name="network_connect">Connected</string>
     <string name="network_disconnect">Disconnect</string>
+    <string name="record_from">From: %s</string>
+    <string name="record_to">To: %s</string>
 </resources>