bug修改

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -69,9 +69,9 @@ public class CommonUtil {
      * @param maxLen
      * @return
      */
-    public String handleText(String str, int maxLen) {
+    public boolean handleText(String str, int maxLen) {
         if (TextUtils.isEmpty(str)) {
-            return str;
+            return false;
         }
         int count = 0;
         int endIndex=0;
@@ -86,11 +86,16 @@ public class CommonUtil {
                 endIndex=i;
             }
         }
-        if (count <= maxLen) {
-            return str;
-        } else {
-            G.showToast("昵称超过限制长度");
-            return str.substring(0, endIndex) + "...";
+//        if (count <= maxLen) {
+//            return str;
+//        } else {
+//            G.showToast("昵称超过限制长度");
+//            return str.substring(0, endIndex) + "...";
+//        }
+        if(count <= maxLen){
+            return true;
+        }else {
+            return false;
         }
 
     }

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

@@ -244,7 +244,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         if(NetUtil.isMobile(activity)){
 //                            DialogAccountAbnormal.showDialog(activity,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" ).show();
                             Jump2View.getInstance().goNoticeAct(activity, null);
-                            isStartPause = !isStartPause;
                             return;
                         }
                         startFiler();
@@ -501,6 +500,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     public void onEventMainThread(BigEvent event){
         switch (event.getEventTypes()){
             case DIALOG_ACTIVITY_DOWNLOAD_FILE:
+                isStartPause = !isStartPause;
                 startFiler();
                 break;
         }

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

@@ -53,7 +53,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     @BindView(R.id.rl_head)
     RelativeLayout rl_head;
     @BindView(R.id.iv_head_right)
-    CircleImageView ivHeadRight;
+    ImageView ivHeadRight;
     @BindView(R.id.layout_more1)
     RelativeLayout layout_more1;
 
@@ -65,6 +65,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
     @Override
     public void initView() {
+        ButterKnife.bind(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, "个人资料")
@@ -158,7 +159,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     }
 
 
-    @OnClick({R.id.iv_head_right, R.id.layout_more1, R.id.rl_qr, R.id.rl_head})
+    @OnClick({R.id.layout_more1, R.id.rl_qr, R.id.rl_head})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.layout_more1:
@@ -199,10 +200,4 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         EventBus.getDefault().unregister(this);
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
 }

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

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.presenter.ReNamePresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -74,7 +75,6 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-                et.setText(CommonUtil.getInstance().handleText(et.getText().toString(), 12));
             }
 
             @Override
@@ -132,6 +132,15 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @OnClick(R.id.tv_submit)
     public void onClick() {
+        if(android.text.TextUtils.isEmpty(et.getText().toString())){
+            G.showToast("请输入昵称");
+            return;
+        }
+
+        if(!CommonUtil.getInstance().handleText(et.getText().toString(), 12)){
+            G.showToast("昵称长度要小于6个字符");
+            return;
+        }
         HashMap<String,String>  map=new HashMap<>();
         map.put("nickname",et.getText().toString());
         presenter.getTask(map);

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

@@ -9,6 +9,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
@@ -49,6 +51,8 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
     @Inject
     SplashPresenter presenter;
 
+    private boolean isClick;
+
     private static final int PERMISSON_REQUESTCODE = 1;
     /**
      * 需要进行检测的权限数组
@@ -71,13 +75,26 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
             EasyPermissions.requestPermissions(this, "应用需要这些权限", PERMISSON_REQUESTCODE, needPermissions);
         } else {
 //            setContentView(R.layout.splash_activity);
-            if(Build.VERSION.SDK_INT >= 21){
-                animWelcomeImage();
+//            if(Build.VERSION.SDK_INT >= 21){
+//                animWelcomeImage();
+//
+//            }else {
+//            }
+            mHandler.sendEmptyMessageDelayed(0, 1000);
+        }
+    }
 
-            }else {
+    Handler mHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if(!isClick){
+                isClick = true;
+                goMain();
             }
+
         }
-    }
+    };
 
     @Override
     protected int getLayoutId() {
@@ -207,7 +224,10 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
     public void onViewClicked(View view) {
         switch (view.getId()){
             case R.id.btn_join:
-                goMain();
+                if(!isClick){
+                    isClick = true;
+                    goMain();
+                }
                 break;
         }
     }

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

@@ -42,7 +42,8 @@
                 android:drawablePadding="10dp"
                 android:hint="请填写姓名"
                 android:textColor="@color/txt_black_9e9c9c"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"
+                android:gravity="right"/>
         </RelativeLayout>
 
 
@@ -81,7 +82,8 @@
                 android:hint="请填写身份证号"
                 android:maxLength="18"
                 android:textColor="@color/txt_black_9e9c9c"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"
+                android:gravity="right"/>
         </RelativeLayout>
 
 
@@ -119,7 +121,8 @@
                 android:inputType="number"
                 android:maxLength="19"
                 android:textColor="@color/txt_black_9e9c9c"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"
+                android:gravity="right"/>
         </RelativeLayout>
 
     </LinearLayout>

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

@@ -39,16 +39,18 @@
             android:id="@+id/tv_more"
             />
 
-        <de.hdodenhof.circleimageview.CircleImageView
+        <ImageView
             android:id="@+id/iv_head_right"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_alignParentLeft="true"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:background="@null"
+            android:src="@mipmap/x_ic_def_head"
+            android:scaleType="centerInside"
             android:layout_toLeftOf="@id/tv_more"
             android:layout_centerVertical="true"
-            android:scaleType="centerInside"
-            android:src="@mipmap/x_ic_def_head"/>
+
+
+            />
 
     </RelativeLayout>