fm分享逻辑

config.gradle

@@ -43,8 +43,8 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.21",
-            "m-consultant"    : "0.0.35",
-            "m-course"        : "0.0.18",
+            "m-consultant"    : "0.0.38",
+            "m-course"        : "0.0.24",
             "m-fm"            : "0.0.16",
             "m-muse"          : "0.0.13",
             "m-tests"         : "0.0.10",

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt

@@ -10,10 +10,10 @@ import android.content.Intent
 import android.graphics.Typeface
 import android.os.Build
 import android.support.v4.content.ContextCompat
+import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
-import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
@@ -31,7 +31,6 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.ydl.ydl_router.manager.YDLRouterParams
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.base.config.HttpConfig
-import com.ydl.ydlcommon.bean.GlobalInfo
 import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.ui.LogoLoadingView
@@ -58,9 +57,6 @@ import com.yidianling.consultant.ui.view.AreaPopupWindow
 import com.yidianling.consultant.ui.view.CategoryPopupWindow
 import com.yidianling.consultant.ui.view.FilterPopupWindow
 import com.yidianling.consultant.ui.view.SortPopupWindow
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.consultant_activity_expert_search_list.*
 import kotlinx.android.synthetic.main.consultant_item_filter_online.view.*
 import kotlinx.android.synthetic.main.consultant_layout_search_content.*
@@ -68,11 +64,11 @@ import kotlinx.android.synthetic.main.consultant_layout_search_head_bg.*
 import kotlinx.android.synthetic.main.consultant_layout_search_toolbar.*
 import org.json.JSONObject
 import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
 
 @Route(path = "/consult/list")
 class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPresenter>(), View.OnClickListener, IExpertSearchView,
-        OnCategoriesSelectedListener, OnSortItemSelectedListener, OnFilterConfirmListener {
+        OnCategoriesSelectedListener, OnSortItemSelectedListener, OnFilterConfirmListener,
+    SwipeRefreshLayout.OnRefreshListener {
 
     override fun showImage(url: String?, imgView: ImageView) {
         YDLImageCacheManager.showImage(ExpertSearchActivity@ this, url, imgView)
@@ -193,7 +189,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
     override fun createPresenter(): ExpertSearchPresenter = ExpertSearchPresenter()
 
     private fun initViews() {
-        srlContainer.isEnabled = false
+        srlContainer.isEnabled = true
         tvSubject.setOnClickListener(this)
         tvArea.setOnClickListener(this)
         tvSort.setOnClickListener(this)
@@ -201,6 +197,9 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         btn_call.setOnClickListener(this)
         tv_guide.setOnClickListener(this)
         rl_search.setOnClickListener(this)
+        srlContainer.setColorSchemeColors(ContextCompat.getColor(this, R.color.consultant_main_theme))
+        srlContainer.setProgressViewOffset(false, 0, 200)
+        srlContainer.setOnRefreshListener(this)
 
         initNetLossView()
 
@@ -1371,6 +1370,10 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         }
     }
 
+    override fun onRefresh() {
+        refresh(false)
+    }
+
     //刷新列表
     private fun refresh(isShowRefresh: Boolean? = true) {
         srlContainer.isRefreshing = isShowRefresh!!

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

@@ -7,12 +7,13 @@ import android.animation.PropertyValuesHolder
 import android.content.Context
 import android.graphics.Typeface
 import android.os.Build
-import android.os.Bundle
 import android.support.v4.content.ContextCompat
+import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
-import android.view.*
+import android.view.Gravity
+import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import android.widget.LinearLayout
@@ -53,19 +54,18 @@ import com.yidianling.consultant.ui.view.CategoryPopupWindow
 import com.yidianling.consultant.ui.view.FilterPopupWindow
 import com.yidianling.consultant.ui.view.SortPopupWindow
 import kotlinx.android.synthetic.main.consultant_activity_expert_search_list.*
-import kotlinx.android.synthetic.main.consultant_activity_expert_search_list.view.*
 import kotlinx.android.synthetic.main.consultant_item_filter_online.view.*
 import kotlinx.android.synthetic.main.consultant_layout_search_content.*
-import kotlinx.android.synthetic.main.consultant_layout_search_content.view.*
 import kotlinx.android.synthetic.main.consultant_layout_search_head_bg.*
-import kotlinx.android.synthetic.main.consultant_layout_search_head_bg.view.*
 import kotlinx.android.synthetic.main.consultant_layout_search_toolbar.*
-import kotlinx.android.synthetic.main.consultant_layout_search_toolbar.view.*
 import org.json.JSONObject
 import java.util.concurrent.Executors
 
 class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPresenter>(), View.OnClickListener, IExpertSearchView,
-        OnCategoriesSelectedListener, OnSortItemSelectedListener, OnFilterConfirmListener {
+        OnCategoriesSelectedListener, OnSortItemSelectedListener, OnFilterConfirmListener,
+    SwipeRefreshLayout.OnRefreshListener {
+
+
     override fun layoutResId(): Int {
         return R.layout.consultant_activity_expert_search_list
     }
@@ -142,7 +142,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
     override fun createPresenter(): ExpertSearchPresenter = ExpertSearchPresenter()
 
     private fun initViews() {
-        srlContainer.isEnabled = false
+        srlContainer.isEnabled = true
         tvSubject.setOnClickListener(this)
         tvArea.setOnClickListener(this)
         tvSort.setOnClickListener(this)
@@ -150,7 +150,9 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
         btn_call.setOnClickListener(this)
         tv_guide.setOnClickListener(this)
         rl_search.setOnClickListener(this)
-
+        srlContainer.setColorSchemeColors(ContextCompat.getColor(activity, R.color.consultant_main_theme))
+        srlContainer.setProgressViewOffset(false, 0, 200)
+        srlContainer.setOnRefreshListener(this)
         initNetLossView()
 
 
@@ -303,7 +305,6 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
     }
 
     private fun initData() {
-
         allFilter.showType.key = initShowType
         val cat = CateItem()
         cat.cateId = initCategory
@@ -314,7 +315,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
         getPresenter().localData(initShowType)
         //加载banner
         getPresenter().fetchBannerList()
-        refresh(false)
+        //refresh(false)
 
        v_loading.visibility = View.VISIBLE
        v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
@@ -1301,6 +1302,10 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
         }
     }
 
+    override fun onRefresh() {
+        refresh(false)
+    }
+
     //刷新列表
     private fun refresh(isShowRefresh: Boolean? = true) {
        srlContainer.isRefreshing = isShowRefresh!!
@@ -1313,7 +1318,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
         curPage = 1
         onScrollListener.resetState()
         getPresenter().fetchListData(allFilter, curPage)
-       rvExperts.scrollToPosition(0)
+        rvExperts.scrollToPosition(0)
     }
 
     //执行搜索
@@ -1399,6 +1404,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
 
     override fun onResume() {
         super.onResume()
+        refresh(false)
         ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_PAGE_VISIT)
 
     }