Merge branch 'zzpcheck'

张宗朋
2 parents 20eaab46 fa81cf70
Showing 7 changed files with 30 additions and 54 deletions
src/main/java/com/cnlive/mz/live/action/LiveAction.java
src/main/webapp/pages/live/all_live_management.jsp
src/main/webapp/static/assets/cnlive/js/all_live.js
src/main/webapp/static/assets/cnlive/js/common.js
src/main/webapp/static/assets/cnlive/js/global.js
src/main/webapp/static/assets/cnlive/js/live.js
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -138,12 +138,12 @@ public class LiveAction {
 			// 断流。
 			try {
 				addBlackList(signature, accesskey, expire, streamName);
-				delBlackList(delsignature, accesskey, expire, streamName);
+				//delBlackList(delsignature, accesskey, expire, streamName);
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
 			// 直播通知
-			 tLiveService.notify(video_uuid, -1);
+			 //tLiveService.notify(video_uuid, -1);
 			boolean flag = tCheckService.closeLive(id);
 			return new Result(flag);
 		}
@@ -175,7 +175,6 @@ public class LiveAction {
 	public String addBlackList(String signature, String accesskey, String expire, String streamName) throws UnsupportedEncodingException {
 		String url = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=" + signature + "&accesskey=" + accesskey + "&expire=" + expire
 				+ "&app=live&method=add&name=" + streamName;
-		System.out.println(url);
 		String jsonArrStr = HttpReq.getRequestWidthResult(url);
 		int status = HttpReq.getRequest(url);
 		System.out.println(status + "......and......" + jsonArrStr);
@@ -195,7 +194,6 @@ public class LiveAction {
 	public Object delBlackList(String signature, String accesskey, String expire, String streamName) throws UnsupportedEncodingException {
 		String url = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=" + signature + "&accesskey=" + accesskey + "&expire=" + expire
 				+ "&app=live&method=del&name=" + streamName;
-		System.out.println("..url.." + url);
 		String jsonArrStr = HttpReq.getRequestWidthResult(url);
 		System.out.println("..jsonArrStr.." + jsonArrStr);
 		return jsonArrStr;
@@ -216,8 +214,16 @@ public class LiveAction {
 		System.out.println("...parmas..." + params);
 		String t_user_id = params.getString("search_user_id");
 		String title = params.getString("search_title");
+
+		try {
+			title = new String(title.trim().getBytes("ISO-8859-1"), "utf-8");
+			System.out.println("...title.."+title);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}  
+
 		Pager<TLive> tLive = tLiveService.getTLiveAllPager(page_number, Constants.PAGE_SIZE, t_user_id, title);
-		System.out.println(tLive);
+		System.out.println("tLive====="+tLive);
 		return new View("live/all_live_management.jsp").data("tLive", tLive);
 	}
@@ -32,11 +32,11 @@
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="box  box-warning">
-							<div class="box-header with-border">
+							<div class="box-header with-border"> 
 								<h3 class="box-title"></h3>
 								<div class="box-tools">
 									<div class="input-group">
-										<form role = "form" id="formid"  name= "myform" action ="../../live/search/1" method ="get" >
+										<form role="form" action="../../live/search/1" method="get">
 											<div class="input-group">
 												<input type="text" name="search_user_id" id="search_user_id"
 													class="form-control input-sm" style="width: 150px;"
@@ -44,10 +44,9 @@
 													name="search_title" id="search_title"
 													class="form-control input-sm" style="width: 150px;"
 													placeholder="活动名称" />
-											    <button id="t_activity_search_btn" type="submit"
-													class="btn btn-sm btn-default">
+												<button type="submit" class="btn btn-sm btn-default">
 													<i class="fa fa-search"></i>搜索
-												</button> 
+												</button>
 											</div>
 										</form>
 									</div>
@@ -74,8 +73,7 @@
 											<td><fmt:formatDate value="${item.start_time}"
 													pattern="yyyy-MM-dd HH:mm" /></td>
 											<td>${item.end_time}</td>
-											<td><c:if
-													test="${item.t_status_id==0}">
+											<td><c:if test="${item.t_status_id==0}">
 													<span class="badge bg-green">未开始</span>
 												</c:if> <c:if test="${item.t_status_id==2}">
 													<span class="badge bg-green">正常结束</span>
@@ -86,6 +84,10 @@
 												</c:if></td>
 											<td>
+												<%-- <button type="button" class="btn btn-xs btn-success" id="down" onclick="t_live_close('${item.id}','${item.uuid}');">
+												<i class="icon-upload"></i>下线
+											</button> --%>
+
 												<button class="btn  btn-danger btn-sm"
 													onclick="t_live_close('${item.id}','${item.uuid}');">
 													<i class="fa fa-close"></i>
@@ -104,7 +106,7 @@
 						</div>
 					</div>
 				</div>
-	       </section>
+			</section>
 		</div>
 		<%@ include file="/pages/common/bottom.jsp"%>
 	</div>
@@ -7,7 +7,6 @@ function t_live_close(id, uuid) {
 			alert('获取错误！');
 		},
 		success : function(data) {
-			alert(data);
 			location.href = "../../live/alllive/1";
 		}
 	});
@@ -6,20 +6,6 @@
 function next_page(pageNum) {
 	window.location.href = "" + pageNum;
 }
-function next_pager(pageNum) {
-	$.ajax({
-		url : '../../live/searchg/' + pageNum,
-		type : 'post',
-		datatype : "json",
-		async : true,
-		error : function() {
-		},
-		success : function(data) {
-			location.href = '../../live/search/'+pageNum;
-		}
-	});
-
-}
 // 提示
 function showTip(succ) {
 var BASE; // Context Path（在 script.jsp 中初始化）
-
+function next_page(pageNum){
+	window.location.href = "" + pageNum+window.location.search;
+	alert(window.location.search);
+}
 var Smart = {
     /* -------------------------------------------------- 函数 -------------------------------------------------- */
     Validator: {
@@ -146,7 +149,7 @@ $(function() {
     });
     // 设置 form 默认为 post 类型
-    $('form').attr('method', 'post');
+   // $('form').attr('method', 'post');
     // 全局 AJAX 设置
     $.ajaxSetup({
@@ -494,10 +494,6 @@ function t_live_underLine(id){
 function checkUser(){
 	 var search_user_id = $("#search_user_id").val();
 	 var search_title = $("#search_title").val();
-	 //var href ="../search/1?search_user_id="+search_user_id+"&search_title="+search_title ;
-	 //window.open(href);
-	 //window.location.href ="../../live/search/1?search_user_id="+search_user_id+"&search_title="+search_title ;
-
 	 $.ajax({
 			url:'../../live/search/1',
 			type:'post',
@@ -506,8 +502,8 @@ function checkUser(){
 				alert('下线时发生错误!');
 			},
 			success : function(data) {
-				location.href = "../../live/search/1?search_user_id="+search_user_id+"&search_title="+search_title;
-				alert("下线成功");
+				//location.href = "../../live/search/1?search_user_id="+search_user_id+"&search_title="+search_title;
+				//alert(location.href);
 			}
 		});
 }
 #Generated by Maven Integration for Eclipse
-#Thu Jun 23 09:20:00 CST 2016
-version=0.0.1-SNAPSHOT
-groupId=com.cnlive.mz.live.web
-m2e.projectName=cnlive_live_web
-m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
-artifactId=cnlive_live_web
-#Generated by Maven Integration for Eclipse
-#Tue Jun 21 13:17:57 CST 2016
-version=0.0.1-SNAPSHOT
-groupId=com.cnlive.mz.live.web
-m2e.projectName=cnlive_live_web
-m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
-artifactId=cnlive_live_web
-#Generated by Maven Integration for Eclipse
-#Mon Jun 20 09:31:18 CST 2016
-#Mon Jun 20 10:10:00 CST 2016
-#Fri Jun 17 09:20:43 CST 2016
+#Fri Jun 24 09:13:59 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web
 m2e.projectLocation=C\:\\Users\\Administrator\\git\\cnlive_live_web
-artifactId=cnlive_live_web
 \ No newline at end of file
+artifactId=cnlive_live_web