feat:BUG修改

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

@@ -33,6 +33,7 @@ import com.yidianling.consultant.api.IConsultantService
 import com.yidianling.consultant.bean.*
 import com.yidianling.consultant.constants.ConsultBIConstants
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultEvent.Companion.SEARCH_BANNERWORD_CLICK
+import com.yidianling.consultant.constants.ConsultBIConstants.ConsultEvent.Companion.YDL_USER_CONSULT_SEARCH_CONFIRM_CLICK
 import com.yidianling.consultant.contract.IHotSearchContract
 import com.yidianling.consultant.model.bean.FunctionWordBean
 import com.yidianling.consultant.modular.utils.ConsultAssistantEntryUtils
@@ -110,6 +111,12 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View, IHotSearchCon
         }
         etSearch.setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                //埋点
+                ActionCountUtils.count(
+                    YDL_USER_CONSULT_SEARCH_CONFIRM_CLICK,
+                    etSearch.text.toString(),
+                    etSearch.hint.toString()
+                )
                 // 搜索的关联词
                 var relatedWords = ""
                 var isRecommendWords = false

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

@@ -27,6 +27,7 @@ class ConsultBIConstants {
         const val POSITION_YDL_USER_ASSOCIATE_WORD_CLICK="ydl_user_associate_word_click"      //  联想词点击position
         //  咨询师列表页 banner 点击事件
         const val POSITION_CONSULT_COUNSELOR_LIST_BANNER_CLICK = "consult_counselor_list_banner_click"
+
     }
 
     //====================APP咨询列表页（app_consult_list_page）====================
@@ -57,7 +58,8 @@ class ConsultBIConstants {
                 APP_CONSULT_LIST_PAGE + "ydl_user_consult_search_click"//咨询师页搜索框点击事件
             const val YDL_USER_CONSULT_TYPE_CLICK: String =
                 APP_CONSULT_LIST_PAGE + "ydl_user_consult_type_click"//咨询师顶部ICON 厌学专题、限时特惠、精神心理
-
+            const val YDL_USER_CONSULT_SEARCH_CONFIRM_CLICK: String =
+                APP_CONSULT_LIST_PAGE + "YDL_USER_CONSULT_SEARCH_CONFIRM_CLICK"//搜索词、底纹词点击埋点
             const val POSITION_CONSULT_COUNSELOR_CARD_CLICK =
                 "consult_counselor_card_click"      //  咨询师列表点击position
             const val POSITION_CHOICE_FILTER_CLICK =

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

@@ -60,6 +60,7 @@ class PricePopupWindow(
         contentView.price_Confirm.setOnClickListener {
             if (max_Price == infiniteText) max_Price = ""
             var priceRangesItem = PriceRangesItem(min_Price, max_Price)
+            tempFilter.priceRanges = priceRangesItem
             onPriceItemSelectedListener.onPriceItemSelected(priceRangesItem)
             dismiss()
         }
@@ -103,12 +104,13 @@ class PricePopupWindow(
                 rightValue: Float,
                 isFromUser: Boolean
             ) {
-                var maxPrice = ((rightValue / 100) * maxPriceValue).toInt().toString()
+                max_Price = ((rightValue / 100) * maxPriceValue).toInt().toString()
                 if (rightValue > 93) {
-                    maxPrice = infiniteText
+                    max_Price = infiniteText
                 }
+                min_Price = ((leftValue / 100) * maxPriceValue).toInt().toString()
                 contentView.tv_start_end_price.text =
-                    ((leftValue / 100) * maxPriceValue).toInt().toString() + "-" + maxPrice
+                    "$min_Price-$max_Price"
 
             }
 

m-home/src/ydl/java/com/yidianling/home/adapter/HomeCategoryAdapter.kt

@@ -46,7 +46,9 @@ class HomeCategoryAdapter : PagerAdapter {
             return
         }
         Log.e("http", "--------------data.size=" + data!!.size)
-        list = this.averageAssign(data, HomeCategoryContainer.PAGE_ITEM_SIZE)
+        list?.clear()
+        list?.add(data)
+//        list = this.averageAssign(data, HomeCategoryContainer.PAGE_ITEM_SIZE)
         Log.e("http", "--------------list.size=" + list!!.size)
         notifyDataSetChanged()
     }

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeCategoryContainer.kt

@@ -53,27 +53,12 @@ class HomeCategoryContainer(private val mContext: Context, private var homeEvent
     fun initData(bean: HomeHeaderBean?) {
         if (bean?.goldList == null) return
         mHomeCategoryAdapter?.updateItems(bean?.goldList)
-        if (bean?.goldList?.size!! > PAGE_ITEM_SIZE) {
-            count = Math.ceil(
-                Math.ceil(
-                    bean.goldList?.size?.toFloat()?.div(PAGE_ITEM_SIZE.toFloat())
-                        ?.toDouble()!!
-                )
-            ).toInt()
-            createIndicator()
-            val params = RelativeLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                RxImageTool.dip2px(153f)
-            )
-            vp_category.layoutParams = params
-        } else {
-            val params = RelativeLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                RxImageTool.dip2px(143f)
-            )
-            vp_category.layoutParams = params
-            ll_Indicator.visibility = View.GONE
-        }
+        val params = RelativeLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            RxImageTool.dip2px(143f)
+        )
+        vp_category.layoutParams = params
+        ll_Indicator.visibility = View.GONE
     }
 
     private fun initViewPager() {

m-home/src/ydl/java/com/yidianling/home/ui/view/HomePagerBannerCategoryItemView.kt

@@ -148,9 +148,6 @@ class HomePagerBannerCategoryItemView(mContext: Context, homeEvent: IHomeBaseEve
         homeModulePagerBannerFlRoot.removeAllViews()
         var i = 0
         for (item in mDataList!!) {
-            if (i > 9) {
-                break
-            }
             val imageView = createIcon(i)
             val textView = createText(i)
 

m-home/src/ydl/res/layout/home_category_container.xml

@@ -9,7 +9,7 @@
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/vp_category"
         android:layout_width="match_parent"
-        android:layout_height="153dp"
+        android:layout_height="wrap_content"
         android:background="@color/platform_white"/>
 
     <LinearLayout