Merge branch 'yz_watch_wdklwebrtc_1.0.0' of http://git.wdklian.com/allen/ncs_android_frame into yz_watch_wdklwebrtc_1.0.0

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

@@ -53,11 +53,6 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
     }
 
     override fun init() {
-//        AppTool.SystemUI.showNavigationBar(this,false)
-//        AppTool.SystemUI.ImmersiveWithBottomBarColor(this, Color.BLACK)
-
-
-
         val permissionCheck = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE)
 
         if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
@@ -67,26 +62,24 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
         }
 
         Constants.imei = Util().getIMEI(this)
-        Log.e(TAG, "IMEI " + Util().getIMEI(this))
+        Log.i(TAG, "IMEI " + Util().getIMEI(this))
 
         Constants.mac = NetHelper.getInstance().macAddress
         //Constants.mac = "4C:C0:0A:8E:D6:BB"
-        Log.e(TAG, "mac " + Constants.mac)
+        Log.i(TAG, "mac " + Constants.mac)
         tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号：" + Constants.imei
 
         Thread(Runnable {
             while (isRegister) {
-                Log.e(TAG,"注册心跳")
+                Log.i(TAG,"注册心跳")
                 runOnUiThread(Runnable {
                     presenter.loadTcpServerHost()
-
                 })
                 try {
                     Thread.sleep(3000)
                 } catch (e: Exception) {
                 }
             }
-
         }).start()
     }
 
@@ -107,24 +100,22 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
         Constants.heart_beat = tcpSeverDTO.readerIdleTime
 
         startConnectTcpServer()
-        showMessage("开始连接TCP服务器...")
+        showMessage("开始连接服务器...")
+
+        //成功获利TCP服务器信息后，请求设备信息，并跳转至HOME
         requestPermissions()
     }
 
     private fun startConnectTcpServer() {
         Thread(Runnable {
             run {
-                //TcpClient.getInstance().init("192.168.1.138", 5080, 9)
-                //TcpClient.getInstance().init("47.106.200.55", 5080, 9)
-
                 TcpClient.getInstance().init(Constants.tcp_server, Constants.tcp_port, Constants.heart_beat)
             }
         }).start()
     }
 
     override fun showData(data: DeviceVO) {
-
-        Log.e(TAG, "收到返回的设备信息 ")
+        Log.i(TAG, "收到返回的设备信息 ")
         Constants.part_id = data.partId
         Constants.ids = "" + data.id
         Constants.sip_id = data.sipId
@@ -148,25 +139,17 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
             return
         }
 
-//        initSDK("000100")
         initSDK(data.sipId)
-
-        toHome()
         showMessage("初始化完成")
+        toHome()
     }
 
     private fun initSDK(DeviceSipId: String) {
-
         val intent2 = Intent(this, TcpHandleService::class.java)
         startService(intent2)
 
-
         val intent3 = Intent(this, APPService::class.java)
         startService(intent3)
-
-
-//        val intent2 = Intent(this, RTCKeepLiveService::class.java)
-//        startService(intent2)
     }
 
     private fun requestPermissions() {
@@ -178,17 +161,12 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
                 Manifest.permission.RECORD_AUDIO,
                 Manifest.permission.READ_PHONE_STATE)).subscribe {
             if (it) {
-
-//                presenter.loadData(Constants.mac)//传Mac
                 presenter.loadData(Constants.imei)// 传imei
             } else {
                 showMessage("请重新授权，进入App")
                 requestPermissions()
             }
         }.joinManager(disposableManager)
-
-
-
     }
 
     fun toHome() {
@@ -230,9 +208,5 @@ class WatchRegisterActivity : BaseActivity<WatchDevicePresenter, WatchActivityRe
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-//        var messageEvent = messageEvent.getMessage() as TcpModel
-//        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
-//            Log.e(TAG,"收到tcp消息")
-//        }
     }
 }