Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into csdn

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -152,6 +152,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
     }
 
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -204,12 +205,14 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
     @Override
     public void onBackPressed() {
+        Intent intent = new Intent();
+        setResult(0x20, intent);
         super.onBackPressed();
-        finish();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+
         if (mFriend == null) {
             return super.onOptionsItemSelected(item);
         }
@@ -244,6 +247,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             case R.id.delete_all:// 设置备注名
                 showDeleteAllDialog(mFriend);
                 break;
+
             default:
                 break;
         }
@@ -267,7 +271,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         mDataLoadView.setVisibility(View.GONE);
         String code = null;
         if (getIntent() != null) {
-            phone=code = getIntent().getStringExtra(AppConstant.EXTRA_NICK_CODE);
+            phone = code = getIntent().getStringExtra(AppConstant.EXTRA_NICK_CODE);
         }
         name_tv.setText(userName);
         phone_tv.setText(code);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/MyFriendActivity.java

@@ -90,7 +90,7 @@ public class MyFriendActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_friend);
+        setContentView(R.layout.fragment_contact);
         isPeculiar = getIntent().getBooleanExtra("isPeculiar", false);
         if (isPeculiar)
             getSupportActionBar().setTitle("常用联系人");
@@ -104,6 +104,14 @@ public class MyFriendActivity extends BaseActivity {
 
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == 0x20 && resultCode == 0x20) {
+            mAdapter.setisRefeshed(true);
+            upDataFriend();
+            loadData();
+        }
+    }
 
     private Friend EnterChatAction(EmployeesEntity employee) {
         Friend friend = new Friend();
@@ -221,7 +229,7 @@ public class MyFriendActivity extends BaseActivity {
                     intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getPhone());
                     intent.putExtra("friend", friend);
                 }
-                startActivityForResult(intent,0x20);
+                startActivityForResult(intent, 0x20);
             }
         });
         mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/RoomInfoActivity.java

@@ -1014,7 +1014,7 @@ public class RoomInfoActivity extends BaseActivity {
     public void removeBlacklist(final Friend sortFriend) {
         FriendDao.getInstance().updateFriendStatus(mLoginUserId, sortFriend.getUserId(), Friend.STATUS_FRIEND);
         int s = FriendDao.getInstance().getFriendStatus(mLoginUserId, sortFriend.getUserId());
-        ViewUtil.ToastMessage(this, "取消群消息成功！");
+//        ViewUtil.ToastMessage(this, "取消群消息成功！");
     }
 
     /**
@@ -1023,7 +1023,7 @@ public class RoomInfoActivity extends BaseActivity {
     private void addBlacklist(final Friend sortFriend) {
         FriendDao.getInstance().updateFriendStatus(mLoginUserId, sortFriend.getUserId(), Friend.STATUS_BLACKLIST);
         int s = FriendDao.getInstance().getFriendStatus(mLoginUserId, sortFriend.getUserId());
-        ViewUtil.ToastMessage(this, "屏蔽群消息成功！");
+//        ViewUtil.ToastMessage(this, "屏蔽群消息成功！");
 //        HashMap<String, String> params = new HashMap<String, String>();
 //        params.put("access_token", MyApplication.getInstance().mAccessToken);
 //        params.put("toUserId", sortFriend.getUserId());

WeiChat/src/main/res/layout/radio_staff_button.xml

@@ -6,7 +6,7 @@
     android:button="@null"
     android:checked="true"
     android:drawablePadding="5dp"
-    android:drawableRight="@drawable/iv_navagation_scroll_right"
+    android:drawableRight="@drawable/oa_next"
     android:gravity="center"
     android:padding="3dp"
     android:text=""