Merge branch 'feat/lp/lp_baike_new' into 'd/v4.4.05'

新增百科功能

See merge request app_android_lib/YDL-Component!273

m-user/src/main/java/com/yidianling/user/UserConstants.kt

@@ -20,5 +20,6 @@ object UserConstants {
 
     //黑名单
     val My_BLACK = HttpConfig.H5_URL + "mine/black-list/"
-
+    //百科
+    val MY_BAIKE = HttpConfig.MH5_URL + "newConsult/baike"
 }
\ No newline at end of file

m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt

@@ -35,6 +35,7 @@ import com.yidianling.im.api.service.IImService
 import com.yidianling.im.message.param.MsgListParam
 import com.yidianling.user.BuildConfig
 import com.yidianling.user.R
+import com.yidianling.user.UserConstants.MY_BAIKE
 import com.yidianling.user.UserHelper.getUserInfo
 import com.yidianling.user.UserHelper.getUsetSetting
 import com.yidianling.user.UserHelper.isLogin
@@ -118,6 +119,8 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
         rootView.findViewById<View>(R.id.ll_service).setOnClickListener(this)
         //冥想
         rootView.findViewById<View>(R.id.ll_meditation).setOnClickListener(this)
+        //心理百科
+        rootView.findViewById<View>(R.id.ll_wiki).setOnClickListener(this)
 
         init()
         GlideApp.with(this).load("https://static.yidianling.com/banner/bottombanner@2x.png")
@@ -193,6 +196,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
         refreshCouponData()
     }
 
+    @SuppressLint("CheckResult")
     private fun getConfideOrder(uid: String) {
         MineHttpImpl.getInstance().getHasConfideOrder(uid)
             .subscribeOn(Schedulers.io())
@@ -546,6 +550,13 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                 NewH5Activity.start(it, h5Params3)
             }
 
+        } else if (id == R.id.ll_wiki) { //心理百科
+            count(UserMyPageEvent.YDL_USER_MY_MIDDLE_TYPE_CLICK, "百科")
+            mActivity?.let {
+                val h5Params3 = H5Params(MY_BAIKE, null)
+                NewH5Activity.start(it, h5Params3)
+            }
+
         }
     }
 

m-user/src/main/res/layout/user_mine_fragment_mine.xml

@@ -495,7 +495,6 @@
 
                             </LinearLayout>
 
-<!--meditation start-->
                             <LinearLayout
                                 android:id="@+id/ll_meditation"
                                 android:layout_width="0dp"
@@ -519,13 +518,30 @@
                                     android:textSize="12sp" />
 
                             </LinearLayout>
-<!--meditation end-->
 
-
-                            <View
+                            <LinearLayout
+                                android:id="@+id/ll_wiki"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1" />
+                                android:layout_weight="1"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:gravity="center_horizontal"
+                                android:orientation="vertical">
+
+                                <ImageView
+                                    android:layout_width="25dp"
+                                    android:layout_height="25dp"
+                                    android:src="@drawable/user_mine_ic_my_wiki" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="8dp"
+                                    android:text="心理百科"
+                                    android:textColor="@color/platform_color_999999"
+                                    android:textSize="12sp" />
+
+                            </LinearLayout>
 
                         </LinearLayout>