Skip to content

Y
YDL-Component-Medical
Commit 84e7b60f by 刘鹏
Options

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

# Conflicts:
#	config.gradle
parents 884f0220 cbc1683a
Showing with 97 additions and 74 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.04",
"m-user" : "0.0.62.06",
"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.04",
"m-user" : "0.0.62.06",
"m-home" : "0.0.23.45",
"m-im" : "0.0.21.33",
"m-dynamic" : "0.0.7.37",
......
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
......@@ -43,6 +43,7 @@ import com.yidianling.user.api.event.RefreshRecentContactListEvent;
import com.yidianling.user.api.service.IAppService;
import com.yidianling.user.mine.data.AppDataManager;
import com.yidianling.user.mine.http.MineHttpImpl;
import com.yidianling.user.route.UserIn;
import com.yidianling.user.safePrivate.PrivacyActivity;
import com.yidianling.user.ui.login.OneKeyLoginHelp;
......@@ -79,11 +80,9 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
ImageView img_bg;
BorderCircleImageView img_head;
TextView text_userName;
JumpTextView jtv_account_setting;
JumpTextView jtv_account_privacy;
JumpTextView jtv_account_help;
JumpTextView jtv_about_us;
JumpTextView jtv_account_share;
JumpTextView jtv_account_enter;
TextView tishi;
......@@ -136,11 +135,9 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
mTendNumTv = getRootView().findViewById(R.id.tv_trend_num);
mFansNumTv = getRootView().findViewById(R.id.tv_fans_tv);
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_help = getRootView().findViewById(R.id.jtv_account_help);
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_test = getRootView().findViewById(R.id.jtv_test);
tishi = getRootView().findViewById(R.id.tishi);
......@@ -148,12 +145,10 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
mLogoView = getRootView().findViewById(R.id.iv_mine_logo);
img_head.setOnClickListener(this);
mChangeBtn.setOnClickListener(this);
jtv_account_setting.setOnClickListener(this);
jtv_account_privacy.setOnClickListener(this);
jtv_account_help.setOnClickListener(this);
jtv_about_us.setOnClickListener(this);
jtv_account_enter.setOnClickListener(this);
jtv_account_share.setOnClickListener(this);
mDurationCardView.setOnClickListener(this);
text_userName.setOnClickListener(this);
jtv_test.setOnClickListener(this);
......@@ -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.jtv_introduce).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_red_packet).setOnClickListener(this);
getRootView().findViewById(R.id.ll_call_order).setOnClickListener(this);
......@@ -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_fans).setOnClickListener(this);
getRootView().findViewById(R.id.ll_my_test_log).setOnClickListener(this);
//客服
getRootView().findViewById(R.id.ll_service).setOnClickListener(this);
init();
......@@ -387,14 +386,14 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
int id = v.getId();//切换环境逻辑按钮
if (id == R.id.text_userName || id == R.id.cv_duration) {
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)) {
return;
}
if (userInfoData != null) {
Intent intentuser = new Intent(getActivity(), PersonalInfoActivity.class);
startActivity(intentuser);
}
startActivity(new Intent(getActivity(), AccountSettingActivity.class));
} else if (id == R.id.img_head) {//头像
if (Utils.isFastClick()) {
return;
......@@ -448,13 +447,6 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
startActivity(intentm);
} 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) {// 未登录请先登录
ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"帮助中心");
if (!OneKeyLoginHelp.INSTANCE.startLoginByStatus(mActivity,true)) {
......@@ -515,11 +507,16 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
.burryPoint("mine");
H5Params testParam = new H5Params(HttpConfig.Companion.getMH5_URL() + "ceshi/my-test", "测试记录");
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,"分享");
share();
} else if (id == R.id.jtv_about_us) {
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) {
ActionCountUtils.Companion.count(YDL_USER_MY_BOTTOM_TYPE_CLICK,"壹点灵介绍");
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="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"/>
</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="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"/>
</vector>
m-user/src/main/res/layout/user_mine_fragment_mine.xml
......@@ -26,7 +26,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="240dp">
android:layout_height="250dp">
<ImageView
android:id="@+id/img_bg"
......@@ -39,14 +39,23 @@
android:scaleType="centerCrop"
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="34dp"
android:layout_marginEnd="15dp"
android:layout_toLeftOf="@id/iv_edit_info"
android:padding="5dp"
android:src="@drawable/user_mine_ic_share" />
<ImageView
android:id="@+id/iv_edit_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="36dp"
android:layout_marginRight="27dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="34dp"
android:layout_marginEnd="27dp"
android:padding="5dp"
android:src="@drawable/user_mine_ic_mine_setting_info" />
......@@ -66,7 +75,7 @@
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="50dp"
android:layout_marginTop="60dp"
android:src="@drawable/platform_head_place_hold_pic"
myapp:pa_border_color="@color/white"
myapp:pa_border_width="2dp" />
......@@ -81,7 +90,7 @@
android:layout_toRightOf="@+id/img_head"
android:textColor="@color/white"
android:textSize="22sp"
tools:text="用户A" />
tools:text="用户A用户A用户A用户A用户" />
<androidx.cardview.widget.CardView
......@@ -427,10 +436,34 @@
</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
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3" />
android:layout_weight="2" />
</LinearLayout>
......@@ -478,19 +511,6 @@
app:pa_jump_tv_right_size="10sp"
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
style="@style/user_new_divide_color_style"
......@@ -520,34 +540,6 @@
app:pa_jump_tv_left_size="12sp"
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
style="@style/user_new_divide_color_style"
android:background="#ebebeb" />
......@@ -563,12 +555,10 @@
app:pa_jump_tv_left_text="专家入驻"
app:pa_jump_tv_right_color="#b3b3b3"
app:pa_jump_tv_right_size="10sp" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<com.ydl.ydlcommon.view.JumpTextView
android:id="@+id/jtv_test"
android:layout_width="match_parent"
......@@ -584,11 +574,11 @@
<ImageView
android:id="@+id/iv_mine_logo"
android:layout_marginTop="20dp"
tools:src="@drawable/user_mine_ydl_logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@color/baby_blue"
android:layout_height="wrap_content"/>
tools:src="@drawable/user_mine_ydl_logo" />
</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