feat:金刚位细节调整

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -20,8 +20,8 @@ import java.util.List;
  */
 public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
-    public static String appEnv = YDLConstants.ENV_TEST;
-//    public static String appEnv = YDLConstants.ENV_PROD;
+    //    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_PROD;
 
     //    public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
     @Override

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.32"
+        componentVersion = "0.3.0.42-SNAPSHOT"
     }
     repositories {
         mavenCentral()

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

@@ -8,6 +8,7 @@ import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.base.config.HttpConfig
+import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.consultant.constants.ConsultBIConstants
@@ -26,6 +27,10 @@ class ExpertEightCategoryActivity : BaseActivity() {
         return R.layout.consultant_layout_eight_category
     }
 
+    override fun getStatusViewOptions(): StatusBarOptions {
+        return StatusBarOptions(true, true)
+    }
+
     @SuppressLint("CheckResult")
     override fun initDataAndEvent() {
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE or WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)

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

@@ -34,6 +34,7 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.base.config.HttpConfig
 import com.ydl.ydlcommon.bean.StatusBarOptions
+import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.ui.LogoLoadingView
 import com.ydl.ydlcommon.utils.BuryPointUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
@@ -47,6 +48,7 @@ import com.yidianling.consultant.adapter.ExpertSearchAdapter
 import com.yidianling.consultant.bean.ConsultantRecentCity
 import com.yidianling.consultant.constants.ConsultBIConstants
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultEvent.Companion.POPUP_ICON_CLICK
+import com.yidianling.consultant.constants.ConsultBIConstants.ConsultEvent.Companion.PRICE_TYPE_CLICK
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultEvent.Companion.YDL_USER_CONSULT_SEARCH_CLICK
 import com.yidianling.consultant.listener.OnCategoriesSelectedListener
 import com.yidianling.consultant.listener.OnFilterConfirmListener
@@ -216,6 +218,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
     private val doctorList = ArrayList<ExpertServiceItem>()
     private var hasMore = true
     private var initCategory = "0"
+    private var hasCateid = "0"
     private var initCategoryCateid3 = "0"
     private var initShowType: Int = 1
 
@@ -416,6 +419,8 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         }
         initCategory = mIntent.getStringExtra("cateId") ?: ""
         initCategoryCateid3 = mIntent.getStringExtra(CATEID3IN) ?: ""
+
+
         if (!TextUtils.isEmpty(initCategoryCateid3) && initCategoryCateid3 != "0") {
             allFilter.categoryId3List.add(initCategoryCateid3)
         }
@@ -438,10 +443,6 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         if (!TextUtils.isEmpty(initCategory) && initCategory != "0") {
             allFilter.categoryId2List.add(initCategory)
         }
-        if (!TextUtils.isEmpty(cateName)) {
-            tvSubject.text = cateName
-            updateFilterTextViewStatus(tvSubject, FILTER_STATUS_FILTERED)
-        }
 
         getPresenter().fetchListHead()
         recommendListView.requestData(initCategory)
@@ -469,13 +470,43 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
 
         v_loading.visibility = View.VISIBLE
         v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
-
+        hasCateid = mIntent.getStringExtra(IYDLRouterConstant.HASCATEID) ?: ""
         doctorAdapter.clickCount = 0
         doctorAdapter.setIsRecommendWords(isRecommendWords)
         doctorAdapter.setEntrance(1)
         getPresenter().fetchFunctionWord(2)
     }
 
+    private fun hasCateid() {
+        //金刚位传递过来的cateid 如果八大分类 contain这个cateid就显示。否则不显示。
+        val mutableList = mutableListOf<MutableList<ChildrenBean>>()
+        mutableList.add(allFilter.childList)
+        mutableList.add(allFilter.stressList)
+        mutableList.add(allFilter.loveEmotionList)
+        mutableList.add(allFilter.marriedFamilyList)
+        mutableList.add(allFilter.personalGrowthList)
+        mutableList.add(allFilter.interpersonalRelationshipList)
+        mutableList.add(allFilter.careerDevelopmentList)
+        mutableList.add(allFilter.mentalHealthList)
+        var isShow = false
+        mutableList.forEachIndexed { index, item ->
+            if (item[0].cate_id == hasCateid) {
+                item[0].isSelected = true
+                isShow = true
+            }
+        }
+        if (isShow) {
+            if (!TextUtils.isEmpty(cateName)) {
+                tvSubject.text = cateName
+                updateFilterTextViewStatus(tvSubject, FILTER_STATUS_FILTERED)
+            }
+        } else {
+            tvSubject.text = "困扰"
+            updateFilterTextViewStatus(tvSubject, FILTER_STATUS_NORMAL)
+        }
+
+    }
+
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         initData(intent!!, true)
@@ -551,6 +582,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 allFilter.mentalHealthList.add(childrenBean)
             }
         }
