Merge branch 'master' into AutomaticRedPacketGrabbing

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/base/BaseLoginActivity.java

@@ -2,8 +2,11 @@ package com.liaobo.im.ui.base;
 
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 
 import com.liaobo.im.AppConfig;
+import com.liaobo.im.R;
 import com.liaobo.im.bean.User;
 
 import java.util.ArrayList;
@@ -68,8 +71,24 @@ public abstract class BaseLoginActivity extends ActionBackActivity implements Co
     }
 
     @Override
+    public void finish() {
+        hideSoftInputFromWindow(getWindow().getDecorView());
+        super.finish();
+    }
+
+    @Override
     protected void onDestroy() {
         coreManager.destroy();
+
         super.onDestroy();
     }
+
+    public void hideSoftInputFromWindow(View view){
+        InputMethodManager inputManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+        if (inputManager != null && view!=null) {
+            inputManager.hideSoftInputFromWindow(view.getWindowToken(), 0); // 强制隐藏键盘
+
+        }
+
+    }
 }

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

@@ -255,7 +255,6 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
                 .setPositiveButton(R.string.confirm, (d,i)->{
                     String nickName = editText.getText().toString();
                     tvNickname.setText(nickName);
-
                     mTempUserData.setNickName(nickName);
 
                 })
@@ -283,11 +282,15 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
             }
         }
 
-
+        if (mUser != null && !mUser.equals(mTempUserData)) {// 数据改变了，提交数据
+            updateData();
+        } else {
+            finish();
+        }
     }
 
   public void clickBack(){
-      if (mUser != null && !mUser.equals(coreManager)) {// 数据改变了，提交数据
+      if (mUser != null && !mUser.equals(mTempUserData)) {// 数据改变了，提交数据
           TextView textView = new TextView(this);
           textView.setText(R.string.user_data_changed);
           textView.setGravity(Gravity.CENTER);
@@ -596,6 +599,12 @@ public class MyInfoActivity extends BaseActivity implements View.OnClickListener
         finish();
     }
 
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
     @Override
     public void onBackPressed() {
        clickBack();

skWeiChatBaidu/src/main/res/layout/activity_my_info.xml

@@ -25,7 +25,8 @@
                 android:visibility="visible" />
 
             <LinearLayout
-
+                android:focusable="true"
+                android:focusableInTouchMode="true"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">