云巴推送调整

display-server/.project

@@ -14,4 +14,11 @@
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
	<linkedResources>
		<link>
			<name>wade-mobile-server-src</name>
			<type>2</type>
			<location>/Users/kevin/Work/WorkSpace/javaCore/wade-mobile-server/src</location>
		</link>
	</linkedResources>
</projectDescription>

display-server/web/biz/js/push/Push.js

@@ -0,0 +1,73 @@
require(["domReady!","wadeMobile","mobile","util"],function(doc,WadeMobile,Mobile){
	var isConnected = false; //是否连接
	/*刷新在线联系人*/
	var refreshOnlineList = function(){
		var loading = '<div class="c_loading"><div class="pic"></div><div class="text">正在加载中，请稍候</div></div>';
		$("#content").html(loading);
		WadeMobile.httpGet(function(data){
			var onlineStaffs = new Wade.DataMap(data).get("SESSION_LRU");
			onlineStaffs = onlineStaffs.split("|");
			
			var params = new Wade.DatasetList();
			var param;
			for(var i=0;i<onlineStaffs.length;i++){
				param = new Wade.DataMap();
				if(onlineStaffs[i]!=""){
					param.put("ACCOUNT",onlineStaffs[i]);
					params.add(param);
				}
			}
			param = new Wade.DataMap();
			param.put("ONLINE_STAFFS",params);
			Mobile.getTemplate("OnlineList",param.toString(),function(html){
				$("#content").html(html);
				new iScroll("content");
				$("#refresh").tap(function(){
					refreshOnlineList();
				});
			});
		},"http://114.215.100.48:8080/push/mobiledata?action=getLRUSession",true);
//		},"http://192.168.51.155:8080/push/mobiledata?action=getLRUSession",true);
	}
	/*进入界面先销毁链接,防止离开此界面时没有断开*/
	WadeMobile.unregisterForPush(function(){
		refreshOnlineList();//刷新在线人员列表
	});
	
	$("#register").tap(function(){
		if($("#register").html()=="连接"){
			if(!$("#account").val()){
				WadeMobile.tip("请输入一个昵称,让小伙伴认识你~");
				return;
			}
			WadeMobile.registerForPush($("#account").val(),function(msg){
				WadeMobile.tip($("#account").val() + msg);
				$("#register").html("注销");
				
				refreshOnlineList();//刷新在线人员列表
				isConnected = true;
			},function(msg){
				WadeMobile.tip(msg);
			});
		}else{
			WadeMobile.unregisterForPush(function(){
				WadeMobile.tip("注销成功");
				refreshOnlineList();//刷新在线人员列表
			});
			$("#register").html("连接");
			$("#account").val("");
			isConnected = false;
		}
	});
	
	window.chatByAccount = function(account){
		if(!isConnected){
			WadeMobile.tip("请先输入昵称让小伙伴找到你!然后【连接】");
			return;
		}
		var param = new Wade.DataMap();
		param.put("OWN_ACCOUNT",$("#account").val());
		param.put("OTHER_ACCOUNT",account);
		Mobile.openTemplate("Chat",param);
	}
});

display-server/web/biz/js/push/YunbaPush.js

