注册界面增加设置入口，优化loading view显示

common/src/main/res/layout/netoff_loading.xml

@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-<LinearLayout android:gravity="center"
-              android:orientation="vertical"
-              android:id="@+id/dialog_view"
-              android:background="#00000000"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    <RelativeLayout android:gravity="center"
-                    android:id="@+id/background"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
 
-        <ImageView
-            android:id="@+id/netoff_loading_image"
-            android:layout_width="180.0dip"
-            android:layout_height="180.0dip"
-            android:src="@drawable/loading" />
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/dialog_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="#00000000"
+        android:gravity="center"
+        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/loading_text"
-            android:layout_width="180.0dip"
-            android:layout_height="180.0dip"
-            android:padding="32dp"
-            android:gravity="center"
-            android:text="连接中"
-            android:textColor="#ffffff"
-            android:textSize="24sp" />
-    </RelativeLayout>
-</LinearLayout>
+        <RelativeLayout
+            android:id="@+id/background"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/netoff_loading_image"
+                android:layout_width="140dp"
+                android:layout_height="140dp"
+                android:src="@drawable/loading" />
+
+            <TextView
+                android:id="@+id/loading_text"
+                android:layout_width="140dp"
+                android:layout_height="140dp"
+                android:gravity="center"
+                android:padding="20dp"
+                android:text="连接中"
+                android:textColor="#ffffff"
+                android:textSize="20sp" />
+        </RelativeLayout>
+    </LinearLayout>
 </layout>

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -16,7 +16,6 @@ import android.telephony.TelephonyManager
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
-import androidx.annotation.RequiresApi
 import com.enation.javashop.net.engine.model.NetState
 import com.enation.javashop.net.engine.plugin.permission.RxPermissions
 import com.enation.javashop.utils.base.tool.CommonTool
@@ -31,23 +30,22 @@ import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.component.home.service.WdKeepAliveService
 import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig
 import com.wdkl.ncs.android.component.home.util.*
-import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.joinManager
 import com.wdkl.ncs.android.lib.utils.push
 import com.wdkl.ncs.android.lib.utils.showMessage
+import com.wdkl.ncs.android.lib.vo.MessageEvent
+import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
+import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.DeviceVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
-import com.wdkl.ncs.android.middleware.tcp.NettyClient
-import com.wdkl.ncs.android.lib.vo.MessageEvent
-import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
 import com.wdkl.ncs.android.middleware.model.vo.WatchContactVO
-import com.wdkl.ncs.android.middleware.model.vo.WatchContactsVO
+import com.wdkl.ncs.android.middleware.tcp.NettyClient
 import com.wdkl.ncs.android.middleware.tcp.TcpClientHandler
 import com.wdkl.ncs.android.middleware.utils.ContactHelper
 import com.wdkl.ncs.keepbackground.utils.SpManager
@@ -155,6 +153,10 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
         requestPermissions()
 
+        tv_system_settings.setOnClickListener {
+            val intent = Intent(Settings.ACTION_SETTINGS)
+            startActivity(intent)
+        }
     }
 
     private fun permissionGranted() {

home/src/main/res/layout/watch_activity_register.xml

@@ -11,71 +11,87 @@
         android:layout_height="match_parent">
 
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/tv_register_nonet"
-            android:visibility="gone"
-            android:text="没有网络"
-            android:textColor="@color/warn_orange"
-            android:layout_width="match_parent"
-            android:gravity="center_vertical"
-            android:layout_height="wrap_content"/>
-
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textColor="@color/grgray"
-            android:textSize="15sp"
-            android:text="服务器IP: "/>00
-    <TextView
-        android:id="@+id/tv_server_ip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:textSize="20sp"
-        android:text=""/>
-    <TextView
-        android:id="@+id/tv_mac_addr"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:textColor="@color/grgray"
-        android:textSize="15sp"
-        android:text="识别码: "/>
-    <TextView
-        android:id="@+id/tv_feedback_device_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:textSize="20sp"
-        android:text=""/>
+            android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_register_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textColor="#F07928"
-            android:textSize="15sp"/>
+            <TextView
+                android:id="@+id/tv_register_nonet"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="没有网络"
+                android:textColor="@color/warn_orange"
+                android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/tv_register_ok"
-        android:layout_width="match_parent"
-        android:layout_marginRight="30dp"
-        android:layout_marginLeft="30dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp"
-        android:layout_height="40dp"
-        android:background="#ffffff"
-        android:gravity="center"
-        android:textSize="18sp"
-        android:text="注册完成"/>
-    </LinearLayout>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="服务器IP: "
+                android:textColor="@color/grgray"
+                android:textSize="15sp" />
+
+            <TextView
+                android:id="@+id/tv_server_ip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:text=""
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/tv_mac_addr"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="识别码: "
+                android:textColor="@color/grgray"
+                android:textSize="15sp" />
+
+            <TextView
+                android:id="@+id/tv_feedback_device_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:text=""
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/tv_register_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:textColor="#F07928"
+                android:textSize="15sp" />
+
+            <TextView
+                android:id="@+id/tv_register_ok"
+                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="注册完成"
+                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="系统设置"
+                android:textSize="18sp" />
+        </LinearLayout>
     </ScrollView>
 </LinearLayout>
 </layout>