修改文件

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

@@ -16,13 +16,11 @@ 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.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
-<<<<<<< HEAD
+
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
-=======
+
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
-import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
->>>>>>> 71a42c92efd855c2d6a4127d6a0cd4980eb7601d
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
@@ -50,17 +48,12 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
 
         Thread ( Runnable {
             run {
-<<<<<<< HEAD
                 TcpClient.getInstance().init("192.168.1.138", 5080, 9)
 //                TcpClient.getInstance().init("47.106.200.55", 5080, 9)
             }
         }).start()
 
-=======
-                TcpClient.getInstance().init("192.168.1.138",5080,10)
-            }
-        }).start()
->>>>>>> 71a42c92efd855c2d6a4127d6a0cd4980eb7601d
+
     }
 
     override fun bindEvent() {