推送逻辑改造

display-server/web/biz/js/more/push/PushReceive.js

@@ -1,17 +1,24 @@
require(["domReady!","wadeMobile","mobile","util"],function(doc,WadeMobile,Mobile){
	/*进入界面先销毁链接,防止离开此界面时没有断开*/
	WadeMobile.unregisterForPush();
	/*接受推送信息后的处理方法*/
	window.receiveMessage = function(msg){
		WadeMobile.showNotification(msg);
        WadeMobile.alert(msg);
		//弹出一个notice窗体
	};
	WadeMobile.setCallbackForPush("receiveMessage");
	if(WadeMobile.isApp()){
		/*进入界面先销毁链接,防止离开此界面时没有断开*/
		WadeMobile.unregisterForPush();
		/*接受推送信息后的处理方法*/
		window.receiveMessage = function(msg){
			if(WadeMobile.isIOS()){
				WadeMobile.alert(msg);
			}else if(WadeMobile.isAndroid()){
				WadeMobile.showNotification(msg);
				alert(msg);
			}
		};
		WadeMobile.setCallbackForPush("receiveMessage");
	}
	
	$("#connect").tap(function(){
		if($("#connect").html()=="连接"){
			WadeMobile.getSysInfo(function(info){
				$("#deviceId").html(info);
				$("#devicePart").css("display","block"); 
				WadeMobile.registerForPush(info,function(msg){
					WadeMobile.tip(msg);
				},function(msg){
@@ -26,6 +33,8 @@ require(["domReady!","wadeMobile","mobile","util"],function(doc,WadeMobile,Mobil
			});
			$("#connect").attr("class", "e_button-ok");
			$("#connect").html("连接");
			
			$("#devicePart").css("display","none"); 
		}
	});
});

display-server/web/res/js/mobile/expand-mobile.js

@@ -302,8 +302,8 @@ define(["require"],function(require) {
			},scanMultiple:function(callback){
				storageCallback("scanMultiple",callback);
				execute("scanMultiple",[]);
			},showNotification:function(content,title,icon){
				execute("showNotification",[content,title,icon]);
			},showNotification:function(content,title,icon,id){
				execute("showNotification",[content,title,icon,id]);
			}
		};
	})();

display-server/web/template/webapp/more/push/PushReceive.html

@@ -33,6 +33,19 @@
				<li><button class="e_button-ok" id="connect">连接</button></li>
			</ul>
		</div>
		<br>
		<div class="c_list" style="display:none" id="devicePart">
			<ul>
				<li>
					<div class="content content-vertical">
						<div class="label">设备标识:</div>
						<div class="value">
							<textarea id="deviceId" style="height:1rem;"></textarea>
						</div>
					</div>
				</li>
			</ul>
		</div>
	</div>
</div>
</body>

wade-mobile-func/src/com/wade/mobile/func/MobileUI.java

@@ -894,7 +894,7 @@ public class MobileUI extends Plugin {
		String content = param.getString(0);//消息内容
		String title = param.getString(1);//消息标题
		String iconName = param.getString(2);//消息图标
		int id = param.getInt(3);//设置通知id值
		String id = param.getString(3);//设置通知id值
		
		title = isNull(title) ? MobileAppInfo.getInstance(context).getAppName() : title;
		
@@ -905,8 +905,7 @@ public class MobileUI extends Plugin {
			icon = context.getApplicationInfo().icon;
		}
		
		id = (id == 0) ? 100 : id;
		showNotification(content, title, icon, id);
		showNotification(content, title, icon, isNull(id) ? 100 : Integer.parseInt(id));
	}
	
	public void showNotification(String content,String title,int icon,int id){