+        hasCateid()
     }
 
     override fun onFunctionWordFetched(wordBean: MutableList<FunctionWordBean>) {
@@ -1088,6 +1120,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 appbar_layout.setExpanded(false)
                 appbar_layout.postDelayed({
                     updateFilterTextViewStatus(tvSort, FILTER_STATUS_OPEN)
+                    ActionCountUtils.count(PRICE_TYPE_CLICK)
                     showPricePopupWindow()
                 }, 300)
 
@@ -1391,7 +1424,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 tempFilter, this
             )
         }
-        pricePopup!!.setOnDismissListener {
+        pricePopup?.setOnDismissListener {
             if (tempFilter.priceRanges != null) {
                 updateFilterTextViewStatus(tvSort, FILTER_STATUS_FILTERED)
             } else {

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

@@ -50,6 +50,7 @@ import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.adapter.ExpertSearchAdapter
 import com.yidianling.consultant.bean.ConsultantRecentCity
 import com.yidianling.consultant.constants.ConsultBIConstants
+import com.yidianling.consultant.constants.ConsultBIConstants.ConsultEvent.Companion.PRICE_TYPE_CLICK
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultantLocationAuth.Companion.REFUSE_ALREADY
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultantLocationAuth.Companion.WHETHER_LOCATION_AUTH
 import com.yidianling.consultant.listener.*
@@ -954,6 +955,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
                 appbar_layout.setExpanded(false)
                 appbar_layout.postDelayed({
                     updateFilterTextViewStatus(tvSort, FILTER_STATUS_OPEN)
+                    ActionCountUtils.count(PRICE_TYPE_CLICK)
                     showPricePopupWindow()
                 }, 300)
 

m-consultant/src/main/java/com/yidianling/consultant/constants/ConsultBIConstants.kt

@@ -79,6 +79,7 @@ class ConsultBIConstants {
             const val PRICE_CHOICE_CLICK = "$CONSULT_FILTER_PRICE_PAGE|price_choice_click"
             const val PRICE_SLIDE_CLICK = "$CONSULT_FILTER_PRICE_PAGE|price_slide_click"
             const val BOTTOM_ICON_CLICK = "$CONSULT_FILTER_PRICE_PAGE|bottom_icon_click"
+            const val PRICE_TYPE_CLICK = "$CONSULT_FILTER_PRICE_PAGE|price_type_click"
         }
     }
     class ConsultSearchListEvent {

m-consultant/src/main/java/com/yidianling/consultant/ui/view/topView/EightCategoryView.kt

@@ -112,8 +112,12 @@ class EightCategoryView : LinearLayout, CategoryDetailAdapter.OutAdapterClicklis
         mAllfilter.categoryId2List.clear()
         mAllfilter.categoryId3List.clear()
         signList.clear()
-        eightCategoryAdapter.notifyDataSetChanged()
+        eightCategoryListBean.forEach {
+            it.hasData = false
+        }
+
         categoryRightAdapter.notifyDataSetChanged()
+        eightCategoryAdapter.notifyDataSetChanged()
     }
 
     fun setData(
@@ -140,6 +144,13 @@ class EightCategoryView : LinearLayout, CategoryDetailAdapter.OutAdapterClicklis
         leftmanager = LinearLayoutManager(mContext)
         category_detail.layoutManager = leftmanager
         category_detail.adapter = categoryRightAdapter
+        mutableList.forEachIndexed { index, mutable ->
+            if (mutable[0].isSelected) {
+                eightCategoryListBean.get(index).hasData = true
+                return@forEachIndexed
+            }
+        }
+        eightCategoryAdapter.notifyDataSetChanged()
         categoryRightAdapter.setOutClicklistener(this)
         category_detail.setOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
@@ -176,7 +187,6 @@ class EightCategoryView : LinearLayout, CategoryDetailAdapter.OutAdapterClicklis
             }
         }
     }
