Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

app/build.gradle

@@ -169,12 +169,14 @@ dependencies {
         //开发模式
         api project(':m-user')
         implementation modularPublication('com.ydl:m-user-api')
-//        api project(':m-tests')
+        api project(':m-tests')
         api project(':m-consultant')
         implementation modularPublication('com.ydl:m-consultant-api')
+        api project(':m-confide')
+
 //        api "com.ydl:m-consultant-api:0.0.2"
 //        api 'com.ydl:m-consultant-module-ydl:0.0.18@aar'
-//        api project(':m-confide')
+
         api (project(':ydl-platform')){
             transitive = true
         }

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -16,7 +16,7 @@ import com.umeng.analytics.MobclickAgent
 import com.ydl.component.music.MusicPlayActivity
 import com.ydl.component.mvp.DemoContract
 import com.ydl.component.mvp.DemoPresenter
-//import com.ydl.confide.home.ConfideHomeActivity
+import com.ydl.confide.home.ConfideHomeActivity
 import com.ydl.media.audio.PlayService
 import com.ydl.ydl_router.manager.YDLRouterManager
 import com.ydl.ydl_router.manager.YDLRouterParams
@@ -27,7 +27,7 @@ import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.ExpertSearchActivity.Companion.HOT_SEARCH_DOCTOR_NAME
 import com.yidianling.consultant.api.IConsultantService
 import com.yidianling.fm.api.service.IFMService
-//import com.yidianling.tests.home.TestHomeActivity
+import com.yidianling.tests.home.TestHomeActivity
 import kotlinx.android.synthetic.main.activity_main.*
 
 /**
@@ -91,10 +91,10 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
             startActivity(Intent(this, MusicPlayActivity::class.java))
         }
         bt_to_tests.setOnClickListener {
-//            startActivity(Intent(this, TestHomeActivity::class.java))
+            startActivity(Intent(this, TestHomeActivity::class.java))
         }
         bt_to_confide.setOnClickListener {
-//            startActivity(Intent(this, ConfideHomeActivity::class.java))
+            startActivity(Intent(this, ConfideHomeActivity::class.java))
         }
         bt_to_muse.setOnClickListener {
             YDLRouterManager.router(IYDLRouterConstant.ROUTER_MUSE,