Merge remote-tracking branch 'origin/developer_master' into developer_master

# Conflicts:
#	WeiChat/src/main/java/com/sk/weichat/adapter/PublicMessageAdapter.java
#	build.gradle

WeiChat/src/main/java/com/sk/weichat/ui/PushNetMessageReceiver.java

@@ -80,11 +80,26 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 
 	}
 
+	/**
+	 * @desc:待审批流程，我的任务，通知公告消息到来置顶
+	 * @author：Administrator on 2016/4/20 16:46
+	 */
 	@Override
-	public void onNotificationArrived(Context ct, String arg1, String arg2, String arg3) {
-		CommonUtil.pushProcessMsg(ct, MyApplication.getInstance().mLoginUser.getUserId());
+	public void onNotificationArrived(Context ct, String title, String content, String params) {
+		if(new JsonValidator().validate(params)){
+			  String platform=JSON.parseObject(params).getString("platform");
+			if(StringUtils.isEmpty(platform)){
+				CommonUtil.pushProcessMsg(ct, MyApplication.getInstance().mLoginUser.getUserId());
+			}
+
+		}
 	}
 
+
+	/**
+	 * @desc:点击操作  ERP系统或者B2B系统
+	 * @author：Administrator on 2016/4/20 16:42
+	 */
 	@Override
 	public void onNotificationClicked(Context ct, String title, String content, String params) {
 		Log.i("wang", "title=" + title);
@@ -109,7 +124,7 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 					CommonUtil.loadWebView(ct,url,titlePage,master,masterId,uu);
 				}
 			}else{
-				com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct,"参数异常");
+				com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct,"缺少参数：platform");
 			}
 		}else{
 			com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct,"服务器未指定需要的参数");

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.java

@@ -361,9 +361,8 @@ public class CompanyContactsActivity extends BaseActivity {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     String exception = msg.getData().getString("result");
-                    if (exception.contains("会话")) {
-                    } else {
-                    }
+                    com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(mContext,exception);
+                    com.sk.weichat.ui.erp.net.ViewUtil.AutoLoginErp(ct);
                     reScrollView.onRefreshComplete();
                     break;
                 default:

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NewsTwoActivity.java

@@ -114,7 +114,7 @@ public class NewsTwoActivity extends BaseActivity {
                     Log.i(TAG, result);
                     mEmptyLayout.setErrorMessage(result + ",请刷新重试！");
                     mEmptyLayout.showError();
-                    ViewUtil.AutoLoginErp(NewsTwoActivity.this, handler);
+                    ViewUtil.AutoLoginErp(NewsTwoActivity.this);
                     break;
                 default:
                     break;

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticesActivity.java

@@ -139,7 +139,7 @@ public class NoticesActivity extends BaseActivity {
                     Log.i(TAG, result);
                     mEmptyLayout.setErrorMessage(result + ",请刷新重试！");
                     mEmptyLayout.showError();
-                    ViewUtil.AutoLoginErp(NoticesActivity.this, handler);
+                    ViewUtil.AutoLoginErp(NoticesActivity.this);
                     break;
                 default:
                     break;

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/TaskActivity.java

@@ -147,7 +147,7 @@ public class TaskActivity extends BaseActivity {
                 mEmptyLayout.setErrorMessage(exception+",请刷新重试！");
                 mEmptyLayout.showError();
                 listview_main.onRefreshComplete();
-                ViewUtil.AutoLoginErp(TaskActivity.this, handler);
+                ViewUtil.AutoLoginErp(TaskActivity.this);
                 Log.i("login","自动登录");
             }
         };

WeiChat/src/main/java/com/sk/weichat/ui/erp/net/ViewUtil.java

@@ -744,7 +744,7 @@ public class ViewUtil {
     /**
      * @注释：ERP自动登录
      */
-    public static void AutoLoginErp(Context ct, Handler handler) {
+    public static void AutoLoginErp(Context ct) {
         Log.i("LoginErp", "自动登录...");
         if (!StringUtils.isEmpty(Constants.getAppBaseUrl(ct))) {
             ViewUtil.ct=ct;
@@ -756,13 +756,13 @@ public class ViewUtil {
             Log.i("LoginErp", "master..." + master);
             Log.i("LoginErp", "phone..." + phone);
             Log.i("LoginErp", "password..." + password);
-            LoginERPTask(ct, handler, url, master, phone, password);
+            LoginERPTask(ct,url, master, phone, password);
         }
 
     }
 
     // 登录ERP
-    public static void LoginERPTask(Context ct, Handler mhandler, String url, String master, String username, String password) {
+    public static void LoginERPTask(Context ct, String url, String master, String username, String password) {
         url = url + "mobile/login.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("username", username);

WeiChat/src/main/java/com/sk/weichat/ui/message/MucChatActivity.java

@@ -23,6 +23,7 @@ import android.view.MenuItem;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.ipaulpro.afilechooser.FileUtils;
@@ -490,11 +491,10 @@ public class MucChatActivity extends ActionBackActivity
     public void sendPushTask(String from, String to, String body, int[] str) {
         String url = "http://113.105.74.140:8092/tigase/push";
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("from", from);
-        params.put("to", to);
-        params.put("text", str);
+        params.put("text", JSON.toJSONString(str));
         params.put("body", body);
-        Log.i("push", "推送百度 from:" + from + "to:" + to + "body:" + body);
+        Log.i("push", "推送百度 from:" + from + "to:" + to + "body:" + body+"text:"+
+                JSON.toJSONString(str));
         ViewUtil.httpSendRequest(this, url, params, mHandler, null, 5, null, null, "get");
     }
 

WeiChat/src/main/java/com/sk/weichat/volley/StringJsonObjectRequest.java

@@ -173,6 +173,7 @@ public class StringJsonObjectRequest<T> extends Request<String> {
 			JSONObject jsonObject = JSON.parseObject(arg0);//解析json有异常的风险
 			result.setResultCode(jsonObject.getIntValue(Result.RESULT_CODE));
 			result.setResultMsg(jsonObject.getString(Result.RESULT_MSG));
+//			开始解析数据
 			if (!mClazz.equals(Void.class)) {
 				String data = jsonObject.getString(Result.DATA);
 				if (!TextUtils.isEmpty(data)) {
@@ -185,6 +186,7 @@ public class StringJsonObjectRequest<T> extends Request<String> {
 
 				}
 			}
+
 		} catch (Exception e) {
 			e.printStackTrace();
 			Log.i("exception", "JSON解析异常");

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

@@ -11,6 +11,9 @@
         android:id="@+id/pull_refresh_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:divider="#00000000"
+        android:dividerHeight="0dip"
+        android:listSelector="@android:color/transparent"
         ptr:ptrAnimationStyle="flip"
         ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
         ptr:ptrDrawableStart="@drawable/default_ptr_flip"

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

@@ -100,8 +100,9 @@
         <TextView
             android:id="@+id/multi_praise_tv"
             android:layout_width="fill_parent"
-            android:layout_height="18dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
+            android:text="safddsafdsafdsafdsafdsafadsfewqewqdfdsafdsafdsafdsa法国人完全覆盖对方的身份为亲人"
             android:background="@drawable/praise_bg"
             android:drawableLeft="@drawable/likes"
             android:textSize="@dimen/text_min" />
@@ -110,7 +111,6 @@
             android:id="@+id/command_listView"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@color/pop_bg"
             android:layout_marginTop="5dp" />
     </LinearLayout>