Skip to content

Y
YDL-Component-Medical
Commit 9a54da45 by 严久程
Options

Merge branch 'dev' into 导医增加广告入口 

# Conflicts:
#	config.gradle
parents 7781a8ff 8f259791
Showing with 344 additions and 281 deletions
m-home/src/ydl/java/com/yidianling/home/adapter/YdlHomeAdapter.kt
...@@ -6,6 +6,8 @@ import android.support.v7.widget.RecyclerView ...@@ -6,6 +6,8 @@ import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView
import com.ydl.ydl_image.module.GlideApp
import com.yidianling.home.R import com.yidianling.home.R
import com.yidianling.home.constract.HomeViewConfig import com.yidianling.home.constract.HomeViewConfig
import com.yidianling.home.event.HomeImpl import com.yidianling.home.event.HomeImpl
...@@ -281,5 +283,12 @@ class YdlHomeAdapter(private val mContext: Context, ...@@ -281,5 +283,12 @@ class YdlHomeAdapter(private val mContext: Context,
/** /**
* 底部提示语模块 ViewHolder * 底部提示语模块 ViewHolder
*/ */
inner class FooterViewViewHolder(val footerView: View,val viewType:Int) : RecyclerView.ViewHolder(footerView) inner class FooterViewViewHolder(val footerView: View,val viewType:Int) : RecyclerView.ViewHolder(footerView){
var imageLogoView:ImageView?=null
init {
imageLogoView=footerView.findViewById(R.id.iv_logo_view);
GlideApp.with(mContext).load("https://static.yidianling.com/banner/bottombanner@2x.png").into(imageLogoView);
}
}
} }
\ No newline at end of file
m-home/src/ydl/res/layout/home_footer_view.xml
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/iv_logo_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/baby_blue" android:background="@color/baby_blue"
android:scaleType="centerCrop" />
android:src="@drawable/home_ydl_logo" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
...@@ -84,6 +84,7 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -84,6 +84,7 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
private TextView mDurationTv; private TextView mDurationTv;
private TextView mFansNumTv; private TextView mFansNumTv;
private View mNewCoupon; private View mNewCoupon;
private ImageView mLogoView;
private TextView mTestRecordNumTv; private TextView mTestRecordNumTv;
//debug包下切换环境的按钮 //debug包下切换环境的按钮
private Button mChangeBtn; private Button mChangeBtn;
...@@ -133,6 +134,7 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -133,6 +134,7 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
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);
mNewCoupon = getRootView().findViewById(R.id.view_new_coupon); mNewCoupon = getRootView().findViewById(R.id.view_new_coupon);
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_setting.setOnClickListener(this);
...@@ -160,6 +162,8 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR ...@@ -160,6 +162,8 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
init(); init();
GlideApp.with(this).load("https://static.yidianling.com/banner/bottombanner@2x.png").into(mLogoView);
// jtv_test.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE); // jtv_test.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
refreshCouponData(); refreshCouponData();
......
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
...@@ -26,11 +26,9 @@ import com.tbruyelle.rxpermissions2.RxPermissions ...@@ -26,11 +26,9 @@ import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.socialize.UMShareAPI import com.umeng.socialize.UMShareAPI
import com.umeng.socialize.UMShareConfig import com.umeng.socialize.UMShareConfig
import com.umeng.socialize.bean.SHARE_MEDIA import com.umeng.socialize.bean.SHARE_MEDIA
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.base.BaseApp import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.BaseMvpActivity import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.utils.ActivityManager import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.StatusBarUtils import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.YDLCacheUtils import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
...@@ -45,7 +43,6 @@ import com.yidianling.user.UserHelper ...@@ -45,7 +43,6 @@ import com.yidianling.user.UserHelper
import com.yidianling.user.api.bean.UserResponseBean import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.bean.AliAuthBean import com.yidianling.user.bean.AliAuthBean
import com.yidianling.user.constants.UserBIConstants import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.UserHttpImpl
import com.yidianling.user.http.request.BindPhoneJavaParam import com.yidianling.user.http.request.BindPhoneJavaParam
import com.yidianling.user.http.request.PhoneLoginAutoParam import com.yidianling.user.http.request.PhoneLoginAutoParam
import com.yidianling.user.http.response.ChcekPhoneResponeBean import com.yidianling.user.http.response.ChcekPhoneResponeBean
...@@ -56,8 +53,6 @@ import com.yidianling.user.safePrivate.HandUnlockCheckActivity ...@@ -56,8 +53,6 @@ import com.yidianling.user.safePrivate.HandUnlockCheckActivity
import com.yidianling.user.ui.CountryListActivity import com.yidianling.user.ui.CountryListActivity
import com.yidianling.user.ui.login.contract.ILoginContract import com.yidianling.user.ui.login.contract.ILoginContract
import com.yidianling.user.ui.login.presenter.LoginPresenterImpl import com.yidianling.user.ui.login.presenter.LoginPresenterImpl
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.user_activity_register_and_login.* import kotlinx.android.synthetic.main.user_activity_register_and_login.*
/** /**
...@@ -86,7 +81,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -86,7 +81,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
private var countryCode: String? = "0086"//国家或地区手机区号 private var countryCode: String? = "0086"//国家或地区手机区号
private var handler: Handler? = null private var handler: Handler? = null
private var isFromGuide = false//是否来自启动页 private var isFromGuide = false//是否来自启动页
private var isAgreeProtocol =false
companion object { companion object {
private var BIND_PHONE = "bind_phone"//用于判断时候是绑定手机号 private var BIND_PHONE = "bind_phone"//用于判断时候是绑定手机号
private var IS_FROM_GUIDE = "isFromGuide"//是否来自启动页 private var IS_FROM_GUIDE = "isFromGuide"//是否来自启动页
...@@ -140,6 +135,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -140,6 +135,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.platform_color_075b66) StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.platform_color_075b66)
} }
@SuppressLint("CheckResult")
private fun requestPermission() { private fun requestPermission() {
val rxPermissions = RxPermissions(this) val rxPermissions = RxPermissions(this)
rxPermissions.requestEach(Manifest.permission.READ_PHONE_STATE) rxPermissions.requestEach(Manifest.permission.READ_PHONE_STATE)
...@@ -303,7 +299,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -303,7 +299,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
if (isUmengLoginState) { if (isUmengLoginState) {
tv_skip.visibility = View.VISIBLE tv_skip.visibility = View.VISIBLE
tv_des.text = "首次绑定即送大礼包" // tv_des.text = "首次绑定即送大礼包"
tv_des.visibility=View.GONE
iv_select_protocol.visibility=View.GONE
tv_des_first.visibility=View.VISIBLE
iv_weixin.visibility = View.GONE iv_weixin.visibility = View.GONE
iv_qq.visibility = View.GONE iv_qq.visibility = View.GONE
tv_reg_title.text = "手机号绑定" tv_reg_title.text = "手机号绑定"
...@@ -369,6 +368,16 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -369,6 +368,16 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
RxKeyboardTool.hideSoftInput(this) RxKeyboardTool.hideSoftInput(this)
onBackPressed() onBackPressed()
} }
view_click.setOnClickListener {
if(iv_select_protocol.visibility==View.VISIBLE){
isAgreeProtocol=!isAgreeProtocol
if(isAgreeProtocol){
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_selected)
}else{
iv_select_protocol.setImageResource(R.drawable.user_login_protocol_unselected)
}
}
}
//微信登录 //微信登录
iv_weixin.setOnClickListener { iv_weixin.setOnClickListener {
...@@ -390,7 +399,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -390,7 +399,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
} }
//下一步 //下一步
iv_next.setOnClickListener { iv_next.setOnClickListener {
if(iv_select_protocol.visibility==View.VISIBLE&&!isAgreeProtocol){
ToastUtil.toastShort("请您先同意壹点灵《用户使用协议》、《隐私保护政策》，才能登录使用")
return@setOnClickListener
}
if (checkPhone()) { if (checkPhone()) {
mPresenter.checkPhoneStatus(userPhoneNumber!!, countryCode!!, isUmengLoginState) mPresenter.checkPhoneStatus(userPhoneNumber!!, countryCode!!, isUmengLoginState)
} }
...@@ -464,7 +476,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -464,7 +476,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
countryCode = userInfo.country_code countryCode = userInfo.country_code
isUmengLoginState = true isUmengLoginState = true
tv_skip.visibility = View.VISIBLE tv_skip.visibility = View.VISIBLE
tv_des.text = "首次绑定即送大礼包" // tv_des.text = "首次绑定即送大礼包"
tv_des.visibility=View.GONE
iv_select_protocol.visibility=View.GONE
tv_des_first.visibility=View.VISIBLE
iv_weixin.visibility = View.GONE iv_weixin.visibility = View.GONE
iv_qq.visibility = View.GONE iv_qq.visibility = View.GONE
tv_reg_title.text = "手机号绑定" tv_reg_title.text = "手机号绑定"
......
m-user/src/main/res/layout/user_activity_register_and_login.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rl_login_conten" android:id="@+id/rl_login_conten"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:id="@+id/bg_login" android:id="@+id/bg_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/user_bg_login" /> android:src="@drawable/user_bg_login" />
<ImageView <ImageView
android:id="@+id/img_reg_back" android:id="@+id/img_reg_back"
android:layout_width="31dp" android:layout_width="31dp"
android:layout_height="31dp" android:layout_height="31dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/user_ic_back_grey" /> android:src="@drawable/user_ic_back_grey" />
<TextView <TextView
android:id="@+id/tv_skip" android:id="@+id/tv_skip"
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_alignParentRight="true"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginRight="23dp" android:layout_marginRight="23dp"
android:padding="5dp" android:padding="5dp"
android:text="跳过" android:text="跳过"
android:textColor="#2EB0FF" android:textColor="#2EB0FF"
android:textSize="11dp" android:textSize="11dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView <TextView
android:id="@+id/tv_reg_title" android:id="@+id/tv_reg_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/img_reg_back" android:layout_below="@+id/img_reg_back"
android:layout_marginLeft="28dp" android:layout_marginLeft="28dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:text="登录/注册" android:text="登录/注册"
android:textColor="#fdfdfe" android:textColor="#fdfdfe"
android:textSize="28dp" android:textSize="28dp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <View
android:id="@+id/tv_des" android:id="@+id/view_click"
android:layout_width="wrap_content" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_below="@+id/tv_reg_title"
android:layout_below="@+id/tv_reg_title" android:layout_marginLeft="20dp"
android:layout_marginLeft="28dp" android:layout_height="30dp"/>
android:layout_marginTop="6.5dp"
android:fontFamily="sans-serif-light" <ImageView
android:text="继续即代表您同意" android:id="@+id/iv_select_protocol"
android:textColor="#fdfdfe" android:layout_width="wrap_content"
android:textSize="13sp" /> android:layout_height="wrap_content"
android:layout_below="@+id/tv_reg_title"
<TextView android:layout_marginTop="6.5dp"
android:id="@+id/tv_protocol" android:layout_alignBottom="@+id/tv_des"
android:layout_width="wrap_content" android:layout_marginLeft="28dp"
android:layout_height="wrap_content" android:src="@drawable/user_login_protocol_unselected"
android:layout_alignBaseline="@+id/tv_des" />
android:layout_toRightOf="@+id/tv_des"
android:text="《壹点灵用户使用协议》" <TextView
android:textColor="#fdfdfe" android:id="@+id/tv_des"
android:textSize="13sp" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<RelativeLayout android:layout_below="@+id/tv_reg_title"
android:id="@+id/card_view" android:layout_toRightOf="@+id/iv_select_protocol"
android:layout_width="match_parent" android:layout_marginTop="6.5dp"
android:layout_height="213dp" android:layout_marginStart="10dp"
android:layout_below="@+id/tv_des" android:fontFamily="sans-serif-light"
android:layout_centerInParent="true" android:text="同意"
android:layout_marginLeft="28dp" android:textColor="#fdfdfe"
android:layout_marginTop="30dp" android:textSize="13sp" />
android:layout_marginRight="28dp"
android:background="@drawable/user_card_login" <TextView
android:orientation="vertical"> android:id="@+id/tv_des_first"
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:id="@+id/input_ll_bar" android:layout_below="@+id/tv_reg_title"
android:layout_width="match_parent" android:layout_marginTop="6.5dp"
android:layout_height="wrap_content" android:layout_marginLeft="28dp"
android:layout_marginTop="60dp" android:fontFamily="sans-serif-light"
android:gravity="center_vertical" android:text="首次绑定即送大礼包"
android:orientation="horizontal" android:visibility="gone"
android:paddingLeft="15dp" android:textColor="#fdfdfe"
android:paddingRight="15dp" android:textSize="13sp" />
tools:background="@color/blue">
<TextView
<LinearLayout android:id="@+id/tv_protocol"
android:id="@+id/ll_country" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignBaseline="@+id/tv_des"
android:background="@drawable/user_bg__choose_country_radius" android:layout_toRightOf="@+id/tv_des"
android:gravity="center_vertical" android:text="《壹点灵用户使用协议》"
android:paddingLeft="7dp" android:textColor="#fdfdfe"
android:paddingTop="4dp" android:textSize="13sp" />
android:paddingRight="7dp"
android:paddingBottom="4dp"> <RelativeLayout
android:id="@+id/card_view"
<ImageView android:layout_width="match_parent"
android:id="@+id/iv_country_icon" android:layout_height="213dp"
android:layout_width="23dp" android:layout_below="@+id/tv_des"
android:layout_height="16dp" android:layout_centerInParent="true"
android:layout_gravity="center_vertical" android:layout_marginLeft="28dp"
android:scaleType="centerCrop" android:layout_marginTop="30dp"
android:src="@drawable/user_ic_china" /> android:layout_marginRight="28dp"
android:background="@drawable/user_card_login"
<TextView android:orientation="vertical">
android:id="@+id/tv_country_code"
android:layout_width="wrap_content" <LinearLayout
android:layout_height="wrap_content" android:id="@+id/input_ll_bar"
android:layout_gravity="center_vertical" android:layout_width="match_parent"
android:layout_marginLeft="4dp" android:layout_height="wrap_content"
android:maxLines="1" android:layout_marginTop="60dp"
android:text="+86" android:gravity="center_vertical"
android:textColor="#666666" android:orientation="horizontal"
android:textSize="14sp" android:paddingLeft="15dp"
android:textStyle="bold" /> android:paddingRight="15dp"
tools:background="@color/blue">
</LinearLayout>
<LinearLayout
<com.ydl.ydlcommon.view.PhoneEditText android:id="@+id/ll_country"
android:id="@+id/et_phone_number" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:background="@drawable/user_bg__choose_country_radius"
android:layout_gravity="center" android:gravity="center_vertical"
android:layout_marginLeft="10dp" android:paddingLeft="7dp"
android:layout_weight="1" android:paddingTop="4dp"
android:background="@null" android:paddingRight="7dp"
android:gravity="center_vertical|left" android:paddingBottom="4dp">
android:inputType="phone"
android:lines="1" <ImageView
android:maxLength="13" android:id="@+id/iv_country_icon"
android:textColorHint="@color/platform_color_c6c3c3" android:layout_width="23dp"
android:textSize="24sp" /> android:layout_height="16dp"
android:layout_gravity="center_vertical"
<ImageView android:scaleType="centerCrop"
android:id="@+id/iv_del" android:src="@drawable/user_ic_china" />
android:layout_width="23dp"
android:layout_height="23dp" <TextView
android:layout_gravity="center_vertical" android:id="@+id/tv_country_code"
android:padding="5dp" android:layout_width="wrap_content"
android:scaleType="fitXY" android:layout_height="wrap_content"
android:src="@drawable/user_ic_del" android:layout_gravity="center_vertical"
android:visibility="invisible" /> android:layout_marginLeft="4dp"
</LinearLayout> android:maxLines="1"
android:text="+86"
<View android:textColor="#666666"
android:id="@+id/view_lin" android:textSize="14sp"
android:layout_width="match_parent" android:textStyle="bold" />
android:layout_height="1dp"
android:layout_below="@+id/input_ll_bar" </LinearLayout>
android:layout_marginLeft="15dp"
android:layout_marginTop="20dp" <com.ydl.ydlcommon.view.PhoneEditText
android:layout_marginRight="15dp" android:id="@+id/et_phone_number"
android:background="#e8e8e8" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<ImageView android:layout_gravity="center"
android:layout_width="60dp" android:layout_marginLeft="10dp"
android:layout_height="60dp" android:layout_weight="1"
android:layout_alignParentBottom="true" android:background="@null"
android:layout_centerInParent="true" android:gravity="center_vertical|left"
android:layout_marginBottom="13dp" android:inputType="phone"
android:src="@drawable/user_next_border" /> android:lines="1"
android:maxLength="13"
<RelativeLayout android:textColorHint="@color/platform_color_c6c3c3"
android:layout_width="60dp" android:textSize="24sp" />
android:layout_height="60dp"
android:layout_alignParentBottom="true" <ImageView
android:layout_centerInParent="true" android:id="@+id/iv_del"
android:layout_marginBottom="13dp" android:layout_width="23dp"
android:background="@drawable/user_bg_radius_bule" android:layout_height="23dp"
android:elevation="10dp" android:layout_gravity="center_vertical"
android:gravity="center"> android:padding="5dp"
android:scaleType="fitXY"
<ImageView android:src="@drawable/user_ic_del"
android:id="@+id/iv_next" android:visibility="invisible" />
android:layout_width="match_parent" </LinearLayout>
android:layout_height="match_parent"
android:layout_alignParentBottom="true" <View
android:layout_centerInParent="true" android:id="@+id/view_lin"
android:padding="18sp" android:layout_width="match_parent"
android:scaleType="centerCrop" android:layout_height="1dp"
android:src="@drawable/user_ic_next" /> android:layout_below="@+id/input_ll_bar"
android:layout_marginLeft="15dp"
<ProgressBar android:layout_marginTop="20dp"
android:id="@+id/pb_Normal" android:layout_marginRight="15dp"
android:layout_width="62dp" android:background="#e8e8e8" />
android:layout_height="62dp"
android:indeterminateTint="#ffffff" <ImageView
android:padding="10dp" android:layout_width="60dp"
android:visibility="gone" /> android:layout_height="60dp"
</RelativeLayout> android:layout_alignParentBottom="true"
</RelativeLayout> android:layout_centerInParent="true"
android:layout_marginBottom="13dp"
android:src="@drawable/user_next_border" />
<LinearLayout
android:layout_width="match_parent" <RelativeLayout
android:layout_height="wrap_content" android:layout_width="60dp"
android:layout_alignParentBottom="true" android:layout_height="60dp"
android:layout_marginBottom="70dp" android:layout_alignParentBottom="true"
android:gravity="center"> android:layout_centerInParent="true"
android:layout_marginBottom="13dp"
<ImageView android:background="@drawable/user_bg_radius_bule"
android:id="@+id/iv_weixin" android:elevation="10dp"
android:layout_width="45dp" android:gravity="center">
android:layout_height="45dp"
android:contentDescription="@null" <ImageView
android:scaleType="centerCrop" android:id="@+id/iv_next"
android:src="@drawable/user_login_weixin" /> android:layout_width="match_parent"
android:layout_height="match_parent"
<ImageView android:layout_alignParentBottom="true"
android:id="@+id/iv_qq" android:layout_centerInParent="true"
android:layout_width="42dp" android:padding="18sp"
android:layout_height="42dp" android:scaleType="centerCrop"
android:layout_marginLeft="30dp" android:src="@drawable/user_ic_next" />
android:contentDescription="@null"
android:scaleType="centerCrop" <ProgressBar
android:src="@drawable/user_login_qq" android:id="@+id/pb_Normal"
android:visibility="visible" /> android:layout_width="62dp"
</LinearLayout> android:layout_height="62dp"
android:indeterminateTint="#ffffff"
<LinearLayout android:padding="10dp"
android:id="@+id/ll_success" android:visibility="gone" />
android:layout_width="match_parent" </RelativeLayout>
android:layout_height="64dp" </RelativeLayout>
android:background="#fff"
android:gravity="center"
android:orientation="vertical" <LinearLayout
android:visibility="gone"> android:layout_width="match_parent"
android:layout_height="wrap_content"
<LinearLayout android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_marginBottom="70dp"
android:layout_height="wrap_content" android:gravity="center">
android:layout_marginLeft="20dp">
<ImageView
<ImageView android:id="@+id/iv_weixin"
android:layout_width="16dp" android:layout_width="45dp"
android:layout_height="16dp" android:layout_height="45dp"
android:src="@drawable/user_ic_log_succee" /> android:contentDescription="@null"
android:scaleType="centerCrop"
<TextView android:src="@drawable/user_login_weixin" />
android:layout_width="match_parent"
android:layout_height="wrap_content" <ImageView
android:layout_marginLeft="6dp" android:id="@+id/iv_qq"
android:text="登录成功!" android:layout_width="42dp"
android:textColor="#32D296" android:layout_height="42dp"
android:textSize="13dp" android:layout_marginLeft="30dp"
android:textStyle="bold" /> android:contentDescription="@null"
</LinearLayout> android:scaleType="centerCrop"
android:src="@drawable/user_login_qq"
<TextView android:visibility="visible" />
android:layout_width="match_parent" </LinearLayout>
android:layout_height="wrap_content"
android:layout_marginLeft="35dp" <LinearLayout
android:text="您已通过阿里云号码认证服务，一键登录更安全。" android:id="@+id/ll_success"
android:textColor="#666666" android:layout_width="match_parent"
android:textSize="13dp" /> android:layout_height="64dp"
</LinearLayout> android:background="#fff"
android:gravity="center"
</RelativeLayout> android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/user_ic_log_succee" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:text="登录成功!"
android:textColor="#32D296"
android:textSize="13dp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:text="您已通过阿里云号码认证服务，一键登录更安全。"
android:textColor="#666666"
android:textSize="13dp" />
</LinearLayout>
</RelativeLayout>
m-user/src/main/res/layout/user_mine_fragment_mine.xml
...@@ -606,9 +606,10 @@ ...@@ -606,9 +606,10 @@
<ImageView <ImageView
android:src="@drawable/user_mine_ydl_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:scaleType="centerCrop"
android:background="@color/baby_blue" android:background="@color/baby_blue"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
......
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