修改代码合并冲突

.idea/gradle.xml

@@ -10,7 +10,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/AmDemo_R" />
             <option value="$PROJECT_DIR$/WebRTC" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/common" />
@@ -22,8 +21,6 @@
             <option value="$PROJECT_DIR$/resource" />
             <option value="$PROJECT_DIR$/rtc-chat" />
             <option value="$PROJECT_DIR$/setting" />
-            <option value="$PROJECT_DIR$/shop" />
-            <option value="$PROJECT_DIR$/starRTC" />
             <option value="$PROJECT_DIR$/welcome" />
           </set>
         </option>

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

@@ -293,8 +293,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 //        intent.putExtra("DeviceSipId", DeviceSipId)
 //        startService(intent)
 //
-//        val intent2 = Intent(this, TcpHandleService::class.java)
-//        startService(intent2)
+        val intent2 = Intent(this, TcpHandleService::class.java)
+        startService(intent2)
 
 
         val intent3 = Intent(this, APPService::class.java)