Merge branch 'master' of http://10.1.235.20:3000/ipu/ipu-guide

# Conflicts:
#	show-server/src/main/webapp/ipu/frame/mobile/expand-mobile.js

show-server/src/main/webapp/biz/js/index.js

@@ -43,6 +43,10 @@ require(["ipuUI", "jquery", "iScroll","mobile","ipuMobile"], function (ipuUI, $,
	    Mobile.setBackCallListener(function(e){
			alert(e);
		});
		
		IpuMobile.getJpushInfo(function(res){
			if (res) Mobile.tip('有通知消息：'+res);
		});
	    
	    // $("#rnUI").click(function(){
	    // 	IpuMobile.openRN("UI_GRIDVIEW", "main");

show-server/src/main/webapp/biz/js/plugins/jPush.js

@@ -36,6 +36,9 @@ require(["ipuMobile", "jquery","iScroll", "ipuUI"], function(IpuMobile,$,iScroll
			alert("收到消息:\n" + msg);
		});
		
		IpuMobile.listenerEvent("IPUJPUSHNOTICE", function(msg){
			alert("来自通知:\n" + msg);
		});
	});
	
});

show-server/src/main/webapp/ipu/frame/mobile/expand-mobile.js

@@ -319,8 +319,8 @@ define(["require","jcl"],function(require,Wade) {
			},getContacts:function(callback,err){
				storageCallback("getContacts",callback);
				execute("getContacts",[], err);	
			},openKeyboard:function(value,err){
				execute("openKeyboard",[value],err);
			},openKeyboard:function(fun,params,err){
				execute("openKeyboard",[fun,params],err);
			},setScreenLock:function(dataParam,callback,err){
				storageCallback("setScreenLock",callback);
				execute("setScreenLock",[dataParam],err);
@@ -648,6 +648,10 @@ define(["require","jcl"],function(require,Wade) {
            },graffitiPic:function (callback,type,info,paintData) {
				storageCallback("graffitiPic",callback);
				execute("graffitiPic",[type,info,paintData]);
			},getJpushInfo:function(callback,err){
				storageCallback("getJpushInfo", callback);
				execute("getJpushInfo",[],err)
			}
            },openCustUrl:function (url,callback,title, buttons, styles, hideTopBar, err) {
                storageCallback("openCustUrl", callback);
                execute("openCustUrl", [encodeURIComponent(url), title, buttons, styles, hideTopBar],err);