添加 开机自动注册功能

注册页和换班页添加 进入设置功能

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

@@ -180,6 +180,9 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
     override fun userLogout() {
         sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
         Log.e(TAG,"webrtc 注册失败")
+        var intent = Intent(this,WatchRegisterActivity::class.java)
+        startActivity(intent)
+        finish()
     }
 
     private fun unRegReceiver() {
@@ -363,14 +366,14 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-//        Log.e(TAG,""+messageEvent.tag)
+        Log.e(TAG,""+messageEvent.tag)
 //        var tcpModels = messageEvent.getMessage() as TcpModel
 //        Log.e(TAG,""+tcpModels.getAction())
         if(messageEvent.tag == 14){
             //唤醒屏幕并解锁屏幕
             Util().wakeUpAndUnlock(this)
 
-        }else if(messageEvent.tag == Constants.EVENT_TCP_APP_UPDATE){
+        }else if(messageEvent.tag == 13){
             //更新APP
             checkAppVersion()
         }else if(messageEvent.tag == Constants.EVENT_SIP_REGISTER_STATUS){

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

@@ -2,12 +2,8 @@ package com.wdkl.ncs.android.component.home.activity
 
 import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.Color
 import android.os.Handler
-import android.os.Looper
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
+import android.provider.Settings
 import android.text.TextUtils
 import android.util.Log
 import android.view.KeyEvent
@@ -18,7 +14,6 @@ import com.starrtc.demo.demo.service.KeepLiveService
 import com.starrtc.demo.utils.AEvent
 import com.wdkl.ncs.android.component.home.R
 import com.wdkl.ncs.android.component.home.databinding.WatchActivityRegisterBinding
-import com.wdkl.ncs.android.component.home.databinding.WatchContactsLayBinding
 import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.component.home.service.APPService
 import com.wdkl.ncs.android.component.home.service.TcpHandleService
@@ -26,19 +21,13 @@ import com.wdkl.ncs.android.component.home.util.NetHelper
 import com.wdkl.ncs.android.component.home.util.Util
 import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.lib.base.BaseActivity
-import com.wdkl.ncs.android.lib.utils.AppTool
 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.middleware.logic.contract.home.WatchActivityContract
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchDeviceContract
-import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchActivityPresenter
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchDevicePresenter
 import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
-import com.wdkl.ncs.android.middleware.model.vo.WatchContactsVO
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
-import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import io.reactivex.Observable
 import kotlinx.android.synthetic.main.watch_activity_register.*
@@ -75,20 +64,23 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
 //            //TODO
 //        }
 
+        Constants.imei = Util().getIMEI(this)
+        Log.e(TAG, "IMEI " + Util().getIMEI(this))
+
+        Constants.mac = NetHelper.getInstance().macAddress
+        //Constants.mac = "4C:C0:0A:8E:D6:BB"
+        Log.e(TAG, "mac " + Constants.mac)
+        tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号：" + Constants.imei
+
         Thread(Runnable {
             while (isRegister) {
                 Log.e(TAG,"注册心跳")
                 runOnUiThread(Runnable {
                     presenter.loadTcpServerHost()
-                    requestPermissions()
+
                 })
-                Looper.prepare()
-//                Handler().post { Runnable {
-//                    presenter.loadTcpServerHost()
-//                    requestPermissions()
-//                } }
                 try {
-                    Thread.sleep(2000)
+                    Thread.sleep(3000)
                 } catch (e: Exception) {
                 }
             }
@@ -97,6 +89,10 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
     }
 
     override fun bindEvent() {
+        setting_tv.setOnClickListener({
+            val intent = Intent(Settings.ACTION_SETTINGS)
+            startActivity(intent)
+        })
     }
 
     override fun destory() {
@@ -110,6 +106,7 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
 
         startConnectTcpServer()
         showMessage("开始连接TCP服务器...")
+        requestPermissions()
     }
 
     private fun startConnectTcpServer() {
@@ -184,15 +181,6 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
                 Manifest.permission.RECORD_AUDIO,
                 Manifest.permission.READ_PHONE_STATE)).subscribe {
             if (it) {
-                Constants.imei = Util().getIMEI(this)
-                Log.e(TAG, "IMEI " + Util().getIMEI(this))
-
-                Constants.mac = NetHelper.getInstance().macAddress
-                //Constants.mac = "4C:C0:0A:8E:D6:BB"
-                Log.e(TAG, "mac " + Constants.mac)
-                runOnUiThread(Runnable {
-                    tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号：" + Constants.imei
-                })
 
 //                presenter.loadData(Constants.mac)//传Mac
                 presenter.loadData(Constants.imei)// 传imei
@@ -207,10 +195,16 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
     }
 
     fun toHome() {
-        AppTool.Time.delay(200) {
-            push("/watch/home")
-            finish()
-        }
+        //这个方法
+//        AppTool.Time.delay(200) {
+//            push("/watch/home")
+//            finish()
+//        }
+
+        var intent = Intent(this,WatchHomeActivity::class.java)
+        startActivity(intent)
+        finish()
+
     }
 
     override fun onError(message: String, type: Int) {

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchUserSettingActivity.java

@@ -2,9 +2,11 @@ package com.wdkl.ncs.android.component.home.activity;
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -13,6 +15,7 @@ import android.widget.Button;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import com.hp.hpl.sparta.xpath.ThisNodeTest;
 import com.wdkl.ncs.android.component.home.BuildConfig;
 import com.wdkl.ncs.android.component.home.R;
 import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig;
@@ -40,7 +43,7 @@ public class WatchUserSettingActivity extends Activity {
     private TextView countdown_time_tv;
     private SeekBar countdown_time_seekb;
     private TextView version_information_tv;
-    private TextView update_app_tv,reboot_tv;
+    private TextView update_app_tv,reboot_tv,setting_tv;
 
     private static final int WRITE_EXTERNAL_STORAGE_REQUEST_CODE = 127;//这个值是自定义的一个int值，在申请多个权限时要
 
@@ -61,7 +64,7 @@ public class WatchUserSettingActivity extends Activity {
         version_information_tv = findViewById(R.id.version_information_tv);
         update_app_tv = findViewById(R.id.update_app_tv);
         reboot_tv = findViewById(R.id.reboot_tv);
-
+        setting_tv = findViewById(R.id.setting_tv);
 
 
         tvDeviceId.setText("设备ID: " + Constants.Companion.getIds());
@@ -135,7 +138,13 @@ public class WatchUserSettingActivity extends Activity {
 
             }
         });
-
+        setting_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(Settings.ACTION_SETTINGS);
+                startActivity(intent);
+            }
+        });
 
 
     }

