LiuJie 10 лет назад
Родитель
Сommit
4ec8e47ba2

+ 18 - 3
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,"服务器未指定需要的参数");

+ 2 - 0
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解析异常");

+ 3 - 0
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"