信息采集过滤已经采集到的

app/build.gradle

@@ -181,7 +181,7 @@ dependencies {
         implementation project(':m-user')
         implementation modularPublication('com.ydl:m-user-api')
         api project(':m-tests')
-//        api project(':m-consultant')
+        api project(':m-consultant')
         implementation modularPublication('com.ydl:m-consultant-api')
 //        implementation project(':m-confide')
 

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

@@ -118,9 +118,9 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         }
         bt_to_muse.setOnClickListener {
 
-            YDLRouterManager.router(IYDLRouterConstant.ROUTER_MUSE_CENTER,
-                YDLRouterParams().putExtra
-            ("url", "http://video.yidianling.com/2019/05/30/746851e2f335baf5f44499f4fb49d3a9.mp3"))
+//            YDLRouterManager.router(IYDLRouterConstant.ROUTER_MUSE_CENTER,
+//                YDLRouterParams().putExtra
+//            ("url", "http://video.yidianling.com/2019/05/30/746851e2f335baf5f44499f4fb49d3a9.mp3"))
 
 //            YDLRouterManager.router(
 //                IYDLRouterConstant.ROUTER_MUSE,

app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt

@@ -7,6 +7,7 @@ import com.ydl.component.mvp.DemoContract
 import com.ydl.component.mvp.DemoPresenter
 import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
+import com.yidianling.consultant.ExpertSearchFragment
 //import com.yidianling.consultant.ExpertSearchFragment
 import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
 import com.yidianling.home.ui.fragment.YdlHomeFragment
@@ -70,9 +71,9 @@ class FragmentContainerActivity  : BaseLceActivity<DemoContract.View, DemoContra
         if ("YdlHomeFragment" == fragmentName) {
             return YdlHomeFragment()
         }
-//        if ("ExpertSearchFragment" == fragmentName) {
-//            return ExpertSearchFragment()
-//        }
+        if ("ExpertSearchFragment" == fragmentName) {
+            return ExpertSearchFragment()
+        }
         return PlayFragment()
     }
 }

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -281,8 +281,6 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
                         }
                         collectInfoPopupWindow.show(top_expert_info_cl);
                     }
-
-
                 }
                 ChatStatusCacheHelper.clearDataByKey("collectEvent");
             }
@@ -1190,7 +1188,18 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(resp -> {
                     if (resp.data != null && resp.data.size() > 0) {
-                        collectInfoPopupWindow.setData(resp.data);
+                        ServiceImpl.Companion.getInstance().userCollectList()
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(hasCollectedInResp -> {
+                                    if (hasCollectedInResp.data != null && hasCollectedInResp.data.size() > 0) {
+                                        collectInfoPopupWindow.setData(resp.data, hasCollectedInResp.data);
+                                    } else {
+                                        collectInfoPopupWindow.setData(resp.data, null);
+                                    }
+                                }, throwable -> {
+                                    collectInfoPopupWindow.setData(resp.data, null);
+                                });
                     } else {
                         collectInfoPopupWindow.dismiss();
                     }

m-im/src/main/java/com/yidianling/uikit/business/session/view/CollectInfoPopupWindow.kt

@@ -18,7 +18,8 @@ import com.yidianling.uikit.custom.http.response.UserQuestInfoBean
  * @Company 壹点灵
  * @date 2019/12/10
  */
-class CollectInfoPopupWindow(var mContext: Context, var listener: OnSendMsgListener) : PopupWindow(mContext) {
+class CollectInfoPopupWindow(var mContext: Context, var listener: OnSendMsgListener) :
+    PopupWindow(mContext) {
     private var collectUserInformationView: CollectUserInformationView
     private var isFromBack = true
 
@@ -49,12 +50,12 @@ class CollectInfoPopupWindow(var mContext: Context, var listener: OnSendMsgListe
         isOutsideTouchable = false
     }
 
-    fun setData(list: List<UserQuestInfoBean>) {
+    fun setData(list: List<UserQuestInfoBean>, hasCompleteInfoList: List<UserQuestInfoBean>?) {
         if (list.isEmpty()) {
             ToastUtil.toastShort("数据异常，请稍后重试")
             return
         }
-        collectUserInformationView.setData(list)
+        collectUserInformationView.setData(list, hasCompleteInfoList)
     }
 
 

m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt

@@ -48,6 +48,12 @@ interface ServiceApi {
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
     fun userCollectList(): Observable<BaseAPIResponse<List<UserQuestInfoBean>>>
 
+
+    //获取新用户收集的信息
+    @GET("user/getNewUserMes")
+    @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
+    fun getNewUserMes(): Observable<BaseAPIResponse<List<UserQuestInfoBean>>>
+
     //信息采集的问题
     @POST("user/collect/submit")
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)

m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceImpl.kt

@@ -64,6 +64,13 @@ class ServiceImpl private constructor() {
     }
 
     /**
+     * 获取新用户收集的信息
+     */
+    fun getNewUserMes(): Observable<BaseAPIResponse<List<UserQuestInfoBean>>> {
+        return YDLHttpUtils.obtainApi(ServiceApi::class.java).getNewUserMes()
+    }
+
+    /**
      * 上传采集的问题
      */
     fun submitUserCollect(params: String): Observable<BaseAPIResponse<Any>> {