1.修改名字过长问题

.idea/misc.xml

@@ -30,7 +30,7 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/slidevideo_switch_track_s.xml" value="0.37890625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/slidevideo_switch_track_selector.xml" value="0.32734375" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/switch_thumb.xml" value="0.37890625" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="0.1" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="1.1" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/layout/popup_myorder.xml" value="0.2889294403892944" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/layout/popupwindow_myorder.xml" value="0.2889294403892944" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/layout/popupwindow_record_remove.xml" value="0.5" />

app/src/main/java/com/edufound/reader/activity/OthersRecordActivity.java

@@ -221,7 +221,11 @@ public class OthersRecordActivity extends BaseMvpActivity<OthersRecordPresenter>
         mFansCount.setText(String.valueOf(info.getFansAmount()));
         mFlowerCount.setText(String.valueOf(info.getIntegralAmount()));
         mPlayCount.setText(String.valueOf(info.getPlayAmount()));
-        mUserName.setText(info.getUser().getNickName());
+        if (info.getUser().getNickName().length() > 6) {
+            mUserName.setText(info.getUser().getNickName().substring(0, 6) + "...");
+        } else {
+            mUserName.setText(info.getUser().getNickName());
+        }
         doFollowSuccess(info.getLike());
         if (info.getUser().getUid().equals(Consts.getUID()) || info.getUser().getProfession().equals("官方")) {
             //是自己

app/src/main/java/com/edufound/reader/application/EApplication.java

@@ -59,7 +59,7 @@ public class EApplication extends Application {
     public void onCreate() {
         super.onCreate();
         try {
-            Consts.setIsDebug(true);
+            Consts.setIsDebug(false);
             Consts.setmApplicAtion(this);
 
             //初始化异常监听

app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java

@@ -252,7 +252,11 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         } else {
             GlideUtils.loadCircleImage(getActivity(), bean.getUser().getAvatar(), mUserHead);
         }
-        mUserPhone.setText(bean.getUser().getNickName());
+        if (bean.getUser().getNickName().length() > 6) {
+            mUserPhone.setText(bean.getUser().getNickName().substring(0, 6) + "...");
+        } else {
+            mUserPhone.setText(bean.getUser().getNickName());
+        }
         mCommentCount.setText(bean.getUserRead().getCommentAmount());
         if (bean.getUser().getUid().equals(Consts.getUID()) || bean.getUser().getProfession().equals("官方")) {
             //是自己

app/src/main/java/com/edufound/reader/popwindow/PopWindowUtil.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 
 import com.edufound.reader.R;
 import com.edufound.reader.application.EApplication;
+import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.bean.RecordResultBean;
 import com.edufound.reader.bean.UserRecordBean;
 import com.edufound.reader.cusview.GridRadioGroup;
@@ -337,7 +338,9 @@ public class PopWindowUtil {
         buffer.append("\t屏幕高度：\t\t" + DeviceUtil.getHeight(context) + "\n");
         buffer.append("\t屏幕密度：\t\t" + DeviceUtil.getDensity(context) + "\n");
         buffer.append("\t屏幕DPI：\t\t" + DeviceUtil.getDensityDpi(context) + "\n");
-
+        if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode()) && Consts.getmConstsBaiDuUserBean() != null) {
+            buffer.append("\t百度UserId：\t\t" + Consts.getmConstsBaiDuUserBean().getUserInfo().getUserId() + "\n");
+        }
         View infoView = LayoutInflater.from(context).inflate(R.layout.window_deviceinfo, null);
         TextView text = (TextView) infoView.findViewById(R.id.deviceinfo);
         text.setText(buffer.toString());
@@ -351,7 +354,7 @@ public class PopWindowUtil {
         Display d = m.getDefaultDisplay(); // 获取屏幕宽、高用
         WindowManager.LayoutParams p = dialogWindow.getAttributes(); // 获取对话框当前的参数值
         p.height = (int) (d.getHeight() * 0.8);
-        p.width = (int) (d.getWidth() * 0.6);
+        p.width = (int) (d.getWidth() * 0.7);
         dialogWindow.setAttributes(p);
         dialog.setTitle("Device信息");
         dialog.show();

app/src/main/java/com/edufound/reader/presenter/LoginAlertPresenter.java

@@ -93,19 +93,20 @@ public class LoginAlertPresenter extends BasePresenter<LoginAlertContract.View>
 
     @Override
     public void getVCode(String phoneNum) {
-        Logger.e("phoneNum:" + phoneNum);
         if (EfunboxUtil.isMobileNO(phoneNum)) {
             //正常,获取验证码
 //            getVCode = 9999;
             ((FrameLayout) mView.getVCodeText().getParent()).setClickable(false);
             ((FrameLayout) mView.getVCodeText().getParent()).setEnabled(false);
 //            ((FrameLayout) mView.getVCodeText().getParent()).setBackgroundColor(mView.getActivity().getResources().getColor(R.color.translucent_background));
-            mView.getVCodeText().setText(String.valueOf(mVCodeResCount));
-            mLoginAlertHandler.sendEmptyMessageDelayed(LoginAlertModel.CHANGE_VCODE_TEXT, 1000);
+
             mModel.getVCode(mView.getActivity(), phoneNum, new Callback() {
                 @Override
                 public void onSuccess(HttpInfo info) throws IOException {
                     String result = info.getRetDetail();
+
+                    mView.getVCodeText().setText(String.valueOf(mVCodeResCount));
+                    mLoginAlertHandler.sendEmptyMessageDelayed(LoginAlertModel.CHANGE_VCODE_TEXT, 1000);
                     Logger.e("获取验证码result:" + result);
 //                    getVCode = 9999;
                 }
@@ -113,6 +114,9 @@ public class LoginAlertPresenter extends BasePresenter<LoginAlertContract.View>
                 @Override
                 public void onFailure(HttpInfo info) throws IOException {
                     Logger.e("获取验证码失败：" + info.getRetDetail() + "--" + info.getParams() + "--" + info.getUrl());
+                    Toast.makeText(mView.getActivity(), "获取验证码失败，" + info.getRetDetail(), Toast.LENGTH_SHORT).show();
+                    ((FrameLayout) mView.getVCodeText().getParent()).setClickable(true);
+                    ((FrameLayout) mView.getVCodeText().getParent()).setEnabled(true);
                 }
             });
 

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

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.edufound.reader.cusview.RoundFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:roundframelayout="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#70C1FF"
-        roundframelayout:radio="60">
+        android:background="#70C1FF">
 
     <ScrollView
             android:layout_width="match_parent"
@@ -32,4 +30,4 @@
         </LinearLayout>
     </ScrollView>
 
-</com.edufound.reader.cusview.RoundFrameLayout>
+</FrameLayout>