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

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="41"
-    android:versionName="4.1" >
+    android:versionCode="42"
+    android:versionName="4.2">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -193,7 +193,7 @@
         <!-- Tool Activity -->
         <activity
             android:name=".ui.tool.MultiImagePreviewActivity"
-            android:screenOrientation="portrait" />
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ui.tool.SelectAreaActivity"
             android:screenOrientation="portrait" />

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

@@ -578,6 +578,8 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         params.put("access_token", MyApplication.getInstance().mAccessToken);
         params.put("pageSize", "" + 10);
         params.put("type", "0");
+        Log.i("Arison", "params:" + JSON.toJSONString(params));
+        Log.i("Arison", "url:" + mConfig.MSG_LIST);
         StringJsonArrayRequest<PublicMessage> request = new StringJsonArrayRequest<PublicMessage>(
                 mConfig.MSG_LIST, new Response.ErrorListener() {
             @Override

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

@@ -63,7 +63,7 @@ public class NumberUtils {
         int num[]=new int[8];
         int c=0;
         for (int i = 0; i < 8; i++) {
-            num[i] = new Random().nextInt(10);
+            num[i] = new Random().nextInt(10) + 1;
             c = num[i];
             for (int j = 0; j < i; j++) {
                 if (num[j] == c) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/SelectContactsActivity.java

@@ -45,6 +45,7 @@ import com.xzjmyk.pm.activity.bean.MucRoomSimple;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.bean.message.MucRoom;
 import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
+import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.broadcast.MucgroupUpdateUtil;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
@@ -429,7 +430,7 @@ public class SelectContactsActivity extends BaseActivity {
             }
         });
         uploadImageTask.start();
-
+        Log.i("Arison", "前 photoId=" + photoId);
         params.put("text", JSON.toJSONString(inviteUsers));
 
         ProgressDialogUtil.show(mProgressDialog);
@@ -447,7 +448,7 @@ public class SelectContactsActivity extends BaseActivity {
                 if (parserResult && result.getData() != null) {
                     while (uploadImageTask.isAlive()){
                           //上传线程正在运行
-                        Log.i("Arison","SelectContactsActivity:onResponse:440:上传是否结束："+uploadIsEnd);
+                        // Log.i("Arison","SelectContactsActivity:onResponse:440:上传是否结束："+uploadIsEnd);
                     }
 //                    while (!uploadIsEnd){
 //                        //上传线程正在运行
@@ -481,6 +482,7 @@ public class SelectContactsActivity extends BaseActivity {
 
 
     private void createRoomSuccess(String roomId, String roomJid, String roomName, String roomDesc,String photoId) {
+        Log.i("Arison", "photoId=" + photoId);
         Friend friend = new Friend();// 将房间也存为好友
         friend.setOwnerId(mLoginUserId);
         friend.setUserId(roomJid);
@@ -491,13 +493,14 @@ public class SelectContactsActivity extends BaseActivity {
 //        friend.setRoomCreateUserId(mLoginUserId);
         friend.setRoomCreateUserId(photoId);
         // timeSend作为取群聊离线消息的标志，所以要在这里设置一个初始值
-        friend.setTimeSend(TimeUtils.sk_time_current_time());
+        friend.setTimeSend(TimeUtils.sk_time_current_time() - 5);
         friend.setStatus(Friend.STATUS_FRIEND);
         FriendDao.getInstance().createOrUpdateFriend(friend);
         // 更新名片盒（可能需要更新）
         CardcastUiUpdateUtil.broadcastUpdateUi(this);
         // 更新群聊界面
         MucgroupUpdateUtil.broadcastUpdateUi(this);
+//        MsgBroadcast.broadcastMsgUiUpdate(this);
 
         MucRoomSimple mucRoomSimple = new MucRoomSimple();
         mucRoomSimple.setId(roomId);
@@ -505,7 +508,7 @@ public class SelectContactsActivity extends BaseActivity {
         mucRoomSimple.setName(roomName);
         mucRoomSimple.setDesc(roomDesc);
         mucRoomSimple.setUserId(mLoginUserId);
-        mucRoomSimple.setTimeSend(TimeUtils.sk_time_current_time());
+        mucRoomSimple.setTimeSend(TimeUtils.sk_time_current_time() - 5);
         String reason = JSON.toJSONString(mucRoomSimple);
         Log.d("roamer", "reason:" + reason);
         // 邀请好友

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

@@ -167,7 +167,7 @@ public class MessageFragment extends EasyFragment {
                     loadERPNewsNum(getActivity());
                 }
             }
-        }, 1000);
+        }, 100);
     }
 
     private void initView() {

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

@@ -481,7 +481,7 @@ public class MucChatActivity extends ActionBackActivity
 
     @Override
     public void onFriendAvatarLongClick(String friendUserId) {
-        mChatBottomView.addEditView("@"+friendUserId.trim());
+        mChatBottomView.addEditView("@" + friendUserId.trim());
     }
     @Override
     public void onMessageClick(ChatMessage chatMessage) {
@@ -565,7 +565,7 @@ public class MucChatActivity extends ActionBackActivity
         params.put("access_token", MyApplication.getInstance().mAccessToken);
         params.put("roomId", mFriend.getRoomId());
         Log.d("wang", "mAccessToken::" + MyApplication.getInstance().mAccessToken + "roomId" + mFriend.getRoomId());
-        StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(mConfig.ROOM_GET, new Response.ErrorListener() {
+        StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(MyApplication.getInstance().getConfig().ROOM_GET, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
                 ToastUtil.showErrorNet(mContext);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/MultiImagePreviewActivity.java

@@ -1,12 +1,14 @@
 package com.xzjmyk.pm.activity.ui.tool;
 
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
@@ -50,6 +52,7 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);//竖屏
 		if (getIntent() != null) {
 			mImages = (ArrayList<String>) getIntent().getSerializableExtra(AppConstant.EXTRA_IMAGES);
 			mPosition = getIntent().getIntExtra(AppConstant.EXTRA_POSITION, 0);
@@ -206,7 +209,7 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 			switch (scheme) {
 			case HTTP:
 			case HTTPS:// 需要网络加载的
-				ImageLoader.getInstance().displayImage(imageUrl, (ImageView) view);
+				ImageLoader.getInstance().displayImage(imageUrl, (ImageView) view, mImageLoadingListener);
 				break;
 			case UNKNOWN:// 如果不知道什么类型，且不为空，就当做是一个本地文件的路径来加载
 				if (!TextUtils.isEmpty(imageUrl)) {
@@ -249,6 +252,9 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 		@Override
 		public void onLoadingComplete(String arg0, View arg1, Bitmap arg2) {
 			mAttacher=new PhotoViewAttacher((ImageView) arg1);
+			Log.i("Arison", "" + mAttacher.getMidScale());
+			Log.i("Arison", "" + mAttacher.getMinimumScale());
+			mAttacher.setMinimumScale(0.5f);
 			mAttacher.update();
 
 			mAttacher.setOnPhotoTapListener(new PhotoViewAttacher.OnPhotoTapListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ViewPagerFixed.java

@@ -0,0 +1,39 @@
+package com.xzjmyk.pm.activity.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * Created by Arisono on 2016/6/14.
+ */
+public class ViewPagerFixed extends android.support.v4.view.ViewPager {
+
+    public ViewPagerFixed(Context context) {
+        super(context);
+    }
+
+    public ViewPagerFixed(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        try {
+            return super.onTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        try {
+            return super.onInterceptTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+}

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

@@ -5,7 +5,7 @@
     android:background="@color/black"
     android:orientation="vertical" >
 
-    <android.support.v4.view.ViewPager
+    <com.xzjmyk.pm.activity.view.ViewPagerFixed
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -107,7 +107,7 @@
     <string name="logout_des">您的账号在另外一台设备上登录，是否立即重新登陆？</string>
 
     <!-- MainActivity -->
-    <string name="message">信息</string>
+    <string name="message">消息</string>
     <string name="find">通讯录</string>
     <string name="nearby">工作</string>
     <string name="group_chat">群聊</string>