gongpm преди 9 години
родител
ревизия
674be2bed5

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -108,9 +108,9 @@ public class SendShuoshuoActivity extends BaseActivity {
                 int viewType = mAdapter.getItemViewType(position);
 
                 if (viewType == 1) {
-                    showSelectPictureDialog();//第一个
+//                    showSelectPictureDialog();//第一个
                     //TODO 选择图片页面
-//                    startActivityForResult(new Intent(SendShuoshuoActivity.this, PhoneSelectActivity.class), 222);
+                    startActivityForResult(new Intent(SendShuoshuoActivity.this, PhoneSelectActivity.class), 222);
 
                 } else {
                     showPictureActionDialog(position);

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/AddContactsActivity.java

@@ -194,7 +194,6 @@ public class AddContactsActivity extends BaseActivity {
 		mListView.setAdapter(mAdapter);
 		mHorizontalListView.setAdapter(mHorAdapter);
 		mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
-
 		mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
@@ -339,6 +338,7 @@ public class AddContactsActivity extends BaseActivity {
 	 */
 	private void inviteFriend() {
 		if (mSelectPositions.size() <= 1) {
+			setResult(RESULT_OK,new Intent());
 			finish();
 			return;
 		}
@@ -447,7 +447,7 @@ public class AddContactsActivity extends BaseActivity {
 			noticeFriendList[i] = firendUserId;
 			mCoreService.invite(roomJid, firendUserId, reason);
 		}
-
+		setResult(RESULT_OK,new Intent());
 		finish();
 	}
 

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/RoomInfoActivity.java

@@ -1184,6 +1184,7 @@ public class RoomInfoActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 1 && resultCode == RESULT_OK) {
+            Log.i("gongpengming", "回来更新数据");
             loadMembers();
         }
     }