@@ -1,16 +1,20 @@
require(["common","wadeMobile"], function(Common, WadeMobile) {
	
	$('#channel').val("IPU");//设置频道名称
	$('#alias').val("Dave");//设置默认用户别名
	$('#msgForSend').val("今天天气真不错！");//设置内容
require(["common","wadeMobile","jcl","util"], function(Common, WadeMobile,$) {
	
//	$('#alias').val("Dave");//设置默认用户别名
//	$('#msgForSend').val("今天天气真不错！");//设置内容
	
	$("#register").tap(function() {
		//按钮
		var registerBtn = $('#register');
		
		if(registerBtn.attr('connected') != 'true'){
			var alias = $('#alias').val();
			if (escape(alias).indexOf( "%u" ) >= 0){
				alert("昵称不能含有中文，请重新输入！");
				return;
			}
			//订阅主题/频道
			WadeMobile.registerForPush($('#channel').val(), function(obj){
			WadeMobile.registerForPushWithYunba(alias, function(obj){
				if(obj != 'SUC'){
					alert('频道订阅失败！');
				}
@@ -19,7 +23,7 @@ require(["common","wadeMobile"], function(Common, WadeMobile) {
			});
		}else{
			//退订主题/频道
			WadeMobile.unregisterForPush(function(obj){
			WadeMobile.unregisterForPushWithYunba(function(obj){
				if(obj != 'SUC'){
					alert('频道退订失败！')
				}
@@ -31,12 +35,31 @@ require(["common","wadeMobile"], function(Common, WadeMobile) {
	
	
	$("#send").tap(function() {
		//获取参数
		var array = function(info){
			var index = info.lastIndexOf("@");
			var alias = "ALL", msg = info;
			if(index != -1){
				index += info.substr(index).indexOf(' ');
				msg = info.substr(index).trim();
				
				var aliasInfo = info.substring(0, index).trim();
				var aliasList = alias.split(/\s+/);
				alias = aliasInfo.replace(new RegExp(/(@)/g), '').split(/\s+/)[0];
			}
			
			var result = new Array();
			result.push(alias);//发送用户
			result.push(msg);//发送内容
			return result;
			
		}($('#msgForSend').val());
		
		//发送消息
		WadeMobile.sendText($('#alias').val(), $('#msgForSend').val(), function(obj){
		WadeMobile.sendTextWithYunba(array[0], array[1], function(obj){
			alert((obj != 'SUC') + '发送结果：' + obj);
			if(obj != 'SUC'){
				alert('消息发送失败！')
				return ;
				alert('消息发送失败！');
			}
		});
	});
@@ -57,5 +80,5 @@ require(["common","wadeMobile"], function(Common, WadeMobile) {
		$('#msgForReceive').prepend($(content)); 
	}
	//设置回调函数
	WadeMobile.setCallbackForPush("receiveMessage");
	WadeMobile.setCallbackForPushWithYunba("receiveMessage");
});

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

@@ -229,16 +229,16 @@ define(["require"],function(require) {
			},setCallbackForPush:function(callback){
				execute("setCallbackForPush", [callback]);
			},registerForPushWithYunba:function(account,callback,err){
				storageCallback("registerForPush",callback);
				execute("registerForPush",[account],err);
				storageCallback("registerForPushWithYunba",callback);
				execute("registerForPushWithYunba",[account],err);
			},unregisterForPushWithYunba:function(callback){
				storageCallback("unregisterForPush",callback);
				execute("unregisterForPush", []);
				storageCallback("unregisterForPushWithYunba",callback);
				execute("unregisterForPushWithYunba", []);
			},sendTextWithYunba:function(account,content,callback,err){
				storageCallback("sendText",callback);
				execute("sendText", [account,content],err);
				storageCallback("sendTextWithYunba",callback);
				execute("sendTextWithYunba", [account,content],err);
			},setCallbackForPushWithYunba:function(callback){
				execute("setCallbackForPush", [callback]);
				execute("setCallbackForPushWithYunba", [callback]);
			},aliPay:function(tradeNo,subject,body,price,callback,err){
				storageCallback("aliPay",callback);
				execute("aliPay",[tradeNo,subject,body,price],err);	

display-server/web/template/webapp/plugin/YunbaPush.html

@@ -6,6 +6,7 @@
	<title>云巴推送</title>
	{%>template/common/Head.html%}
	<link href="biz/css/project.css" rel="stylesheet" type="text/css" />
	<script type="text/javascript" src="biz/js/push/YunbaPush.js"></script>
</head>
<body>
<div class="c_navBar">
@@ -16,5 +17,44 @@
		</div>
	</div>
</div>
<div class="c_list">
	<ul>
		<li ontap=";">
			<div class="content">
				
			</div>
		</li>
	</ul>
</div>
<div class="c_list">
	<ul>
		<li>
			<div class="content">
				<div class="value"><input type="text" class="e_left" id="alias" placeholder="昵称[字母/数字/下划线]" /></div>
				<div class="fn fn-2" id="register">连接</div>
			</div>
		</li>
	</ul>
</div>
<div class="c_list">
	<ul>
		<li>
			<div class="content">
				<div class="value"><input type="text" class="e_left" id="msgForSend" placeholder="发送信息" /></div>
				<div class="fn fn-2" id="send">发送</div>
			</div>
		</li>
		<li>
			<div class="content">
				<div id="msgForReceive" style="background-color:gray;color:white;height:190px;overflow-x:auto;overflow-y:auto;" class="panel panel-default col-sm-7 col-sm-offset-2">
					
				</div>
			</div>
		</li>
	</ul>
</div>
<div class="c_scroll c_scroll-mix c_scroll-fixed l_padding" style="top:2.22rem; bottom:0;" id="content">
</div>
</body>
</html>

display-server/web/template/webapp/push/Push.html

@@ -12,58 +12,26 @@
<div class="c_navBar">
	<div class="left">
	<div class="left">
	<div class="left">
		<div class="back">
			<span class="e_ico-back"></span>
			<span class="text">推送</span>
		</div>
	</div>
</div>
<div class="c_list">
	<ul>
		<li ontap=";">
			<div class="content">
				
			</div>
		</li>
	</ul>
</div>
<div class="c_list">
	<ul>
		<li>
			<div class="content">
				<div class="value"><input type="text" class="e_left" id="channel" placeholder="频道" /></div>
				<div class="value"><input type="text" class="e_left" id="account" placeholder="昵称" /></div>
				<div class="fn fn-2" id="register">连接</div>
			</div>
		</li>
	</ul>
</div>
<div class="c_list">
	<ul>
		<li>
			<div class="content">
				<div class="value"><input type="text" class="e_left" id="alias" placeholder="昵称[字母/数字/下划线]" /></div>
			</div>
		</li>
	</ul>
</div>
<div class="c_list">
	<ul>
		<li>
			<div class="content">
				<div class="value"><input type="text" class="e_left" id="msgForSend" placeholder="发送信息" /></div>
				<div class="fn fn-2" id="send">发送</div>
			</div>
		</li>
		<li>
			<div class="content">
				<div id="msgForReceive" style="background-color:gray;color:white;height:190px;overflow-x:auto;overflow-y:auto;" class="panel panel-default col-sm-7 col-sm-offset-2">
					
				</div>
			</div>
		</li>
	</ul>
</div>
<div class="c_scroll c_scroll-mix c_scroll-fixed l_padding" style="top:2.22rem; bottom:0;" id="content">
<div class="c_scroll c_scroll-mix c_scroll-fixed l_padding" style="top:1.22rem; bottom:0;" id="content">
</div>
</body>
</html>
</html>