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

# Conflicts:
#	config.gradle

m-home/src/ydl/java/com/yidianling/home/adapter/YdlHomeAdapter.kt

@@ -6,6 +6,8 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import com.ydl.ydl_image.module.GlideApp
 import com.yidianling.home.R
 import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.HomeImpl
@@ -281,5 +283,12 @@ class YdlHomeAdapter(private val mContext: Context,
     /**
      * 底部提示语模块 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 @@
     android:orientation="horizontal">
 
     <ImageView
+        android:id="@+id/iv_logo_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/baby_blue"
-        android:scaleType="centerCrop"
-        android:src="@drawable/home_ydl_logo" />
+        />
 </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
     private TextView mDurationTv;
     private TextView mFansNumTv;
     private View mNewCoupon;
+    private ImageView mLogoView;
     private TextView mTestRecordNumTv;
     //debug包下切换环境的按钮
     private Button mChangeBtn;
@@ -133,6 +134,7 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
         jtv_test = getRootView().findViewById(R.id.jtv_test);
         tishi = getRootView().findViewById(R.id.tishi);
         mNewCoupon = getRootView().findViewById(R.id.view_new_coupon);
+        mLogoView = getRootView().findViewById(R.id.iv_mine_logo);
         img_head.setOnClickListener(this);
         mChangeBtn.setOnClickListener(this);
         jtv_account_setting.setOnClickListener(this);
@@ -160,6 +162,8 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
         init();
 
 
+        GlideApp.with(this).load("https://static.yidianling.com/banner/bottombanner@2x.png").into(mLogoView);
+
 //        jtv_test.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
 
         refreshCouponData();

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -26,11 +26,9 @@ import com.tbruyelle.rxpermissions2.RxPermissions
 import com.umeng.socialize.UMShareAPI
 import com.umeng.socialize.UMShareConfig
 import com.umeng.socialize.bean.SHARE_MEDIA
-import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
-import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
@@ -45,7 +43,6 @@ import com.yidianling.user.UserHelper
 import com.yidianling.user.api.bean.UserResponseBean
 import com.yidianling.user.bean.AliAuthBean
 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.PhoneLoginAutoParam
 import com.yidianling.user.http.response.ChcekPhoneResponeBean
@@ -56,8 +53,6 @@ import com.yidianling.user.safePrivate.HandUnlockCheckActivity
 import com.yidianling.user.ui.CountryListActivity
 import com.yidianling.user.ui.login.contract.ILoginContract
 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.*
 
 /**
@@ -86,7 +81,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
     private var countryCode: String? = "0086"//国家或地区手机区号
     private var handler: Handler? = null
     private var isFromGuide = false//是否来自启动页
-
+    private var  isAgreeProtocol =false
     companion object {
         private var BIND_PHONE = "bind_phone"//用于判断时候是绑定手机号
         private var IS_FROM_GUIDE = "isFromGuide"//是否来自启动页
@@ -140,6 +135,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.platform_color_075b66)
     }
 
+    @SuppressLint("CheckResult")
     private fun requestPermission() {
         val rxPermissions = RxPermissions(this)
         rxPermissions.requestEach(Manifest.permission.READ_PHONE_STATE)
@@ -303,7 +299,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
 
         if (isUmengLoginState) {
             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_qq.visibility = View.GONE
             tv_reg_title.text = "手机号绑定"
@@ -369,6 +368,16 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             RxKeyboardTool.hideSoftInput(this)
             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 {
 
@@ -390,7 +399,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         }
         //下一步
         iv_next.setOnClickListener {
-
+            if(iv_select_protocol.visibility==View.VISIBLE&&!isAgreeProtocol){
+                ToastUtil.toastShort("请您先同意壹点灵《用户使用协议》、《隐私保护政策》，才能登录使用")
+                return@setOnClickListener
+            }
             if (checkPhone()) {
                 mPresenter.checkPhoneStatus(userPhoneNumber!!, countryCode!!, isUmengLoginState)
             }
@@ -464,7 +476,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             countryCode = userInfo.country_code
             isUmengLoginState = true
             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_qq.visibility = View.GONE
             tv_reg_title.text = "手机号绑定"

m-user/src/main/res/layout/user_mine_fragment_mine.xml

@@ -606,9 +606,10 @@
 
 
                 <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:scaleType="centerCrop"
                     android:background="@color/baby_blue"
                     android:layout_height="wrap_content"/>