Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -180,7 +180,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         showChangeLayout.setVisibility(View.GONE);
         changePhoneLayout.setVisibility(View.VISIBLE);
         if(oldOrNew == 1){
-            hitStr = "请输入原手机号码";
+            hitStr = "请输入手机号码";
             noticeStr = "验证原手机";
             phoneEtAccount.setHint(hitStr+"");
 //            phoneEtAccount.setText(mobiles+"");

app/src/main/java/com/sheep/groups/creditcard/ApplyForCreditCardDetailsFragment.java

@@ -270,7 +270,7 @@ public class ApplyForCreditCardDetailsFragment extends DaggerFragment implements
         presenter.statisticsDetails(map);
 
 
-        test();
+//        test();
     }
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -37,7 +37,7 @@ import java.util.HashMap;
 
 public class LoginActivity extends BaseActivity {
     private AlertDialog mDialog;
-
+`
     @Override
     protected int getLayoutId() {
         return R.layout.login_actvity;

app/src/main/res/layout/bind_phone_number_act_layout.xml

@@ -17,7 +17,7 @@
             android:orientation="vertical"
             android:background="@color/white">
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <ImageView