backup

config.gradle

@@ -48,24 +48,24 @@ ext {
             "m-user"          : "0.0.56",
             "m-home"          : "0.0.20",
             "m-im"            : "0.0.11",
-            "m-dynamic"       : "0.0.5.8",
+            "m-dynamic"       : "0.0.5.9",
 
             "m-muse"          : "0.0.26",
-            "m-tests"         : "0.0.21",
-            "m-course"        : "0.0.40.1",
+            "m-tests"         : "0.0.22.1",
+            "m-course"        : "0.0.40.2",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
             "m-confide-api"   : "0.0.1.1",
             "m-consultant-api": "0.0.4",
-            "m-course-api"    : "0.0.2",
+            "m-course-api"    : "0.0.3",
             "m-fm-api"        : "0.0.2",
             "m-muse-api"      : "0.0.1",
-            "m-tests-api"     : "0.0.1",
+            "m-tests-api"     : "0.0.2",
             "m-user-api"      : "0.0.9",
             "m-home-api"      : "0.0.4.1",
             "m-im-api"        : "0.0.8",
-            "m-dynamic-api"   : "0.0.3.6",
+            "m-dynamic-api"   : "0.0.3.7",
             //-------------- 功能组件 --------------
 
             //第一步
@@ -104,14 +104,14 @@ ext {
             "m-audioim-api"   : "0.0.5",
             "m-confide-api"   : "0.0.1.1",
             "m-consultant-api": "0.0.4",
-            "m-course-api"    : "0.0.2",
+            "m-course-api"    : "0.0.3",
             "m-fm-api"        : "0.0.2",
             "m-muse-api"      : "0.0.1",
-            "m-tests-api"     : "0.0.1",
+            "m-tests-api"     : "0.0.2",
             "m-user-api"      : "0.0.9",
             "m-home-api"      : "0.0.4.1",
             "m-im-api"        : "0.0.8",
-            "m-dynamic-api"   : "0.0.3.6",
+            "m-dynamic-api"   : "0.0.3.7",
             //-------------- 功能组件 --------------
 
             //第一步

m-course/src/main/java/com/yidianling/course/flutterPlugin/CoursePlugin.kt

@@ -20,7 +20,7 @@ import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.course.CourseConstants
-import com.yidianling.course.bean.ScrollStatusChangeEvent
+import com.ydl.course.event.ScrollStatusChangeEvent
 import com.yidianling.course.courseNew.mine.MyCourseActivity
 import com.yidianling.course.course_special_list.activity.CourseSpecialListActivity
 import com.yidianling.course.flutterPlugin.CourseSendPlugin

m-course/src/main/java/com/yidianling/course/bean/ScrollStatusChangeEvent.java → m-course/src/main/modular_api/com/ydl/course/event/ScrollStatusChangeEvent.java

-package com.yidianling.course.bean;
+package com.ydl.course.event;
 
 /**
  * 黑名单更新通知

m-dynamic/src/main/java/com/yidianling/dynamic/modular/service/DynamicServiceImp.kt

@@ -3,6 +3,7 @@ package com.yidianling.dynamic.modular.service
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentActivity
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -30,12 +31,6 @@ class DynamicServiceImp : IDynamicService {
 
     }
 
-    override fun membersIntent(activity: Activity): Intent {
-        val intent = Intent()
-        intent.setClass(activity, MembersActivity::class.java)
-        return intent
-    }
-
     override fun membersIntent(activity: Activity, userId: String): Intent {
         return MembersActivity.newIntent(activity, userId)
     }
@@ -68,6 +63,8 @@ class DynamicServiceImp : IDynamicService {
     override fun publishTrendIntent(activity: Activity): Intent {
         val intent = Intent()
         intent.setClass(activity, PublishTrendActivity::class.java)
+        val bundle = Bundle()
+        intent.putExtra("bundle", bundle)
         return intent
     }
 
@@ -83,12 +80,6 @@ class DynamicServiceImp : IDynamicService {
         return TopicDetailActivity.newIntent(context, isSplash, topicId)
     }
 
-    override fun topicDetailIntent(context: Activity): Intent {
-        val intent = Intent()
-        intent.setClass(context, TopicDetailActivity::class.java)
-        return intent
-    }
-
     override fun getTrendsHomeFragment(tabIndex: String): Fragment {
         return TrendsHomeFragment().setTab(tabIndex)
     }
@@ -101,6 +92,15 @@ class DynamicServiceImp : IDynamicService {
         return ImageCompress.scal(activity, path, size)
     }
 
+    /**
+     * 外部调用获取intent后注意，需使用以下方式
+     *  intent.putExtra("browse_type", "preview")
+        intent.putExtra("position", position)
+        val bd = Bundle()
+        bd.putParcelableArrayList("allTrendImages", imags as ArrayList<out Parcelable>?)
+        intent.putExtra("allTrendImages_bd", bd)
+        startActivityForResult(intent, ModularServiceManager.provide(IDynamicService::class.java).getPublicPicBrowType())
+     */
     override fun getBrosePictureActivityIntent(activity: Activity): Intent {
         val intent = Intent()
         intent.setClass(activity, BrowsePicturesActivity::class.java)

m-dynamic/src/main/modular_api/com/yidianling/dynamic/api/IDynamicService.kt

@@ -12,8 +12,6 @@ interface IDynamicService  : IProvider {
 
     fun membersIntent(activity: Activity, userId: String): Intent
 
-    fun membersIntent(activity: Activity): Intent
-
     fun replyInfoIntent(activity: Activity, replyId: String, aid: String): Intent
 
     fun trendsDetailIntent(activity: Activity, trendId: Int): Intent
@@ -32,8 +30,6 @@ interface IDynamicService  : IProvider {
 
     fun topicDetailIntent(context: Activity, isSplash: Boolean, topicId: String): Intent
 
-    fun topicDetailIntent(context: Activity): Intent
-
     fun publishArticleToTrend(activity: Activity, url: String, cover: String, title: String): Intent
 
     fun getBrosePictureActivityIntent(activity: Activity): Intent

m-tests/src/main/java/com/yidianling/tests/modular/TestsApiServiceImp.kt

 package com.yidianling.tests.modular
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.base.config.HttpConfig
+import com.yidianling.tests.SelectConversationActivity
 import com.yidianling.tests.api.service.ITestsApiService
 
 /**
@@ -27,4 +30,15 @@ public class TestsApiServiceImp : ITestsApiService {
         val h5Params = H5Params(HttpConfig.MH5_URL+"ceshi/"+testId, null)
         NewH5Activity.start(BaseApp.getApp(),h5Params)
     }
+
+    override fun getSelectConversationActivityIntent(activity: Activity, flag: Int, title: String?, head: String?, id: Int, url: String?, shareUrl: String?) : Intent {
+        val intent = Intent(activity, SelectConversationActivity::class.java)
+        intent.putExtra("flag", flag)
+        intent.putExtra("title", title?:"")
+        intent.putExtra("head", head?:"")
+        intent.putExtra("id", id)
+        intent.putExtra("url", url?:"")
+        intent.putExtra("share_url", shareUrl?:"")
+        return intent
+    }
 }
\ No newline at end of file

m-tests/src/main/modular_api/com/yidianling/tests/api/service/ITestsApiService.kt

 package com.yidianling.tests.api.service
 
+import android.app.Activity
+import android.content.Intent
 import com.alibaba.android.arouter.facade.template.IProvider
 
 interface ITestsApiService  : IProvider {
@@ -7,4 +9,6 @@ interface ITestsApiService  : IProvider {
     fun testDetailH5(testId: String)
 
     fun testH5Result(testResultId: String)
+
+    fun getSelectConversationActivityIntent(activity: Activity, flag: Int, title: String?, head: String?, id: Int, url: String?, shareUrl: String?) : Intent
 }
\ No newline at end of file