提现添加身份证号校验，fix bug

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     ext.build_tools_version = "27.0.3"
     ext.min_sdk_version = 17
     ext.target_sdk_version = 26
-    ext.version_code = 269
-    ext.verson_name = "2.6.9"
+    ext.version_code = 270
+    ext.verson_name = "2.7.0"
     ext.gradle_version = '3.1.4'
     ext.isReleaseMinify = false
     ext.isDebugMinify = false

orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java

@@ -3,7 +3,9 @@ package com.dayu.order.ui.activity;
 import android.content.Intent;
 import android.support.v7.widget.GridLayoutManager;
 import android.text.TextUtils;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.dayu.base.ui.activity.BaseActivity;
 import com.dayu.base.ui.adapter.PhotoViewAdapter;
@@ -41,6 +43,23 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter,
     @Override
     public void initView() {
         mBind.titleBack.setOnClickListener(v -> dumpBack());
+
+        //解决ScrollView与内部嵌套的EditText的滚动冲突
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+        mBind.edtRemark.setOnTouchListener(new View.OnTouchListener() {
+
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                    v.getParent().requestDisallowInterceptTouchEvent(true);
+                } else if (event.getAction() == MotionEvent.ACTION_UP) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                } else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                }
+                return false;
+            }
+        });
     }
 
     private void initPhotoView() {

orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java

@@ -3,7 +3,9 @@ package com.dayu.order.ui.activity;
 import android.content.Intent;
 import android.support.v7.widget.GridLayoutManager;
 import android.text.TextUtils;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
 import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
@@ -47,6 +49,23 @@ public class OrderPartSendActivity extends BaseActivity<PartSendPresenter, Activ
     @Override
     public void initView() {
         mBind.titleBack.setOnClickListener(v->dumpBack());
+
+        //解决ScrollView与内部嵌套的EditText的滚动冲突
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+        mBind.edtRemark.setOnTouchListener(new View.OnTouchListener() {
+
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                    v.getParent().requestDisallowInterceptTouchEvent(true);
+                } else if (event.getAction() == MotionEvent.ACTION_UP) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                } else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                }
+                return false;
+            }
+        });
     }
 
     //跳转到扫描页面

orderCenter/src/main/res/layout/activity_order_part_receive.xml

@@ -159,13 +159,16 @@
                 <EditText
                     android:id="@+id/edt_remark"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="75dp"
                     android:layout_gravity="center"
                     android:layout_margin="10dp"
                     android:background="@drawable/bg_input_gray_react"
                     android:gravity="top"
                     android:hint="@string/part_recieve_edit_hint"
-                    android:padding="10dp"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
                     android:text="@={presenter.remark}"
                     android:textColor="@color/cl_home_title_text_color"
                     android:textColorHint="@color/cl_selector_hui"

userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java

@@ -67,6 +67,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
     private int mAccountBalance;
     private boolean hasBankInfo, hasAddressInfo;
     private double canWithdrawMoney;
+    private String userIdentity; //身份证号
 
     public static HomeUserFragment newInstance() {
         Bundle args = new Bundle();
@@ -176,6 +177,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
     public void getPersonalInfoSuccess(EngineerInfo info) {
 //        mBind.tvStartLive.setVisibility(View.VISIBLE);
         setUserNick(info.getNickName());
+        userIdentity = info.getIdentity();
         saveUserInfo(info);
         mBind.tvStartLive.setVisibility(info.getLiveStatus() == 1 ? View.VISIBLE : View.GONE);
         if (TextUtils.isEmpty(info.getIdentity())) {
@@ -342,6 +344,10 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
 
     //申请提现
     private void applyWithdraw() {
+        if (TextUtils.isEmpty(userIdentity)) {
+            showCertificationDialog();
+            return;
+        }
         if (!hasBankInfo) {
             String str = "请先完善您的银行卡信息才能提现";
             showBankAddrDialog(str,EditBankActivity.class);