|
|
@@ -54,6 +54,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
|
|
|
import com.xzjmyk.pm.activity.ui.erp.util.BitmapUtil;
|
|
|
import com.xzjmyk.pm.activity.ui.erp.util.FileUtils;
|
|
|
import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
|
|
|
+import com.xzjmyk.pm.activity.ui.erp.util.NumberUtils;
|
|
|
import com.xzjmyk.pm.activity.ui.erp.util.PropertiesUtil;
|
|
|
import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
|
|
|
import com.xzjmyk.pm.activity.util.Constants;
|
|
|
@@ -404,9 +405,13 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
String userId = mFriendList.get(mSelectPositions.get(i)).getUserId();
|
|
|
inviteUsers.add(userId);
|
|
|
}
|
|
|
- new Thread(new Runnable() {
|
|
|
+ //开启线程处理合成群头像操作
|
|
|
+ final Thread uploadImageTask=
|
|
|
+ new Thread(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
+ uploadIsEnd=false;//开始上传任务
|
|
|
+ photoId= NumberUtils.generateNumber2();//八位不重复随机数
|
|
|
inviteUsers.add(0, MyApplication.getInstance().mLoginUser.getUserId());
|
|
|
image= createChatImage(inviteUsers);
|
|
|
Message msg=mhandler.obtainMessage();
|
|
|
@@ -414,7 +419,8 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
msg.what=uploadFile;
|
|
|
mhandler.sendMessage(msg);
|
|
|
}
|
|
|
- }).start();
|
|
|
+ });
|
|
|
+ uploadImageTask.start();
|
|
|
|
|
|
params.put("text", JSON.toJSONString(inviteUsers));
|
|
|
|
|
|
@@ -431,9 +437,19 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
public void onResponse(ObjectResult<MucRoom> result) {
|
|
|
boolean parserResult = Result.defaultParser(mContext, result, true);
|
|
|
if (parserResult && result.getData() != null) {
|
|
|
- createRoomSuccess(result.getData().getId(), roomJid, roomName, roomDesc);
|
|
|
+ while (uploadImageTask.isAlive()){
|
|
|
+ //上传线程正在运行
|
|
|
+ Log.i("Arison","SelectContactsActivity:onResponse:440:上传是否结束:"+uploadIsEnd);
|
|
|
+ }
|
|
|
+// while (!uploadIsEnd){
|
|
|
+// //上传线程正在运行
|
|
|
+// Log.i("Arison","SelectContactsActivity:onResponse:440:上传是否结束:"+uploadIsEnd);
|
|
|
+// }
|
|
|
+
|
|
|
+ createRoomSuccess(result.getData().getId(), roomJid, roomName, roomDesc,photoId);
|
|
|
+ ProgressDialogUtil.dismiss(mProgressDialog);
|
|
|
}
|
|
|
- ProgressDialogUtil.dismiss(mProgressDialog);
|
|
|
+
|
|
|
}
|
|
|
}, MucRoom.class, params);
|
|
|
addDefaultRequest(request);
|
|
|
@@ -447,6 +463,7 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
switch (msg.what){
|
|
|
case uploadFile:
|
|
|
String roomjId=msg.getData().getString("roomjId");
|
|
|
+ Log.i("Arison","SelectContactsActivity:handleMessage:466:handler uploadFile="+uploadFile);
|
|
|
uploadAvatar(image,roomjId);
|
|
|
break;
|
|
|
}
|
|
|
@@ -455,7 +472,7 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
};
|
|
|
|
|
|
|
|
|
- private void createRoomSuccess(String roomId, String roomJid, String roomName, String roomDesc) {
|
|
|
+ private void createRoomSuccess(String roomId, String roomJid, String roomName, String roomDesc,String photoId) {
|
|
|
Friend friend = new Friend();// 将房间也存为好友
|
|
|
friend.setOwnerId(mLoginUserId);
|
|
|
friend.setUserId(roomJid);
|
|
|
@@ -463,7 +480,8 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
friend.setDescription(roomDesc);
|
|
|
friend.setRoomFlag(1);
|
|
|
friend.setRoomId(roomId);
|
|
|
- friend.setRoomCreateUserId(mLoginUserId);
|
|
|
+// friend.setRoomCreateUserId(mLoginUserId);
|
|
|
+ friend.setRoomCreateUserId(photoId);
|
|
|
// timeSend作为取群聊离线消息的标志,所以要在这里设置一个初始值
|
|
|
friend.setTimeSend(TimeUtils.sk_time_current_time());
|
|
|
friend.setStatus(Friend.STATUS_FRIEND);
|
|
|
@@ -544,6 +562,7 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
|
|
|
|
|
|
private void uploadAvatar(File file, final String roomjId) {
|
|
|
+
|
|
|
if (!file.exists()) {// 文件不存在
|
|
|
return;
|
|
|
}
|
|
|
@@ -557,7 +576,9 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
long roomImgId=Long.valueOf(loginUserId)+time;
|
|
|
Log.i("Arison","SelectContactsActivity:uploadAvatar:471:roomImgId:"+roomImgId
|
|
|
+"时间:"+ DateFormatUtil.getDateTimeStr(new Date(time)));
|
|
|
- final String photoId="812815872";
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
params.put("userId", photoId);//群主id+当前系统时间
|
|
|
try {
|
|
|
params.put("file1", file);
|
|
|
@@ -606,6 +627,9 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
// Looper.loop();
|
|
|
}
|
|
|
|
|
|
+ private String photoId;
|
|
|
+ private static boolean uploadIsEnd=true;
|
|
|
+
|
|
|
/**
|
|
|
* @功能:上传文件后,需要上传更新图像id
|
|
|
* @author:Arisono
|
|
|
@@ -613,6 +637,7 @@ public class SelectContactsActivity extends BaseActivity {
|
|
|
* @return:
|
|
|
*/
|
|
|
public void updateIMChatImageId(String roomjId,String photoId){
|
|
|
+// this.uploadIsEnd=true;
|
|
|
String url = MyApplication.getInstance().getConfig().apiUrl+"room/setRelationGroupPhoto";
|
|
|
final String requestTag = "loginManagerSystem";
|
|
|
Map<String, String> params = new HashMap<String, String>();
|