feat: 咨询筛选代码提交

app/build.gradle

@@ -188,12 +188,7 @@ dependencies {
     implementation(rootProject.ext.dependencies["espresso-core"])
     implementation(rootProject.ext.dependencies["okhttp3"])
 
-    // TPNS SDK 主工程依赖包
-//    implementation 'com.tencent.liteav:LiteAVSDK_TRTC:latest.release'
 
-
-    if (true) {
-        //开发模式
     implementation fileTree(dir: 'aars', include: ['*.aar'])
     implementation project(':m-user')
     implementation modularPublication('com.ydl:m-user-api')
@@ -202,50 +197,26 @@ dependencies {
     api project(':m-consultant')
     implementation modularPublication('com.ydl:m-consultant-api')
     api project(':m-tests')
-
-
     api project(':m-home')
     api project(':m-confide')
-
-
     implementation project(':ydl-flutter-base')
-
     api(project(':ydl-platform')) {
         transitive = true
     }
     implementation project(':ydl-webview')
     implementation project(':ydl-media')
-
-
     implementation project(':m-muse')
     implementation project(':m-im')
     implementation modularPublication('com.ydl:m-im-api')
     implementation project(':m-dynamic')
     implementation project(':m-course')
-        //文章模块
     implementation project(':m-article')
     implementation project(':m-audioim')
     implementation modularPublication('com.ydl:m-audioim-api')
-
     implementation project(':m-fm')
     implementation modularPublication('com.ydl:m-fm-api')
     implementation project(':ydl-tuicore')
 
-    } else {
-        //发布模式
-        api 'com.ydl:m-user-module-ydl:0.0.6'
-        api rootProject.ext.dependencies["ydl-webview"]
-        api rootProject.ext.dependencies["ydl-m-user-api"]
-        api rootProject.ext.dependencies["ydl-m-fm-api"]
-        api rootProject.ext.dependencies["m-article"]
-        api(rootProject.ext.dependencies["ydl-platform"]) {
-            transitive = true
-        }
-        api(rootProject.ext.dependencies["ydl-tuicalling"]) {
-            transitive = true
-        }
-    }
-
 
     implementation rootProject.ext.dependencies["retrofit-url-manager"]
     kapt 'com.alibaba:arouter-compiler:1.2.2'

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

@@ -449,7 +449,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                     if (cate.cateId == initCategory) {
                         allFilter.categories.clear()
                         allFilter.categories.add(cate)
-                        if (allFilter.categories.size == 1 && !"全部".equals(allFilter.categories[0].cateName)) {
+                        if (allFilter.categories.size == 1 && "全部" != allFilter.categories[0].cateName) {
                             //显示选中标题
                             tvSubject.text = allFilter.categories[0].cateName
                         } else {
@@ -1368,7 +1368,9 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
 
     private var categoryPopup: CategoryPopupWindow? = null
 
-    //显示主题弹窗
+    /**
+     * 显示主题弹窗
+     */
     private fun showSubjectPopupWindow() {
         tempFilter.categories.clear()
         tempFilter.categories.addAll(allFilter.categories)

m-consultant/src/main/res/drawable/consultant_solid_1da1f2_r_8.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="8dp" />
+    <solid android:color="@color/platform_main_theme" />
+
+</shape>
\ No newline at end of file

m-consultant/src/main/res/drawable/consultant_stroke_ebebeb_r_8.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="8dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/platform_color_EBEBEB" />
+
+</shape>
\ No newline at end of file

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

@@ -13,7 +13,7 @@
         android:textColor="@color/platform_color_242424"
         android:textStyle="bold"
         android:layout_marginTop="@dimen/platform_dp_24"
-        android:layout_marginLeft="@dimen/platform_dp_15"
+        android:layout_marginStart="@dimen/platform_dp_15"
         android:layout_marginBottom="7dp"/>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -24,18 +24,38 @@
         android:layout_marginRight="10dp"
         android:overScrollMode="never"/>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="68dp"
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="8dp"
+        >
+
+        <TextView
+            android:id="@+id/btn_reset"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="44dp"
+            android:background="@drawable/consultant_stroke_ebebeb_r_8"
+            android:gravity="center"
+            android:text="@string/platform_reset"
+            android:textSize="16sp"
+            android:textColor="@color/platform_color_242424" />
+
         <TextView
             android:id="@+id/btnConfirm"
-        android:layout_width="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="44dp"
-        android:layout_marginBottom="16dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_marginTop="19dp"
-        android:background="@drawable/consultant_bg_radius_5_dark"
+            android:layout_marginStart="13dp"
+            android:background="@drawable/consultant_solid_1da1f2_r_8"
             android:gravity="center"
             android:text="@string/platform_confirm"
-        android:textSize="17dp"
+            android:textSize="16sp"
             android:textColor="@color/platform_but_text_color" />
 
+    </LinearLayout>
+
 </LinearLayout>