Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java

@@ -113,8 +113,6 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle("个人资料");
         titleView.setText(R.id.tv_title_right, "保存");
-        etNickname.addTextChangedListener(new MyTextWatcher(this, etNickname, 32));
-
         titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -133,7 +131,11 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             if (info.getNickname() != null) {
                 etNickname.setText(info.getNickname());
                 if (!TextUtils.isEmpty(info.getNickname())) {
-                    etNickname.setSelection(info.getNickname().length());
+                    if (info.getNickname().length() <= 32) {
+                        etNickname.setSelection(info.getNickname().length());
+                    } else {
+                        etNickname.setSelection(32);
+                    }
                 }
             }
             if (info.getRealname() != null) {

module_mine/src/main/res/layout/activity_personal_information.xml

@@ -59,6 +59,7 @@
                 android:background="@null"
                 android:gravity="right|center_vertical"
                 android:hint="请输入昵称"
+                android:maxLength="32"
                 android:maxLines="1"
                 android:textColor="@color/colorMain"
                 android:textColorHint="@color/colorGray"