From 55fe07c4cd4a852529b24bbd438047584651d102 Mon Sep 17 00:00:00 2001
From: zengfantian <zftlive@163.com>
Date: Sat, 28 Feb 2015 11:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E6=96=B9=E6=B3=95=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BC=A0=E9=80=92=E5=8F=82=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/zftlive/android/tools/ToolAlert.java | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/com/zftlive/android/tools/ToolAlert.java b/src/com/zftlive/android/tools/ToolAlert.java
index 048ebf6..460d87f 100644
--- a/src/com/zftlive/android/tools/ToolAlert.java
+++ b/src/com/zftlive/android/tools/ToolAlert.java
@@ -410,13 +410,7 @@ public class ToolAlert {
     /**
      * 往状态栏发送一条通知消息
      * @param mContext 上下文
-     * @param iconResId 状态栏提示信息图标
-     * @param statusBarText 状态栏提示信息文本
-     * @param msgTitle 消息标题
-     * @param msgContent 消息内容
-     * @param forwardComponent 点击消息跳转的界面
-     * @param forwardKey 点击消息跳转界面需携带的数据key
-     * @param forwardData 点击消息跳转界面需携带的数据value
+     * @param message 消息Bean
      */
     public static void notification(Context mContext,NotificationMessage message){
         
@@ -445,7 +439,7 @@ public class ToolAlert {
         //设置通知显示的参数 
         Intent mIntent = new Intent(mContext, message.getForwardComponent());
         mIntent.setAction(ToolString.gainUUID());
-        mIntent.putExtra(message.getForwardKey(),message.getForwardData());
+        mIntent.putExtras(message.getExtras());
         mIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
         //自动更新PendingIntent的Extra数据
         PendingIntent pIntent = PendingIntent.getActivity(mContext,0,mIntent,PendingIntent.FLAG_UPDATE_CURRENT);
@@ -459,9 +453,7 @@ public class ToolAlert {
     /**
      * 发送自定义布局通知消息
      * @param mContext 上下文
-     * @param iconResId  状态栏提示信息图标
-     * @param statusBarText 状态栏提示信息文本
-     * @param mRemoteViews  自定义不布局通知文件
+     * @param message  消息Bean
      */
     public static void notificationCustomView(Context mContext,NotificationMessage message){
     	
@@ -478,7 +470,7 @@ public class ToolAlert {
         //设置通知显示的参数 
         Intent mIntent = new Intent(mContext, message.getForwardComponent());
         mIntent.setAction(ToolString.gainUUID());
-        mIntent.putExtra(message.getForwardKey(), message.getForwardData());
+        mIntent.putExtras(message.getExtras());
         mIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
         PendingIntent contentIntent = PendingIntent.getActivity(mContext,0,mIntent,PendingIntent.FLAG_UPDATE_CURRENT);
         mNotify.contentIntent = contentIntent;