Skip to content

Y
YDL-Component-Medical
Commit ef482ca4 by 刘鹏
Options

feat:我的页面UI还原，倾诉列表加入跳转99元3小时活动逻辑

parent 84e7b60f
Showing with 57 additions and 35 deletions
config.gradle
......@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.21",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.06",
"m-user" : "0.0.62.07",
"m-home" : "0.0.23.45",
"m-im" : "0.0.21.33",
"m-dynamic" : "0.0.7.37",
......@@ -93,7 +93,7 @@ ext {
"m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.21",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.06",
"m-user" : "0.0.62.07",
"m-home" : "0.0.23.45",
"m-im" : "0.0.21.33",
"m-dynamic" : "0.0.7.37",
......
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
......@@ -3,6 +3,9 @@ package com.yidianling.consultant.modular.singlton
import android.annotation.SuppressLint
import android.app.Activity
import androidx.appcompat.app.AppCompatActivity
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.LogUtil
......@@ -134,7 +137,6 @@ class ConsultAssistantDialogUtils private constructor() {
})
}
}
})
}
consultAssistantDialogFromHomePage?.show()
......@@ -170,7 +172,7 @@ class ConsultAssistantDialogUtils private constructor() {
ConsultantIn.getUserImpl().loginByOneKeyLoginCallBack(activity,true,object :LoginCallBackListener{
override fun loginSuccess() {
//获取用户uid
getConsultAssistantUid("", activity, 17)
jumpToDyOrH5(activity)
}
override fun notLogin() {
}
......@@ -183,6 +185,19 @@ class ConsultAssistantDialogUtils private constructor() {
confideListDialog?.show()
}
}
/**
* 倾诉列表页导医跳转，oppo vivo 跳转99元3小时活动
* */
private fun jumpToDyOrH5(activity: Activity) {
val channelName = PlatformDataManager.getRam().getChannelName()
if (channelName.contains("oppo") || channelName.contains("vivo")) {
//oppo vivo
NewH5Activity.start(activity, H5Params("https://m.ydl.com/zx/activity/lowPrice", null))
} else {
//去导医
getConsultAssistantUid("", activity, 17)
}
}
/**
* 倾诉列表页隐藏
......
m-user/src/main/res/drawable/user_mine_ic_mine_setting_info.xml
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M11.152,1.168C11.6775,1.168 12.194,1.2018 12.7007,1.2673C13.5956,2.8213 14.4191,3.8448 15.6227,4.4929C16.8082,5.1315 18.1493,5.29 19.3884,5.0326C20.6847,5.9875 21.2078,6.8205 21.6003,7.717C20.5979,9.1688 20.065,10.354 20.065,11.656C20.065,12.9573 20.5978,14.1425 21.4743,15.0309C21.2078,16.491 20.6847,17.3239 20.0555,18.0756C18.1495,18.0214 16.8083,18.1799 15.6228,18.8185C14.4191,19.4666 13.5956,20.4902 13.2123,21.6371C12.1944,22.1097 11.6777,22.144 11.152,22.144C10.6263,22.144 10.1096,22.1097 9.604,22.0448C8.7084,20.4902 7.8849,19.4666 6.6813,18.8185C5.4957,18.1799 4.1545,18.0214 2.9162,18.2793C1.6193,17.3239 1.0962,16.491 0.7037,15.5945C1.7062,14.1425 2.239,12.9573 2.239,11.656C2.239,10.354 1.7061,9.1688 0.83,8.2815C1.0962,6.8205 1.6193,5.9875 2.2485,5.2359C4.1547,5.29 5.4958,5.1315 6.6812,4.493C7.8849,3.8448 8.7084,2.8213 9.0917,1.6745C10.11,1.2018 10.6265,1.168 11.152,1.168Z"
android:strokeWidth="1.104"
android:fillColor="#00000000"
android:strokeColor="#FFFFFF"
android:fillType="evenOdd"/>
<path
android:pathData="M11.152,7.792C12.219,7.792 13.185,8.2245 13.8843,8.9237C14.5835,9.623 15.016,10.589 15.016,11.656C15.016,12.723 14.5835,13.689 13.8843,14.3883C13.185,15.0875 12.219,15.52 11.152,15.52C10.085,15.52 9.119,15.0875 8.4197,14.3883C7.7205,13.689 7.288,12.723 7.288,11.656C7.288,10.589 7.7205,9.623 8.4197,8.9237C9.119,8.2245 10.085,7.792 11.152,7.792Z"
android:strokeWidth="1.104"
android:fillColor="#00000000"
android:strokeColor="#FFFFFF"
android:fillType="evenOdd"/>
android:viewportWidth="23"
android:viewportHeight="23">
<path
android:fillColor="#00000000"
android:fillType="evenOdd"
android:pathData="M11.152,1.168C11.6775,1.168 12.194,1.2018 12.7007,1.2673C13.5956,2.8213 14.4191,3.8448 15.6227,4.4929C16.8082,5.1315 18.1493,5.29 19.3884,5.0326C20.6847,5.9875 21.2078,6.8205 21.6003,7.717C20.5979,9.1688 20.065,10.354 20.065,11.656C20.065,12.9573 20.5978,14.1425 21.4743,15.0309C21.2078,16.491 20.6847,17.3239 20.0555,18.0756C18.1495,18.0214 16.8083,18.1799 15.6228,18.8185C14.4191,19.4666 13.5956,20.4902 13.2123,21.6371C12.1944,22.1097 11.6777,22.144 11.152,22.144C10.6263,22.144 10.1096,22.1097 9.604,22.0448C8.7084,20.4902 7.8849,19.4666 6.6813,18.8185C5.4957,18.1799 4.1545,18.0214 2.9162,18.2793C1.6193,17.3239 1.0962,16.491 0.7037,15.5945C1.7062,14.1425 2.239,12.9573 2.239,11.656C2.239,10.354 1.7061,9.1688 0.83,8.2815C1.0962,6.8205 1.6193,5.9875 2.2485,5.2359C4.1547,5.29 5.4958,5.1315 6.6812,4.493C7.8849,3.8448 8.7084,2.8213 9.0917,1.6745C10.11,1.2018 10.6265,1.168 11.152,1.168Z"
android:strokeWidth="1.104"
android:strokeColor="#FFFFFF" />
<path
android:fillColor="#00000000"
android:fillType="evenOdd"
android:pathData="M11.152,7.792C12.219,7.792 13.185,8.2245 13.8843,8.9237C14.5835,9.623 15.016,10.589 15.016,11.656C15.016,12.723 14.5835,13.689 13.8843,14.3883C13.185,15.0875 12.219,15.52 11.152,15.52C10.085,15.52 9.119,15.0875 8.4197,14.3883C7.7205,13.689 7.288,12.723 7.288,11.656C7.288,10.589 7.7205,9.623 8.4197,8.9237C9.119,8.2245 10.085,7.792 11.152,7.792Z"
android:strokeWidth="1.104"
android:strokeColor="#FFFFFF" />
</vector>
m-user/src/main/res/drawable/user_mine_ic_share.xml
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20.9712,18.5604L20.9712,15.2415L20.9712,11.9039L20.9712,11.3466C20.9712,11.0554 20.7332,10.8081 20.4452,10.7924L20.3857,10.7924C20.0945,10.7924 19.8159,11.0492 19.8284,11.3497L19.8284,17.0794C19.8284,17.7463 19.8378,18.4132 19.8284,19.0801C19.8284,19.1083 19.8253,19.1396 19.8253,19.1678L19.8253,19.2053C19.819,19.2366 19.8033,19.268 19.7971,19.293C19.7908,19.318 19.7814,19.34 19.7752,19.365C19.747,19.4088 19.7251,19.4558 19.7,19.4996C19.6969,19.5028 19.6938,19.509 19.6906,19.5153C19.6812,19.5278 19.6687,19.5466 19.6625,19.5529C19.6311,19.5873 19.5967,19.6217 19.5623,19.6562C19.5497,19.6687 19.5372,19.6781 19.5247,19.6875C19.5216,19.6906 19.5184,19.6906 19.5122,19.6938C19.4652,19.7219 19.4182,19.7501 19.3681,19.7752C19.3462,19.7814 19.3274,19.7908 19.3055,19.7971C19.2617,19.8096 19.2147,19.819 19.1709,19.8284C19.1521,19.8284 19.1333,19.8315 19.1145,19.8315L2.9556,19.8315C2.5987,19.8315 2.2386,19.844 1.8817,19.8315L1.8347,19.8315C1.8285,19.8315 1.8222,19.8284 1.816,19.8253C1.769,19.8127 1.7189,19.8033 1.6719,19.7877C1.6657,19.7846 1.6469,19.7783 1.6344,19.7752C1.6344,19.7752 1.6312,19.7752 1.6312,19.772C1.5811,19.7439 1.5248,19.6969 1.4716,19.6781C1.4622,19.6687 1.4496,19.6593 1.4402,19.6499C1.4027,19.6155 1.3682,19.5779 1.3338,19.5403C1.3338,19.5435 1.3369,19.5466 1.3369,19.5466C1.3338,19.5435 1.3338,19.5403 1.3307,19.5372L1.3244,19.531C1.3119,19.5184 1.3025,19.4996 1.3025,19.4934C1.2993,19.4871 1.2931,19.4809 1.29,19.4746C1.268,19.4402 1.2493,19.4057 1.2336,19.3681C1.2461,19.3901 1.2086,19.2993 1.1992,19.2648C1.196,19.2523 1.1866,19.1991 1.1804,19.1678C1.1772,19.1364 1.1741,19.0832 1.1741,19.0676L1.1741,19.0394L1.1741,18.5917L1.1741,16.3906L1.1741,13.0279L1.1741,9.1862L1.1741,5.5982L1.1741,2.9368C1.1741,2.5705 1.1772,2.2042 1.1772,1.8347L1.1772,1.8191C1.1804,1.8003 1.1866,1.7784 1.1898,1.769C1.2023,1.722 1.2179,1.6782 1.2305,1.6312C1.2367,1.6187 1.243,1.6031 1.2493,1.5905C1.2618,1.5655 1.2774,1.5436 1.29,1.5185C1.2931,1.5154 1.2993,1.5029 1.3056,1.4903C1.3087,1.4903 1.3651,1.4183 1.3776,1.4027C1.4058,1.3745 1.434,1.3494 1.4622,1.3244C1.4622,1.3244 1.5091,1.29 1.5404,1.2743C1.5655,1.2618 1.5874,1.2461 1.6124,1.2336C1.6187,1.2305 1.6218,1.2273 1.6281,1.2242C1.6688,1.2117 1.7095,1.196 1.7533,1.1866C1.7784,1.1804 1.8003,1.1772 1.8254,1.171C1.8598,1.171 1.8974,1.1678 1.9318,1.1678L10.0504,1.1678C10.351,1.1678 10.6077,0.9142 10.6077,0.6105L10.6077,0.5792C10.6077,0.2787 10.3541,0.0219 10.0504,0.0219L4.2706,0.0219C3.4973,0.0219 2.7239,0.0188 1.9475,0.0219C1.0739,0.025 0.2411,0.6356 0.0689,1.5154C0.0282,1.7314 0.025,1.9318 0.025,2.1447L0.025,17.7964C0.025,18.2159 0.0188,18.6355 0.025,19.0582C0.0344,19.9505 0.6763,20.7896 1.5811,20.9305C1.7784,20.9618 1.9631,20.9649 2.1604,20.9649L17.8183,20.9649C18.2347,20.9649 18.648,20.9712 19.0644,20.9649C20.0507,20.9524 20.8522,20.2135 20.9587,19.2398C20.9869,19.0206 20.9712,18.7858 20.9712,18.5604L20.9712,18.5604ZM1.8446,19.8596L1.8246,19.8596L1.8446,19.8596ZM1.3709,19.6198C1.3709,19.6198 1.3709,19.6124 1.3709,19.6198C1.3309,19.5829 1.3109,19.5535 1.2809,19.524C1.2809,19.5092 1.3009,19.5313 1.3709,19.6198Z"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M1.0947,19.5827C1.0247,19.4935 0.9947,19.4729 1.0047,19.4866C1.0247,19.5141 1.0647,19.5484 1.0947,19.5827ZM9.5325,10.3358L9.5168,10.3515C9.1724,10.6959 9.4323,11.2939 9.9113,11.3002L9.9551,11.3002C10.0178,11.3002 10.0835,11.2876 10.143,11.2657C10.2181,11.2407 10.287,11.1968 10.3496,11.1373C10.6753,10.8149 10.9978,10.4924 11.3234,10.1667C12.0967,9.3997 12.8669,8.6294 13.6403,7.8624C14.5827,6.9262 15.522,5.99 16.4644,5.0539C17.2753,4.2461 18.0863,3.4414 18.8972,2.6336C19.107,2.4239 19.3199,2.2204 19.5328,2.0106L19.5328,5.8711C19.5328,6.1716 19.7864,6.4284 20.0901,6.4284L20.1214,6.4284C20.422,6.4284 20.6787,6.1748 20.6787,5.8711L20.6787,2.1264C20.6787,1.8196 20.6662,1.519 20.5503,1.231C20.2654,0.5296 19.6267,0.0631 18.869,0.0162C18.3179,-0.0183 17.7544,0.013 17.2033,0.013L15.2183,0.013C14.9177,0.013 14.661,0.2666 14.661,0.5703L14.661,0.6017C14.661,0.9022 14.9146,1.159 15.2183,1.159C16.4018,1.159 17.5853,1.1433 18.7688,1.159L18.3273,1.6004C17.5509,2.3738 16.7713,3.1471 15.9948,3.9205C15.0555,4.8566 14.1131,5.7928 13.1738,6.7289C12.3597,7.5367 11.5457,8.3477 10.7348,9.1554C10.3246,9.5468 9.9113,9.9288 9.5325,10.3358Z"
android:strokeWidth="1"
android:fillColor="#ffffff"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:fillAlpha="0"
android:fillColor="#D8D8D8"
android:fillType="evenOdd"
android:pathData="M0,0h23v23h-23z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
<path
android:fillColor="#ffffff"
android:fillType="nonZero"
android:pathData="M21.9712,19.5604L21.9712,16.2415L21.9712,12.9039L21.9712,12.3466C21.9712,12.0554 21.7332,11.8081 21.4452,11.7924L21.3857,11.7924C21.0945,11.7924 20.8159,12.0492 20.8284,12.3497L20.8284,18.0794C20.8284,18.7463 20.8378,19.4132 20.8284,20.0801C20.8284,20.1083 20.8253,20.1396 20.8253,20.1678L20.8253,20.2053C20.819,20.2366 20.8033,20.268 20.7971,20.293C20.7908,20.318 20.7814,20.34 20.7752,20.365C20.747,20.4088 20.7251,20.4558 20.7,20.4996C20.6969,20.5028 20.6938,20.509 20.6906,20.5153C20.6812,20.5278 20.6687,20.5466 20.6625,20.5529C20.6311,20.5873 20.5967,20.6217 20.5623,20.6562C20.5497,20.6687 20.5372,20.6781 20.5247,20.6875C20.5216,20.6906 20.5184,20.6906 20.5122,20.6938C20.4652,20.7219 20.4182,20.7501 20.3681,20.7752C20.3462,20.7814 20.3274,20.7908 20.3055,20.7971C20.2617,20.8096 20.2147,20.819 20.1709,20.8284C20.1521,20.8284 20.1333,20.8315 20.1145,20.8315L3.9556,20.8315C3.5987,20.8315 3.2386,20.844 2.8817,20.8315L2.8347,20.8315C2.8285,20.8315 2.8222,20.8284 2.816,20.8253C2.769,20.8127 2.7189,20.8033 2.6719,20.7877C2.6657,20.7846 2.6469,20.7783 2.6344,20.7752C2.6344,20.7752 2.6312,20.7752 2.6312,20.772C2.5811,20.7439 2.5248,20.6969 2.4716,20.6781C2.4622,20.6687 2.4496,20.6593 2.4402,20.6499C2.4027,20.6155 2.3682,20.5779 2.3338,20.5403C2.3338,20.5435 2.3369,20.5466 2.3369,20.5466C2.3338,20.5435 2.3338,20.5403 2.3307,20.5372L2.3244,20.531C2.3119,20.5184 2.3025,20.4996 2.3025,20.4934C2.2994,20.4871 2.2931,20.4809 2.29,20.4746C2.268,20.4402 2.2493,20.4057 2.2336,20.3681C2.2461,20.3901 2.2086,20.2993 2.1992,20.2648C2.196,20.2523 2.1866,20.1991 2.1804,20.1678C2.1772,20.1364 2.1741,20.0832 2.1741,20.0676L2.1741,20.0394L2.1741,19.5917L2.1741,17.3906L2.1741,14.0279L2.1741,10.1862L2.1741,6.5982L2.1741,3.9368C2.1741,3.5705 2.1772,3.2042 2.1772,2.8347L2.1772,2.8191C2.1804,2.8003 2.1866,2.7784 2.1898,2.769C2.2023,2.722 2.2179,2.6782 2.2305,2.6312C2.2367,2.6187 2.243,2.6031 2.2493,2.5905C2.2618,2.5655 2.2774,2.5436 2.29,2.5185C2.2931,2.5154 2.2994,2.5029 2.3056,2.4903C2.3087,2.4903 2.3651,2.4183 2.3776,2.4027C2.4058,2.3745 2.434,2.3494 2.4622,2.3244C2.4622,2.3244 2.5091,2.29 2.5404,2.2743C2.5655,2.2618 2.5874,2.2461 2.6124,2.2336C2.6187,2.2305 2.6218,2.2273 2.6281,2.2242C2.6688,2.2117 2.7095,2.196 2.7533,2.1866C2.7784,2.1804 2.8003,2.1772 2.8254,2.171C2.8598,2.171 2.8974,2.1678 2.9318,2.1678L11.0504,2.1678C11.351,2.1678 11.6077,1.9142 11.6077,1.6105L11.6077,1.5792C11.6077,1.2787 11.3541,1.0219 11.0504,1.0219L5.2706,1.0219C4.4973,1.0219 3.7239,1.0188 2.9475,1.0219C2.0739,1.025 1.2411,1.6356 1.0689,2.5154C1.0282,2.7314 1.025,2.9318 1.025,3.1447L1.025,18.7964C1.025,19.2159 1.0188,19.6355 1.025,20.0582C1.0344,20.9505 1.6763,21.7896 2.5811,21.9305C2.7784,21.9618 2.9631,21.9649 3.1604,21.9649L18.8183,21.9649C19.2347,21.9649 19.648,21.9712 20.0644,21.9649C21.0507,21.9524 21.8522,21.2135 21.9587,20.2398C21.9869,20.0206 21.9712,19.7858 21.9712,19.5604L21.9712,19.5604ZM2.8446,20.8596L2.8246,20.8596L2.8446,20.8596ZM2.3709,20.6198C2.3709,20.6198 2.3709,20.6124 2.3709,20.6198C2.3309,20.5829 2.3109,20.5535 2.2809,20.524C2.2809,20.5092 2.3009,20.5313 2.3709,20.6198Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
<path
android:fillColor="#ffffff"
android:fillType="nonZero"
android:pathData="M2.0947,20.5827C2.0247,20.4935 1.9947,20.4729 2.0047,20.4866C2.0247,20.5141 2.0647,20.5484 2.0947,20.5827ZM10.5325,11.3358L10.5168,11.3515C10.1724,11.6959 10.4323,12.2939 10.9113,12.3002L10.9551,12.3002C11.0178,12.3002 11.0835,12.2876 11.143,12.2657C11.2181,12.2407 11.287,12.1968 11.3496,12.1373C11.6753,11.8149 11.9978,11.4924 12.3234,11.1667C13.0967,10.3997 13.8669,9.6294 14.6403,8.8624C15.5827,7.9262 16.522,6.99 17.4644,6.0539C18.2753,5.2461 19.0863,4.4414 19.8972,3.6336C20.107,3.4239 20.3199,3.2204 20.5328,3.0106L20.5328,6.8711C20.5328,7.1716 20.7864,7.4284 21.0901,7.4284L21.1214,7.4284C21.422,7.4284 21.6787,7.1748 21.6787,6.8711L21.6787,3.1264C21.6787,2.8196 21.6662,2.519 21.5503,2.231C21.2654,1.5296 20.6267,1.0631 19.869,1.0162C19.3179,0.9817 18.7544,1.013 18.2033,1.013L16.2183,1.013C15.9177,1.013 15.661,1.2666 15.661,1.5703L15.661,1.6017C15.661,1.9022 15.9146,2.159 16.2183,2.159C17.4018,2.159 18.5853,2.1433 19.7688,2.159L19.3273,2.6004C18.5509,3.3738 17.7713,4.1471 16.9948,4.9205C16.0555,5.8566 15.1131,6.7928 14.1738,7.7289C13.3597,8.5367 12.5457,9.3477 11.7348,10.1554C11.3246,10.5468 10.9113,10.9288 10.5325,11.3358Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
m-user/src/main/res/layout/user_mine_fragment_mine.xml
......@@ -43,7 +43,7 @@
android:id="@+id/iv_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="34dp"
android:layout_marginTop="35dp"
android:layout_marginEnd="15dp"
android:layout_toLeftOf="@id/iv_edit_info"
android:padding="5dp"
......
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