-
     override fun outAdapterClick(outPosition: Int, inPosition: Int) {
         //之前的老数据多选分类页。
         if (!singleMultiple) {

m-consultant/src/main/res/layout/consultant_item_consult_type.xml

@@ -5,8 +5,8 @@
     android:layout_height="wrap_content"
     android:background="@color/white"
     android:gravity="center_vertical"
-    android:paddingTop="@dimen/platform_dp_15"
-    android:paddingBottom="@dimen/platform_dp_15"
+    android:paddingTop="@dimen/platform_dp_17"
+    android:paddingBottom="@dimen/platform_dp_17"
     android:orientation="horizontal"
     android:paddingLeft="16dp"
     android:paddingRight="16dp">

m-consultant/src/main/res/layout/consultant_layout_category_view.xml

@@ -13,14 +13,16 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/eight_category"
-            android:layout_width="90dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="match_parent"
             android:background="@color/platform_color_F7F7F7"
             android:orientation="vertical" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/category_detail"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="3"
             android:layout_height="wrap_content" />
     </LinearLayout>
 

m-consultant/src/main/res/layout/consultant_ui_region_popup_window.xml

@@ -17,6 +17,6 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:background="@color/white"
-        android:layout_weight="2"
+        android:layout_weight="3"
         android:overScrollMode="never"/>
 </LinearLayout>

m-consultant/src/main/res/layout/eight_category_detail_list_item.xml

@@ -7,7 +7,8 @@
     android:layout_marginStart="@dimen/platform_dp_12"
     android:layout_marginEnd="@dimen/platform_dp_12"
     android:orientation="vertical"
-    android:paddingTop="@dimen/platform_dp_25">
+    android:paddingTop="@dimen/platform_dp_12"
+    android:paddingBottom="@dimen/platform_dp_13">
 
     <LinearLayout
         android:layout_width="match_parent"

m-home/src/main/java/com/yidianling/home/event/HomeBaseImpl.kt

@@ -273,16 +273,11 @@ open class HomeBaseImpl : IHomeBaseEvent {
             //全部
             ARouter.getInstance().build("/consult/eightcategory")
                 .navigation()
-//            ARouter.getInstance().build("/consult/list")
-//                .withInt(IYDLRouterConstant.EXTRA_SHOWTYPE, 0)
-//                .withString(IYDLRouterConstant.EXTRA_CATETITLE, data.title)
-//                .withSerializable(IYDLRouterConstant.GO_CRITERIA, data.goCriteriaMap)
-//                .navigation()
-
         } else {
             ARouter.getInstance().build("/consult/list")
                 .withInt(IYDLRouterConstant.EXTRA_SHOWTYPE, 0)
                 .withString(IYDLRouterConstant.EXTRA_CATETITLE, data.title)
+                .withString(IYDLRouterConstant.HASCATEID, data.cateId)
                 .withSerializable(IYDLRouterConstant.GO_CRITERIA, data.goCriteriaMap)
                 .navigation()
         }

m-home/src/main/java/com/yidianling/home/model/bean/HomeHeaderBean.kt

@@ -69,6 +69,7 @@ class HomeHeaderBean : HomeItemBaseBean {
         var icon: String? = "",
         var goType: String? = "",
         var goUrl: String? = "",
+        var cateId: String? = "",
         var goCriteriaMap: HashMap<String, Any>? = null
     ) : Serializable
 

ydl-platform/src/main/java/com/ydl/ydlcommon/router/IYDLRouterConstant.kt

@@ -77,7 +77,8 @@ interface IYDLRouterConstant{
         const val EXTRA_TAB       = "tab"
         const val EXTRA_CATEID    = "cateId"
         const val EXTRA_CATETITLE = "cateTitle"
-        const val EXTRA_SHOWTYPE  = "showType"
+        const val HASCATEID = "hascateid"
+        const val EXTRA_SHOWTYPE = "showType"
         const val EXTRA_KEYWORD   = "keyword"
         const val EXTRA_RED_PACKET = "by_red_packet"
         const val EXTRA_CONFIDEDID = "confidedId"