feat:bug修改

build.gradle

@@ -14,7 +14,8 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.23-SNAPSHOT"
+        componentVersion = "0.3.0.26-SNAPSHO*-" +
+                "T"
     }
     repositories {
         mavenCentral()

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

@@ -404,7 +404,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
 
     private fun initData(mIntent: Intent, isRefresh: Boolean) {
         fromPageType = mIntent.getIntExtra(EXTRA_FROM_PAGE, -1)
-        initCategory = mIntent.getStringExtra(EXTRA_CATEGORY) ?: ""
+        initCategory = mIntent.getStringExtra(EXTRA_CATEGORY) ?: "0"
         initShowType = mIntent.getIntExtra(EXTRA_SHOW_TYPE, 0)
         //首页金刚位传递过来的动态Map参数
         if (mIntent.getSerializableExtra(GO_CRITERIA) != null) {
@@ -424,7 +424,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
             allFilter.searchWord = searchWord
         }
         mSign2 = mIntent.getStringExtra("sign2") ?: ""
-        getRouterParam()
+//        getRouterParam()
 
         allFilter.showType.key = initShowType
         if (!TextUtils.isEmpty(initCategory) && initCategory != "0") {
@@ -1474,25 +1474,31 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                         locationRegionItem?.let { locationHistoryList?.add(0, it) }
                         showAreaPoPup(agreeLocation)
                     }
-                }, {})
+                }, {
+                    ErrorLocate(false)
+                })
         } else {
-            locationList?.clear()
-            subLocationItem?.code = null
-            subLocationItem?.key = null
-            subLocationItem?.value = "开启授权，获得定位城市"
-            subLocationItem?.locationCode = "NotAuth"
-            subLocationItem?.let { locationList?.add(it) }
-            locationRegionItem = locationList?.let { it1 ->
-                RegionItem(
-                    it1,
-                    value = "定位",
-                    key = null,
-                    code = null
-                )
-            }
-            locationRegionItem?.let { locationHistoryList?.add(0, it) }
-            showAreaPoPup(agreeLocation)
+            ErrorLocate(agreeLocation)
+        }
+    }
+
+    private fun ErrorLocate(agreeLocation: Boolean) {
+        locationList?.clear()
+        subLocationItem?.code = null
+        subLocationItem?.key = null
+        subLocationItem?.value = "开启授权，获得定位城市"
+        subLocationItem?.locationCode = "NotAuth"
+        subLocationItem?.let { locationList?.add(it) }
+        locationRegionItem = locationList?.let { it1 ->
+            RegionItem(
+                it1,
+                value = "定位",
+                key = null,
+                code = null
+            )
         }
+        locationRegionItem?.let { locationHistoryList?.add(0, it) }
+        showAreaPoPup(agreeLocation)
     }
 
     private fun showAreaPoPup(isAgreeLocation: Boolean) {

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

@@ -51,7 +51,7 @@ class PricePopupWindow(
     private var SeekBarRightValue = 0f
     private val maxPriceValue = 600
     private val infiniteText = "无限"
-
+    private var track = false
     init {
         val view =
             LayoutInflater.from(context).inflate(R.layout.consultant_ui_price_popup_window, null)
@@ -65,13 +65,13 @@ class PricePopupWindow(
             ActionCountUtils.count(BOTTOM_ICON_CLICK, contentView.price_Confirm.text.toString())
             if (max_Price == infiniteText) max_Price = ""
             var priceRangesItem = PriceRangesItem(min_Price, max_Price)
-            tempFilter.priceRanges = priceRangesItem
+            priceRangesItem.key1 = filterData.priceRanges[0].key1
+            tempFilter.priceRanges?.key1 = filterData.priceRanges[0].key1
             onPriceItemSelectedListener.onPriceItemSelected(priceRangesItem)
             dismiss()
         }
         contentView.price_reset.setOnClickListener {
             ActionCountUtils.count(BOTTOM_ICON_CLICK, contentView.price_reset.text.toString())
-
             //重置
             contentView.range_price_seekbar.setProgress(0f, 100f)
             reset()
@@ -111,22 +111,25 @@ class PricePopupWindow(
                 rightValue: Float,
                 isFromUser: Boolean
             ) {
-                max_Price = ((rightValue / 100) * maxPriceValue).toInt().toString()
-                if (rightValue > 93) {
-                    max_Price = infiniteText
+                if (track) {
+                    max_Price = ((rightValue / 100) * maxPriceValue).toInt().toString()
+                    if (rightValue > 93) {
+                        max_Price = infiniteText
+                    }
+                    min_Price = ((leftValue / 100) * maxPriceValue).toInt().toString()
+                    ActionCountUtils.count(PRICE_SLIDE_CLICK, "$min_Price-$max_Price")
+                    contentView.tv_start_end_price.text =
+                        "$min_Price-$max_Price"
                 }
-                min_Price = ((leftValue / 100) * maxPriceValue).toInt().toString()
-                ActionCountUtils.count(PRICE_SLIDE_CLICK, "$min_Price-$max_Price")
-                contentView.tv_start_end_price.text =
-                    "$min_Price-$max_Price"
-
             }
 
             override fun onStartTrackingTouch(view: RangeSeekBar?, isLeft: Boolean) {
+                track = true
                 reset()
             }
 
             override fun onStopTrackingTouch(view: RangeSeekBar?, isLeft: Boolean) {
+                track = false
             }
 
         })
@@ -198,6 +201,9 @@ class PricePopupWindow(
                     textView.isSelected = false
                     textView.paint.isFakeBoldText = false
                     tempFilter.priceRangesView = null
+                    min_Price = ""
+                    max_Price = ""
+                    contentView.range_price_seekbar.setProgress(0f, 100f)
                     contentView.tv_start_end_price.text = "0-$infiniteText"
                 } else {
                     textView.background =
@@ -231,6 +237,7 @@ class PricePopupWindow(
                     }
                     if (SeekBarRightValue > 100f) SeekBarRightValue = 100f
                     contentView.range_price_seekbar.setProgress(SeekBarLeftValue, SeekBarRightValue)
+                    contentView.postDelayed(Runnable { }, 30)
                     if (max_Price == infiniteText) {
                         contentView.tv_start_end_price.text = "$min_Price-$max_Price"
                     } else {

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

@@ -272,14 +272,12 @@ open class HomeBaseImpl : IHomeBaseEvent {
             NewH5Activity.start(mContext, H5Params(data.goUrl.toString(), ""))
         } else if (data.goType.equals("special_categories")) {
             ARouter.getInstance().build("/consult/list")
-                .withString(IYDLRouterConstant.EXTRA_CATEID, "0")
                 .withInt(IYDLRouterConstant.EXTRA_SHOWTYPE, 0)
                 .withString(IYDLRouterConstant.EXTRA_CATETITLE, data.title)
                 .withSerializable(IYDLRouterConstant.GO_CRITERIA, data.goCriteriaMap)
                 .navigation()
         } else {
             ARouter.getInstance().build("/consult/list")
-                .withString(IYDLRouterConstant.EXTRA_CATEID, data.id)
                 .withInt(IYDLRouterConstant.EXTRA_SHOWTYPE, 0)
                 .withString(IYDLRouterConstant.EXTRA_CATETITLE, data.title)
                 .withSerializable(IYDLRouterConstant.GO_CRITERIA, data.goCriteriaMap)

m-home/src/main/res/layout/home_category_list_item.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/platform_dp_20"
+    android:layout_marginBottom="@dimen/platform_dp_15"
     android:gravity="center"
     android:orientation="vertical">
 
@@ -16,6 +16,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/platform_dp_5"
+        android:ellipsize="end"
+        android:singleLine="true"
         android:textColor="#1c212d"
         android:textSize="@dimen/platform_sp_12" />
 </LinearLayout>
\ No newline at end of file

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

@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:gravity="center_horizontal"
-    android:paddingTop="@dimen/platform_dp_20">
+    android:paddingTop="@dimen/platform_dp_8">
 
     <RelativeLayout
         android:id="@+id/homeModuleButtonBannerFirst"