Merge branch 'master' into AutomaticRedPacketGrabbing

# Conflicts:
#	skWeiChatBaidu/src/main/res/values/strings.xml

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/me/MyInfoActivity.java

@@ -13,6 +13,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.DatePicker;
 import android.widget.EditText;
@@ -91,7 +92,7 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my_info);
         getSupportActionBar().hide();
-        findViewById(R.id.iv_title_left).setOnClickListener(view -> finish());
+        findViewById(R.id.iv_title_left).setOnClickListener(view -> clickBack());
         TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
         tvTitle.setText(R.string.my_details);
         mUser = coreManager.getSelf();
@@ -247,12 +248,12 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
 
 
     private void showEditNickname() {
-        EditText editText = new EditText(this);
+        final EditText editText = new EditText(this);
         final AlertDialog.Builder builder = new AlertDialog.Builder(this)
                         .setView(editText)
                         .setTitle(R.string.modify_nickname)
                 .setPositiveButton(R.string.confirm, (d,i)->{
-                    String nickName = edtDiyName.getText().toString();
+                    String nickName = editText.getText().toString();
                     tvNickname.setText(nickName);
 
                     mTempUserData.setNickName(nickName);
@@ -282,13 +283,33 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
             }
         }
 
-        if (mUser != null && !mUser.equals(coreManager)) {// 数据改变了，提交数据
-            updateData();
-        } else {
-            finish();
-        }
+
     }
 
+  public void clickBack(){
+      if (mUser != null && !mUser.equals(coreManager)) {// 数据改变了，提交数据
+          TextView textView = new TextView(this);
+          textView.setText(R.string.user_data_changed);
+          textView.setGravity(Gravity.CENTER);
+          textView.setPadding(0,20,0,0);
+
+          AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(InternationalizationHelper.getString("SELECT_AVATARS"))
+                  .setTitle(R.string.system_notification_user_name)
+                  .setView(textView)
+                  .setPositiveButton(R.string.save,((dialog, which) -> {
+                      updateData();
+                  }))
+                  .setNegativeButton(R.string.cancel,((dialog, which) -> {
+                      finish();
+                  }));
+          builder.show();
+      } else {
+          finish();
+      }
+
+
+
+  }
 
     private void showSelectAvatarDialog() {
         String[] items = new String[]{InternationalizationHelper.getString("PHOTOGRAPH"), InternationalizationHelper.getString("ALBUM")};
@@ -575,4 +596,9 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
         finish();
     }
 
+    @Override
+    public void onBackPressed() {
+       clickBack();
+
+    }
 }

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/message/multi/RoomInfoActivity.java

@@ -1762,7 +1762,19 @@ public class RoomInfoActivity extends BaseActivity {
 
                     }
                 }
+
+                ////
+
+                boolean isAllowCache = PreferenceUtils.getBoolean(mContext, Constants.IS_SEND_CARD + mRoom.getUserId(), true);
+                boolean isAllow = isAllowSecretlyChat(mMucRoomMember,isAllowCache);
                 AvatarHelper.getInstance().displayAvatar(name, mMucRoomMember.getUserId(), imageView, true);
+                if (!isAllow){
+                    if (!TextUtils.isEmpty(name) && name.length()>1){
+                        name = name.substring(0,name.length()-1)+"*";
+                    }else {
+                        name = "*";
+                    }
+                }
                 memberName.setText(name);
             }
             return convertView;

skWeiChatBaidu/src/main/res/values/strings.xml

@@ -1870,4 +1870,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="second_30">30秒后开始</string>
     <string name="second_60">60秒后开始</string>
     <string name="second_num">%1$1d秒后开始</string>
+
+    <string name="user_data_changed">用户数据信息发生改变,是否保存？</string>
+
 </resources>