home/src/main/code/com/wdkl/ncs/android/component/home/helper/AppUpdateHelper.java

@@ -52,32 +52,32 @@ public class AppUpdateHelper {
 //        }
 
 
-        //if (installApp(context.getPackageName(), path)) {
-//        if (rootSilenceInstall(path)) {
-//            Log.d(TAG, "安装成功");
+//        if (installApp(context.getPackageName(), path)) {
+        if (rootSilenceInstall(path)) {
+            Log.d(TAG, "安装成功");
+            if (callBack != null) {
+                callBack.onSuccess();
+            }
+        } else {
+            Log.d(TAG, "安装失败");
+            if (callBack != null) {
+                callBack.onFailed();
+            }
+        }
+
+//        if (silentInstall(context, path)) {
+//            Log.d(TAG, "app 安装成功");
 //            if (callBack != null) {
 //                callBack.onSuccess();
 //            }
-//        } else {
-//            Log.d(TAG, "安装失败");
-//            if (callBack != null) {
-//                callBack.onFailed();
-//            }
 //        }
 
-//        if (silentInstall(context, path)) {
-//            Log.d(TAG, "app 安装成功");
+//        if (installAPP(path)) {
+//            Log.d(TAG, "安装成功");
 //            if (callBack != null) {
 //                callBack.onSuccess();
 //            }
 //        }
-
-        if (installAPP(path)) {
-            Log.d(TAG, "安装成功");
-            if (callBack != null) {
-                callBack.onSuccess();
-            }
-        }
     }
 
 

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

@@ -126,12 +126,23 @@
                 android:layout_height="40dp"
                 android:layout_marginRight="30dp"
                 android:layout_marginLeft="30dp"
-                android:layout_marginBottom="30dp"
                 android:background="#ffffff"
                 android:layout_marginTop="10dp"
                 android:gravity="center"
                 android:textSize="18px"
                 android:text="重启设备"/>
+            <TextView
+                android:id="@+id/setting_tv"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginRight="30dp"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="20dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:textSize="18px"
+                android:text="系统设置"/>
 
         </LinearLayout>
     </ScrollView>

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

@@ -6,6 +6,14 @@
     android:background="#FFBDC3"
     android:padding="10dp"
     android:orientation="vertical">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -26,5 +34,19 @@
         android:layout_marginTop="20dp"
         android:textSize="20dp"
         android:text=""/>
+    <TextView
+        android:id="@+id/setting_tv"
+        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="18px"
+        android:text="系统设置"/>
+    </LinearLayout>
+    </ScrollView>
 </LinearLayout>
 </layout>