From 23c81f96473e0a680b83ebb03858ddbac072c209 Mon Sep 17 00:00:00 2001
From: xiaofanku <xiaofanku@live.cn>
Date: Fri, 16 Oct 2020 09:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BB=9A=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=B1=82=E7=BD=AE=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/helper/TopicSocketUpdatedHandler.java | 10 ----------
 thrones/src/main/webapp/static/img/core.css          |  8 ++++----
 thrones/src/main/webapp/static/lib/forum/jForum.js   | 12 ++++++++++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/thrones/src/main/java/com/apobates/forum/thrones/controller/helper/TopicSocketUpdatedHandler.java b/thrones/src/main/java/com/apobates/forum/thrones/controller/helper/TopicSocketUpdatedHandler.java
index aa7ccef3..8cd27a0c 100644
--- a/thrones/src/main/java/com/apobates/forum/thrones/controller/helper/TopicSocketUpdatedHandler.java
+++ b/thrones/src/main/java/com/apobates/forum/thrones/controller/helper/TopicSocketUpdatedHandler.java
@@ -71,14 +71,4 @@ public class TopicSocketUpdatedHandler extends TextWebSocketHandler {
         List<ForumThreads> data = rs.stream().map(ForumThreads::new).collect(Collectors.toList());
         return new Gson().toJson(data);
     }
-    
-    /* 话题最近的回复
-    private String topicUpdatedPostes(long topicId, int previousUx) {
-        Stream<Posts> rs = postsService.getRecentByUnixStamp(topicId, previousUx);
-        //处理内容
-        if (rs.count() == 0) {
-            return null;
-        }
-        return new Gson().toJson(rs.collect(Collectors.toList()));
-    }*/
 }
\ No newline at end of file
diff --git a/thrones/src/main/webapp/static/img/core.css b/thrones/src/main/webapp/static/img/core.css
index a2a16068..c3ecb2c5 100644
--- a/thrones/src/main/webapp/static/img/core.css
+++ b/thrones/src/main/webapp/static/img/core.css
@@ -77,8 +77,8 @@ dt{font-weight:500}
 #topic_tages a, #topic_tages label{border-radius: 2px;}
 .mood-action span {text-indent: 5px;display: inline-block;}
 .div-select{border-width: 1px;border-style:solid;padding: 5px 8px;margin-bottom: 0;border-radius: .2rem;margin-top: 0;text-indent:.5rem;cursor:pointer;}
-#unknow_topic_tip{margin:0;border:0;border-radius:0;text-align:center;line-height:50px;position:relative}
-
+#unknow_topic_tip{margin:0;border:0;border-radius:0;text-align:center;line-height:50px;display:hidden;position:relative}
+.fix_style_tip{position: fixed!important;z-index: 9999;top: 0;}
 /*底部统计*/
 #footer{color: #fff;width: 100%;height:100px;position: relative;clear:both}.social-tooltip{width:50px;height:50px;line-height:50px;text-align:center;display:inline-block;color:#666;}.social-tooltip:hover{background-color:#000;color:#fff}
 .stat-block {box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(0, 0, 0, 0.05);}
@@ -361,7 +361,7 @@ body.jetblack{background-color:#272b30}
 .jetblack .fav-board-item{border: 1px solid #666;}
 .jetblack .fav-board-stats {border-top: 1px solid #666;color:#999}
 .jetblack .div-select{border-color:#666;background-color:#272b2e;color: #999;}
-.jetblack #unknow_topic_tip{background-color:#32383e!important;color:#e1e1e1!important}
+.jetblack #unknow_topic_tip{background-color:rgba(42, 73, 5, 0.9)!important;color:#e1e1e1!important}
 /*推送|置顶的样式*/
 .jetblack .fadeout-anim {
 background:#1c1e22;
@@ -454,7 +454,7 @@ body.snowhite{background-color:#f2f2f2!important}
 .snowhite .fav-board-item{border: 1px solid #ddd;}
 .snowhite .fav-board-stats {border-top: 1px solid #ddd;color:#333}
 .snowhite .div-select{border-color:#ddd;background-color:#fff;color: #666;}
-.snowhite #unknow_topic_tip{background-color:#e1e1e1!important}
+.snowhite #unknow_topic_tip{background-color:rgba(244,68,68,0.9)!important;color:#fff!important}
 /*推送|置顶的样式*/
 .snowhite .fadeout-anim {
 background:#fff;
diff --git a/thrones/src/main/webapp/static/lib/forum/jForum.js b/thrones/src/main/webapp/static/lib/forum/jForum.js
index 2b541f39..03cef7d9 100644
--- a/thrones/src/main/webapp/static/lib/forum/jForum.js
+++ b/thrones/src/main/webapp/static/lib/forum/jForum.js
@@ -492,9 +492,17 @@ define('jForum', [
         //右侧边栏的工具栏
         $(window).on('scroll', function (e) {
             if ($(this).scrollTop() > 200) {
-                $('#topTopBar').fadeIn(500);
+                 //版块新消息提示
+            	 if(!$('#unknow_topic_tip').hasClass('fix_style_tip')){
+            	 	$('#unknow_topic_tip').addClass('fix_style_tip').css('width', '1110px');
+            	 }
+                 //右侧边栏的工具栏
+                 $('#topTopBar').fadeIn(500);
             } else {
-                $('#topTopBar').fadeOut(500);
+                 //版块新消息提示
+                 $('#unknow_topic_tip').removeClass('fix_style_tip');
+                 //右侧边栏的工具栏
+                 $('#topTopBar').fadeOut(500);
             }
         });
         return { init: init };
-- 
GitLab