Skip to content

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

Merge branch 'feat/lp_4.3.92' into 'd/v4.3.92' 

Feat/lp 4.3.92

See merge request app_android_lib/YDL-Component!22
parents 714cc3de ef482ca4
Showing with 128 additions and 83 deletions
config.gradle
...@@ -5,11 +5,11 @@ ext { ...@@ -5,11 +5,11 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.72", "m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.21", "m-consultant" : "0.0.60.21",
"m-fm" : "0.0.30.08", "m-fm" : "0.0.30.08",
"m-user" : "0.0.62.04", "m-user" : "0.0.62.07",
"m-home" : "0.0.23.44", "m-home" : "0.0.23.45",
"m-im" : "0.0.21.33", "m-im" : "0.0.21.33",
"m-dynamic" : "0.0.7.48", "m-dynamic" : "0.0.7.48",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
...@@ -41,7 +41,7 @@ ext { ...@@ -41,7 +41,7 @@ ext {
"ydl-webview" : "0.0.38.62", "ydl-webview" : "0.0.38.62",
"ydl-media" : "0.0.21.44", "ydl-media" : "0.0.21.44",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.88", "m-audioim" : "0.0.49.29.90",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
...@@ -90,11 +90,11 @@ ext { ...@@ -90,11 +90,11 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.72", "m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.21", "m-consultant" : "0.0.60.21",
"m-fm" : "0.0.30.08", "m-fm" : "0.0.30.08",
"m-user" : "0.0.62.04", "m-user" : "0.0.62.07",
"m-home" : "0.0.23.41", "m-home" : "0.0.23.45",
"m-im" : "0.0.21.33", "m-im" : "0.0.21.33",
"m-dynamic" : "0.0.7.48", "m-dynamic" : "0.0.7.48",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
...@@ -124,7 +124,7 @@ ext { ...@@ -124,7 +124,7 @@ ext {
"ydl-webview" : "0.0.38.62", "ydl-webview" : "0.0.38.62",
"ydl-media" : "0.0.21.44", "ydl-media" : "0.0.21.44",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.88", "m-audioim" : "0.0.49.29.90",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
......
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
...@@ -3,6 +3,9 @@ package com.yidianling.consultant.modular.singlton ...@@ -3,6 +3,9 @@ package com.yidianling.consultant.modular.singlton
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import androidx.appcompat.app.AppCompatActivity 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.data.http.ThrowableConsumer
import com.ydl.ydlcommon.utils.ActivityManager import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.LogUtil import com.ydl.ydlcommon.utils.LogUtil
...@@ -134,7 +137,6 @@ class ConsultAssistantDialogUtils private constructor() { ...@@ -134,7 +137,6 @@ class ConsultAssistantDialogUtils private constructor() {
}) })
} }
} }
}) })
} }
consultAssistantDialogFromHomePage?.show() consultAssistantDialogFromHomePage?.show()
...@@ -170,7 +172,7 @@ class ConsultAssistantDialogUtils private constructor() { ...@@ -170,7 +172,7 @@ class ConsultAssistantDialogUtils private constructor() {
ConsultantIn.getUserImpl().loginByOneKeyLoginCallBack(activity,true,object :LoginCallBackListener{ ConsultantIn.getUserImpl().loginByOneKeyLoginCallBack(activity,true,object :LoginCallBackListener{
override fun loginSuccess() { override fun loginSuccess() {
//获取用户uid //获取用户uid
getConsultAssistantUid("", activity, 17) jumpToDyOrH5(activity)
} }
override fun notLogin() { override fun notLogin() {
} }
...@@ -183,6 +185,19 @@ class ConsultAssistantDialogUtils private constructor() { ...@@ -183,6 +185,19 @@ class ConsultAssistantDialogUtils private constructor() {
confideListDialog?.show() 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-home/src/ydl/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
...@@ -33,7 +33,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent: ...@@ -33,7 +33,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
fun setVisibilityFree(boolean: Boolean){ fun setVisibilityFree(boolean: Boolean){
if (boolean){ if (boolean){
qingsuGif.visibility=View.VISIBLE qingsuGif.visibility=View.VISIBLE
homeModuleButtonBannerSecondTitle.text = "免费倾诉" homeModuleButtonBannerSecondTitle.text = "免费热线"
}else{ }else{
qingsuGif.visibility=View.GONE qingsuGif.visibility=View.GONE
homeModuleButtonBannerSecondTitle.text = "倾诉热线" homeModuleButtonBannerSecondTitle.text = "倾诉热线"
......
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
...@@ -43,6 +43,7 @@ import com.yidianling.user.api.event.RefreshRecentContactListEvent; ...@@ -43,6 +43,7 @@ import com.yidianling.user.api.event.RefreshRecentContactListEvent;
import com.yidianling.user.api.service.IAppService; import com.yidianling.user.api.service.IAppService;
import com.yidianling.user.mine.data.AppDataManager; import com.yidianling.user.mine.data.AppDataManager;
import com.yidianling.user.mine.http.MineHttpImpl; import com.yidianling.user.mine.http.MineHttpImpl;
import com.yidianling.user.route.UserIn;
import com.yidianling.user.safePrivate.PrivacyActivity; import com.yidianling.user.safePrivate.PrivacyActivity;
import com.yidianling.user.ui.login.OneKeyLoginHelp; import com.yidianling.user.ui.login.OneKeyLoginHelp;
...@@ -79,11 +80,9 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -79,11 +80,9 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
ImageView img_bg; ImageView img_bg;
BorderCircleImageView img_head; BorderCircleImageView img_head;
TextView text_userName; TextView text_userName;
JumpTextView jtv_account_setting;
JumpTextView jtv_account_privacy; JumpTextView jtv_account_privacy;
JumpTextView jtv_account_help; JumpTextView jtv_account_help;
JumpTextView jtv_about_us; JumpTextView jtv_about_us;
JumpTextView jtv_account_share;
JumpTextView jtv_account_enter; JumpTextView jtv_account_enter;
TextView tishi; TextView tishi;
...@@ -136,11 +135,9 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -136,11 +135,9 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
mTendNumTv = getRootView().findViewById(R.id.tv_trend_num); mTendNumTv = getRootView().findViewById(R.id.tv_trend_num);
mFansNumTv = getRootView().findViewById(R.id.tv_fans_tv); mFansNumTv = getRootView().findViewById(R.id.tv_fans_tv);
mTestRecordNumTv = getRootView().findViewById(R.id.tv_test_record_num); mTestRecordNumTv = getRootView().findViewById(R.id.tv_test_record_num);
jtv_account_setting = getRootView().findViewById(R.id.jtv_account_setting);
jtv_account_privacy = getRootView().findViewById(R.id.jtv_account_privacy); jtv_account_privacy = getRootView().findViewById(R.id.jtv_account_privacy);
jtv_account_help = getRootView().findViewById(R.id.jtv_account_help); jtv_account_help = getRootView().findViewById(R.id.jtv_account_help);
jtv_about_us = getRootView().findViewById(R.id.jtv_about_us); jtv_about_us = getRootView().findViewById(R.id.jtv_about_us);
jtv_account_share = getRootView().findViewById(R.id.jtv_account_share);
jtv_account_enter = getRootView().findViewById(R.id.jtv_account_enter); jtv_account_enter = getRootView().findViewById(R.id.jtv_account_enter);
jtv_test = getRootView().findViewById(R.id.jtv_test); jtv_test = getRootView().findViewById(R.id.jtv_test);
tishi = getRootView().findViewById(R.id.tishi); tishi = getRootView().findViewById(R.id.tishi);
...@@ -148,12 +145,10 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -148,12 +145,10 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
mLogoView = getRootView().findViewById(R.id.iv_mine_logo); mLogoView = getRootView().findViewById(R.id.iv_mine_logo);
img_head.setOnClickListener(this); img_head.setOnClickListener(this);
mChangeBtn.setOnClickListener(this); mChangeBtn.setOnClickListener(this);
jtv_account_setting.setOnClickListener(this);
jtv_account_privacy.setOnClickListener(this); jtv_account_privacy.setOnClickListener(this);
jtv_account_help.setOnClickListener(this); jtv_account_help.setOnClickListener(this);
jtv_about_us.setOnClickListener(this); jtv_about_us.setOnClickListener(this);
jtv_account_enter.setOnClickListener(this); jtv_account_enter.setOnClickListener(this);
jtv_account_share.setOnClickListener(this);
mDurationCardView.setOnClickListener(this); mDurationCardView.setOnClickListener(this);
text_userName.setOnClickListener(this); text_userName.setOnClickListener(this);
jtv_test.setOnClickListener(this); jtv_test.setOnClickListener(this);
...@@ -161,6 +156,8 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -161,6 +156,8 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
getRootView().findViewById(R.id.ll_trade_order).setOnClickListener(this); getRootView().findViewById(R.id.ll_trade_order).setOnClickListener(this);
getRootView().findViewById(R.id.jtv_introduce).setOnClickListener(this); getRootView().findViewById(R.id.jtv_introduce).setOnClickListener(this);
getRootView().findViewById(R.id.iv_edit_info).setOnClickListener(this); getRootView().findViewById(R.id.iv_edit_info).setOnClickListener(this);
//分享
getRootView().findViewById(R.id.iv_share).setOnClickListener(this);
getRootView().findViewById(R.id.ll_my_courses).setOnClickListener(this); getRootView().findViewById(R.id.ll_my_courses).setOnClickListener(this);
getRootView().findViewById(R.id.ll_red_packet).setOnClickListener(this); getRootView().findViewById(R.id.ll_red_packet).setOnClickListener(this);
getRootView().findViewById(R.id.ll_call_order).setOnClickListener(this); getRootView().findViewById(R.id.ll_call_order).setOnClickListener(this);
...@@ -169,6 +166,8 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -169,6 +166,8 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
getRootView().findViewById(R.id.ll_my_trends).setOnClickListener(this); getRootView().findViewById(R.id.ll_my_trends).setOnClickListener(this);
getRootView().findViewById(R.id.ll_fans).setOnClickListener(this); getRootView().findViewById(R.id.ll_fans).setOnClickListener(this);
getRootView().findViewById(R.id.ll_my_test_log).setOnClickListener(this); getRootView().findViewById(R.id.ll_my_test_log).setOnClickListener(this);
//客服
getRootView().findViewById(R.id.ll_service).setOnClickListener(this);
init(); init();
...@@ -387,14 +386,14 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -387,14 +386,14 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
int id = v.getId();//切换环境逻辑按钮 int id = v.getId();//切换环境逻辑按钮
if (id == R.id.text_userName || id == R.id.cv_duration) { if (id == R.id.text_userName || id == R.id.cv_duration) {
OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true); OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true);
} else if (id == R.id.iv_edit_info) {//修改资料 } else if (id == R.id.iv_edit_info) {
//账号设置
ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"设置");
//点击消息 未登录请先登录
if (!OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true)) { if (!OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true)) {
return; return;
} }
if (userInfoData != null) { startActivity(new Intent(getActivity(), AccountSettingActivity.class));
Intent intentuser = new Intent(getActivity(), PersonalInfoActivity.class);
startActivity(intentuser);
}
} else if (id == R.id.img_head) {//头像 } else if (id == R.id.img_head) {//头像
if (Utils.isFastClick()) { if (Utils.isFastClick()) {
return; return;
...@@ -448,13 +447,6 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -448,13 +447,6 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
startActivity(intentm); startActivity(intentm);
} catch (Exception e) { } catch (Exception e) {
} }
} else if (id == R.id.jtv_account_setting) {//账号设置
ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"设置");
//点击消息 未登录请先登录
if (!OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true)) {
return;
}
startActivity(new Intent(getActivity(), AccountSettingActivity.class));
} else if (id == R.id.jtv_account_privacy) {// 未登录请先登录 } else if (id == R.id.jtv_account_privacy) {// 未登录请先登录
ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"帮助中心"); ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"帮助中心");
if (!OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true)) { if (!OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true)) {
...@@ -515,11 +507,16 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -515,11 +507,16 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
.burryPoint("mine"); .burryPoint("mine");
H5Params testParam = new H5Params(HttpConfig.Companion.getMH5_URL() + "ceshi/my-test", "测试记录"); H5Params testParam = new H5Params(HttpConfig.Companion.getMH5_URL() + "ceshi/my-test", "测试记录");
NewH5Activity.start(getActivity(), testParam); NewH5Activity.start(getActivity(), testParam);
} else if (id == R.id.jtv_account_share) {//分享 } else if (id == R.id.iv_share) {//分享
ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"分享"); ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"分享");
share(); share();
} else if (id == R.id.jtv_about_us) { } else if (id == R.id.jtv_about_us) {
startActivity(new Intent(getActivity(), AboutUsActivity.class)); startActivity(new Intent(getActivity(), AboutUsActivity.class));
} else if (id == R.id.ll_service) {
if (!OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true)) {
return;
}
UserIn.INSTANCE.getImService().startP2PXiaoYi(mActivity);
} else if (id == R.id.jtv_introduce) { } else if (id == R.id.jtv_introduce) {
ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"壹点灵介绍"); ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"壹点灵介绍");
H5Params params1 = new H5Params("https://m.yidianling.com/about", "网站介绍"); H5Params params1 = new H5Params("https://m.yidianling.com/about", "网站介绍");
......
m-user/src/main/res/drawable/user_mine_ic_mine_setting_info.xml 0 → 100644
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
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 0 → 100644
<vector xmlns:android="http://schemas.android.com/apk/res/android"
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
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="240dp"> android:layout_height="250dp">
<ImageView <ImageView
android:id="@+id/img_bg" android:id="@+id/img_bg"
...@@ -39,14 +39,23 @@ ...@@ -39,14 +39,23 @@
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/user_mine_profile_bg_11" /> android:src="@drawable/user_mine_profile_bg_11" />
<ImageView
android:id="@+id/iv_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="35dp"
android:layout_marginEnd="15dp"
android:layout_toLeftOf="@id/iv_edit_info"
android:padding="5dp"
android:src="@drawable/user_mine_ic_share" />
<ImageView <ImageView
android:id="@+id/iv_edit_info" android:id="@+id/iv_edit_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="36dp" android:layout_marginTop="34dp"
android:layout_marginRight="27dp" android:layout_marginEnd="27dp"
android:padding="5dp" android:padding="5dp"
android:src="@drawable/user_mine_ic_mine_setting_info" /> android:src="@drawable/user_mine_ic_mine_setting_info" />
...@@ -66,7 +75,7 @@ ...@@ -66,7 +75,7 @@
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="50dp" android:layout_marginTop="60dp"
android:src="@drawable/platform_head_place_hold_pic" android:src="@drawable/platform_head_place_hold_pic"
myapp:pa_border_color="@color/white" myapp:pa_border_color="@color/white"
myapp:pa_border_width="2dp" /> myapp:pa_border_width="2dp" />
...@@ -81,7 +90,7 @@ ...@@ -81,7 +90,7 @@
android:layout_toRightOf="@+id/img_head" android:layout_toRightOf="@+id/img_head"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="22sp" android:textSize="22sp"
tools:text="用户A" /> tools:text="用户A用户A用户A用户A用户" />
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
...@@ -427,10 +436,34 @@ ...@@ -427,10 +436,34 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/ll_service"
android:layout_width="0dp"
android:layout_height="wrap_content"
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_service" />
<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>
<View <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="3" /> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
...@@ -478,19 +511,6 @@ ...@@ -478,19 +511,6 @@
app:pa_jump_tv_right_size="10sp" app:pa_jump_tv_right_size="10sp"
app:pa_jump_tv_right_text="设置手势密码，保障隐私安全" /> app:pa_jump_tv_right_text="设置手势密码，保障隐私安全" />
<View
style="@style/user_new_divide_color_style"
android:background="#ebebeb" />
<com.ydl.ydlcommon.view.JumpTextView
android:id="@+id/jtv_account_setting"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
app:pa_jump_tv_icon="@drawable/user_mine_ic_mine_setting"
app:pa_jump_tv_left_color="@color/platform_color_999999"
app:pa_jump_tv_left_size="12sp"
app:pa_jump_tv_left_text="设置" />
<View <View
style="@style/user_new_divide_color_style" style="@style/user_new_divide_color_style"
...@@ -520,34 +540,6 @@ ...@@ -520,34 +540,6 @@
app:pa_jump_tv_left_size="12sp" app:pa_jump_tv_left_size="12sp"
app:pa_jump_tv_left_text="关于我们" /> app:pa_jump_tv_left_text="关于我们" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="20dp"
android:layout_marginRight="14dp"
android:elevation="4dp"
app:cardCornerRadius="6dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.ydl.ydlcommon.view.JumpTextView
android:id="@+id/jtv_account_share"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
app:pa_jump_tv_icon="@drawable/user_mine_ic_mine_share"
app:pa_jump_tv_left_color="@color/platform_color_999999"
app:pa_jump_tv_left_size="12sp"
app:pa_jump_tv_left_text="分享" />
<View <View
style="@style/user_new_divide_color_style" style="@style/user_new_divide_color_style"
android:background="#ebebeb" /> android:background="#ebebeb" />
...@@ -563,12 +555,10 @@ ...@@ -563,12 +555,10 @@
app:pa_jump_tv_left_text="专家入驻" app:pa_jump_tv_left_text="专家入驻"
app:pa_jump_tv_right_color="#b3b3b3" app:pa_jump_tv_right_color="#b3b3b3"
app:pa_jump_tv_right_size="10sp" /> app:pa_jump_tv_right_size="10sp" />
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<com.ydl.ydlcommon.view.JumpTextView <com.ydl.ydlcommon.view.JumpTextView
android:id="@+id/jtv_test" android:id="@+id/jtv_test"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -584,11 +574,11 @@ ...@@ -584,11 +574,11 @@
<ImageView <ImageView
android:id="@+id/iv_mine_logo" android:id="@+id/iv_mine_logo"
android:layout_marginTop="20dp"
tools:src="@drawable/user_mine_ydl_logo"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@color/baby_blue" android:background="@color/baby_blue"
android:layout_height="wrap_content"/> tools:src="@drawable/user_mine_ydl_logo" />
</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