Commit 952a4229 by 刘鹏

feat: 百科项目完成开发

parent b63f63c0
ext { ext {
dev_mode = false //组件发布的时候需要设置为false dev_mode = false //组件发布的时候需要设置为false
ydl2PublishVersion = "0.2.0.14" ydl2PublishVersion = "0.2.1.8-SNAPSHOT"
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
......
...@@ -20,5 +20,6 @@ object UserConstants { ...@@ -20,5 +20,6 @@ object UserConstants {
//黑名单 //黑名单
val My_BLACK = HttpConfig.H5_URL + "mine/black-list/" val My_BLACK = HttpConfig.H5_URL + "mine/black-list/"
//百科
val MY_BAIKE = HttpConfig.MH5_URL + "newConsult/baike"
} }
\ No newline at end of file
...@@ -35,6 +35,7 @@ import com.yidianling.im.api.service.IImService ...@@ -35,6 +35,7 @@ import com.yidianling.im.api.service.IImService
import com.yidianling.im.message.param.MsgListParam import com.yidianling.im.message.param.MsgListParam
import com.yidianling.user.BuildConfig import com.yidianling.user.BuildConfig
import com.yidianling.user.R import com.yidianling.user.R
import com.yidianling.user.UserConstants.MY_BAIKE
import com.yidianling.user.UserHelper.getUserInfo import com.yidianling.user.UserHelper.getUserInfo
import com.yidianling.user.UserHelper.getUsetSetting import com.yidianling.user.UserHelper.getUsetSetting
import com.yidianling.user.UserHelper.isLogin import com.yidianling.user.UserHelper.isLogin
...@@ -118,6 +119,8 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -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_service).setOnClickListener(this)
//冥想 //冥想
rootView.findViewById<View>(R.id.ll_meditation).setOnClickListener(this) rootView.findViewById<View>(R.id.ll_meditation).setOnClickListener(this)
//心理百科
rootView.findViewById<View>(R.id.ll_wiki).setOnClickListener(this)
init() init()
GlideApp.with(this).load("https://static.yidianling.com/banner/bottombanner@2x.png") GlideApp.with(this).load("https://static.yidianling.com/banner/bottombanner@2x.png")
...@@ -201,6 +204,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -201,6 +204,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
refreshCouponData() refreshCouponData()
} }
@SuppressLint("CheckResult")
private fun getConfideOrder(uid: String) { private fun getConfideOrder(uid: String) {
MineHttpImpl.getInstance().getHasConfideOrder(uid) MineHttpImpl.getInstance().getHasConfideOrder(uid)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
...@@ -554,6 +558,13 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -554,6 +558,13 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
NewH5Activity.start(it, h5Params3) 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)
}
} }
} }
......
<vector android:height="23.61111dp" android:viewportHeight="17"
android:viewportWidth="18" android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="0.1" android:fillColor="#1DA1F2"
android:fillType="nonZero"
android:pathData="M3.6667,3L4.3333,3C5.5333,3 6.8667,3.2816 8.3333,3.8448C8.7333,3.9386 9.2667,3.9386 9.6667,3.8448C11.1333,3.2816 12.4667,3 13.6667,3L14.3333,3C15.8,3 17,3.8448 17,4.8773L17,13.3249C17,14.3574 15.8,15.2022 14.3333,15.2022L13.6667,15.2022C12.0667,15.2022 10.7333,15.3899 9.6667,15.8592C9.2667,16.0469 8.7333,16.0469 8.2,15.8592C7.2667,15.3899 5.9333,15.2022 4.3333,15.2022L3.6667,15.2022C2.3333,15.2022 1,14.4513 1,13.4188L1,4.8773C1,3.8448 2.2,3 3.6667,3Z"
android:strokeColor="#00000000" android:strokeWidth="1"/>
<path android:fillColor="#00000000" android:fillType="nonZero"
android:pathData="M3.6667,1L4.3333,1C5.5333,1 6.8667,1.3249 8.3333,1.9747C8.7333,2.083 9.2667,2.083 9.6667,1.9747C11.1333,1.3249 12.4667,1 13.6667,1L14.3333,1C15.8,1 17,1.9747 17,3.1661L17,12.9134C17,14.1047 15.8,15.0794 14.3333,15.0794L13.6667,15.0794C12.0667,15.0794 10.7333,15.296 9.6667,15.8375C9.2667,16.0542 8.7333,16.0542 8.2,15.8375C7.2667,15.296 5.9333,15.0794 4.3333,15.0794L3.6667,15.0794C2.3333,15.0794 1,14.213 1,13.0217L1,3.1661C1,1.9747 2.2,1 3.6667,1Z"
android:strokeColor="#1DA1F2" android:strokeWidth="1"/>
<path android:fillColor="#00000000" android:fillType="nonZero"
android:pathData="M11.7327,6.5778C10.951,5.8316 9.729,5.8053 8.916,6.5173C8.1029,5.805 6.8805,5.8313 6.0987,6.5778C5.7163,6.9436 5.5,7.4499 5.5,7.9791C5.5,8.5083 5.7163,9.0146 6.0987,9.3804L8.4587,11.6695C8.712,11.9197 9.1194,11.9197 9.3728,11.6695L11.7332,9.3828C12.1165,9.0169 12.3333,8.5102 12.3333,7.9803C12.3333,7.4505 12.1165,6.9437 11.7332,6.5778L11.7327,6.5778Z"
android:strokeColor="#FF9D3E" android:strokeWidth="1"/>
</vector>
...@@ -495,7 +495,6 @@ ...@@ -495,7 +495,6 @@
</LinearLayout> </LinearLayout>
<!--meditation start-->
<LinearLayout <LinearLayout
android:id="@+id/ll_meditation" android:id="@+id/ll_meditation"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -519,13 +518,30 @@ ...@@ -519,13 +518,30 @@
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<!--meditation end-->
<LinearLayout
<View android:id="@+id/ll_wiki"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" 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> </LinearLayout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment