Jelajahi Sumber

手机版本主机界面增加系统设置按钮

weizhengliang 7 bulan lalu
induk
melakukan
3e394c1c79

+ 5 - 2
android_mobile/src/main/yd_w_xiaomi_2/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -47,7 +47,6 @@ import com.wdkl.ncs.android.middleware.tcp.TcpClientHandler
 import com.wdkl.ncs.android.middleware.tcp.enums.CommunicationEnum
 import com.wdkl.ncs.android.middleware.tcp.enums.RoleTypeEnum
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
-import com.wdkl.ncs.android.middleware.utils.ContactHelper
 import com.wdkl.ncs.host.activity.CallActivity
 import com.wdkl.ncs.host.sip.callback.PhoneCallback
 import com.wdkl.ncs.host.sip.core.LinphoneManager
@@ -64,7 +63,6 @@ import org.linphone.core.Call
 import org.linphone.core.TransportType
 import java.io.File
 import java.util.*
-import kotlin.collections.ArrayList
 
 
 //@Router(path = "/watch/home")
@@ -800,6 +798,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 {

+ 2 - 2
android_mobile/src/main/yd_w_xiaomi_2/code/com/wdkl/ncs/android/component/home/ui/FragmentAudio.java

@@ -179,8 +179,8 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
                         frameName = getShowName();
                     }
 
-                    String text = frameName + getString(R.string.call_incoming) + "/" + frameName + getString(R.string.call_incoming) + "/"
-                            + frameName + getString(R.string.call_incoming) + "/" + frameName + getString(R.string.call_incoming);
+                    String text = frameName + getString(R.string.call_incoming) + frameName + getString(R.string.call_incoming)
+                            + frameName + getString(R.string.call_incoming) + frameName + getString(R.string.call_incoming);
                     SpeechUtil.getInstance().startSpeak(text);
                 }
             }

+ 13 - 0
android_mobile/src/main/yd_w_xiaomi_2/res/layout/watch_activity_register.xml

@@ -108,6 +108,19 @@
                 android:gravity="center"
                 android:text="@string/str_language_settings"
                 android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/tv_system_settings"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="30dp"
+                android:layout_marginBottom="20dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:text="@string/str_system_settings"
+                android:textSize="18sp" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>

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

@@ -689,6 +689,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 {

+ 13 - 0
android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_register.xml

@@ -108,6 +108,19 @@
                 android:gravity="center"
                 android:text="@string/str_language_settings"
                 android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/tv_system_settings"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="30dp"
+                android:layout_marginBottom="20dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:text="@string/str_system_settings"
+                android:textSize="18sp" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>