From d55930158395dd275142d5ed0c0cea84de48aa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B1=B3?= Date: Tue, 24 Nov 2020 17:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Socket=E7=A8=B3=E5=AE=9A?= =?UTF-8?q?=E6=80=A7=EF=BC=8C=E4=BC=98=E5=8C=96=E9=95=BF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=85=E6=8E=A5=E6=94=B6=E5=85=BC=E5=AE=B9=E7=A8=B3=E5=AE=9A?= =?UTF-8?q?=E6=80=A7=20=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B=E5=8C=96VTBS?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E5=92=8C?= =?UTF-8?q?=E5=A4=87=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Auxiliary/DDcenter/DdcClient.cs | 2 +- Auxiliary/MMPU.cs | 19 ++++++--- Auxiliary/Server.cs | 2 + Auxiliary/bilibili.cs | 37 ++++++++++++------ "Auxiliary/\345\244\226\351\203\250API.cs" | 2 +- DDTVLiveRec/App.config | 3 ++ DDTVLiveRec/DDTV.ico | Bin 0 -> 67646 bytes DDTVLiveRec/DDTVLiveRec.csproj | 1 + DDTVLiveRec/Program.cs | 14 ++++--- DDTV_New/AddMonitoringList.xaml.cs | 4 +- DDTV_New/App.config | 1 + DDTV_New/MainWindow.xaml.cs | 12 +++--- ...6\216\247\345\210\227\350\241\250.xaml.cs" | 4 +- 13 files changed, 67 insertions(+), 34 deletions(-) create mode 100644 DDTVLiveRec/DDTV.ico diff --git a/Auxiliary/DDcenter/DdcClient.cs b/Auxiliary/DDcenter/DdcClient.cs index c1cd29eb3..62d8f0ec8 100644 --- a/Auxiliary/DDcenter/DdcClient.cs +++ b/Auxiliary/DDcenter/DdcClient.cs @@ -19,7 +19,7 @@ public static void Connect() { try { - MMPU.DDC采集间隔 = int.Parse(MMPU.TcpSend(30001, "{}", true)); + MMPU.DDC采集间隔 = int.Parse(MMPU.TcpSend(30001, "{}", true,50)); } catch (Exception) { diff --git a/Auxiliary/MMPU.cs b/Auxiliary/MMPU.cs index 00cbfc4bc..cc2fc062b 100644 --- a/Auxiliary/MMPU.cs +++ b/Auxiliary/MMPU.cs @@ -31,7 +31,7 @@ public class MMPU public static int 直播更新时间 = 60; public static string 下载储存目录 = ""; public static string 版本号 = "2.0.4.5b"; - public static string[] 不检测的版本号 = {}; + public static string[] 不检测的版本号 = {"2.0.4.3b"}; public static bool 第一次打开播放窗口 = true; public static int 默认音量 = 0; public static int 缩小功能 = 1; @@ -97,7 +97,7 @@ public static bool 配置文件初始化(int 模式) { InfoLog.InfoInit("./DDTVLiveRecLog.out", new InfoLog.InfoClasslBool() { - Debug = false, + Debug = true, 下载必要提示 = true, 杂项提示 = false, 系统错误信息 = true, @@ -189,7 +189,7 @@ public static void DokiDoki(int 模式) { try { - MMPU.TcpSend(模式 == 0 ? Server.RequestCode.SET_DokiDoki_DDTV : Server.RequestCode.SET_DokiDoki_DDTVLiveRec, "{}", true); + MMPU.TcpSend(模式 == 0 ? Server.RequestCode.SET_DokiDoki_DDTV : Server.RequestCode.SET_DokiDoki_DDTVLiveRec, "{}", true,50); } catch (Exception) { } Thread.Sleep(3600 * 1000); @@ -1010,19 +1010,21 @@ public static bool setFiles(string key, string value) /// 消息内容 /// /// - public static string TcpSend(int code, string msg, bool 是否需要回复) + public static string TcpSend(int code, string msg, bool 是否需要回复,int 等待时间) { try { string 回复内容 = ""; Socket tcpClient = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + tcpClient.ReceiveBufferSize = 1024 * 1024 * 8; IPAddress ipaddress = Server.IP_ADDRESS; EndPoint point = new IPEndPoint(ipaddress, Server.PORT); tcpClient.Connect(point);//通过IP和端口号来定位一个所要连接的服务器端 tcpClient.Send(Encoding.UTF8.GetBytes(JSON发送拼接(code, msg))); if (是否需要回复) { - byte[] buffer = new byte[1024 * 1024]; + byte[] buffer = new byte[1024 * 1024 * 8]; + Thread.Sleep(等待时间); tcpClient.Receive(buffer); string 收到的数据 = Encoding.UTF8.GetString(buffer).Trim('\0'); 回复内容 = 收到的数据; @@ -1032,6 +1034,13 @@ public static string TcpSend(int code, string msg, bool 是否需要回复) 回复内容 = null; } tcpClient.Close(); + try + { + tcpClient.Dispose(); + } + catch (Exception) + { + } return 回复内容; } catch (Exception) diff --git a/Auxiliary/Server.cs b/Auxiliary/Server.cs index 05d225674..b83fbeed9 100644 --- a/Auxiliary/Server.cs +++ b/Auxiliary/Server.cs @@ -15,6 +15,8 @@ public static class Server public static readonly IPAddress IP_ADDRESS = MMPU.根据URL获取IP地址("api.ddtv.pro"); #elif false public static readonly IPAddress IP_ADDRESS = MMPU.根据URL获取IP地址("192.168.199.100"); +#elif false + public static readonly IPAddress IP_ADDRESS = MMPU.根据URL获取IP地址("127.0.0.1"); #endif public static readonly int PORT = 11433; public static readonly string PROJECT_ADDRESS = "https://github.com/CHKZL/DDTV2/releases/latest"; diff --git a/Auxiliary/bilibili.cs b/Auxiliary/bilibili.cs index 65a8a2e70..2ef5cc8ec 100644 --- a/Auxiliary/bilibili.cs +++ b/Auxiliary/bilibili.cs @@ -88,9 +88,15 @@ public static void 更新VTBS房间数据() { while (true) { + int 完整错误次数 = 0; try { - + if(完整错误次数>=5) + { + InfoLog.InfoPrintf($"----------【重要】----------\r\n多次尝试获取服务器RoomList缓存失败，切换为纯WSS连接模式，该模式下初始化连接速度较慢，大约20连接一个房间\r\n----------【重要】----------", InfoLog.InfoClass.下载必要提示); + wss连接初始化准备已完成 = true; + return; + } string vtbs房间数据 = string.Empty; try { @@ -98,10 +104,12 @@ public static void 更新VTBS房间数据() } catch (Exception) { - vtbs房间数据 = MMPU.TcpSend(Server.RequestCode.GET_VTBSROOMLIST, "{}", true); + InfoLog.InfoPrintf($"通过原始数据源更新VTBS房间数据失败，切换到备用DDTV服务器获取", InfoLog.InfoClass.Debug); + vtbs房间数据 = MMPU.TcpSend(Server.RequestCode.GET_VTBSROOMLIST, "{}", true, 1500); } JArray JO = (JArray)JsonConvert.DeserializeObject(vtbs房间数据); + InfoLog.InfoPrintf($"获取VTBS房间数据完成:{JO}", InfoLog.InfoClass.Debug); foreach (var item in JO) { if (int.Parse(item["roomid"].ToString()) != 0) @@ -109,11 +117,14 @@ public static void 更新VTBS房间数据() VtbsRoomList.Add(new VtbsRoom() { mid = int.Parse(item["mid"].ToString()), room = int.Parse(item["roomid"].ToString()), name = item["uname"].ToString() }); } } + InfoLog.InfoPrintf($"VTBS数据数据准备完成", InfoLog.InfoClass.Debug); wss连接初始化准备已完成 = true; break; } - catch (Exception) + catch (Exception ) { + 完整错误次数++; + InfoLog.InfoPrintf($"VTBS获取RoomList失败，再次重试，已重试次数{完整错误次数}/5", InfoLog.InfoClass.Debug); } Thread.Sleep(5000); @@ -215,7 +226,7 @@ public static void 使用vtbsAPI更新房间状态() InfoLog.InfoPrintf("Vtbs数据加载失败，使用备用数据源开始获取", InfoLog.InfoClass.Debug); try { - JArray JO = (JArray)JsonConvert.DeserializeObject(MMPU.TcpSend(Server.RequestCode.GET_LIVELSIT, "{}", true)); + JArray JO = (JArray)JsonConvert.DeserializeObject(MMPU.TcpSend(Server.RequestCode.GET_LIVELSIT, "{}", true,200)); foreach (var roomtask in RoomList) { if (!roomtask.名称.Contains("-NV")) @@ -354,15 +365,19 @@ public static void 初始化所有房间连接() }).Start(); while (!wss连接初始化准备已完成) { - Thread.Sleep(1000); + InfoLog.InfoPrintf("连接初始化准备未完成3秒后重试", InfoLog.InfoClass.Debug); + Thread.Sleep(3000); } + InfoLog.InfoPrintf("wss连接初始化准备已完成", InfoLog.InfoClass.Debug); List MTPlist = new List(); + InfoLog.InfoPrintf($"wss连接初始化准备已完成,列表长度:{VtbsRoomList.Count}", InfoLog.InfoClass.Debug); foreach (var item in VtbsRoomList) { MTPlist.Add(item.room); } List Vtbs存在的直播间 = new List(); List Vtbs不存在的直播间 = new List(); + InfoLog.InfoPrintf($"生成双边队列临时API房间列表数:{Vtbs存在的直播间.Count},优先连接组数:{Vtbs不存在的直播间.Count}", InfoLog.InfoClass.Debug); foreach (var item in RoomList) { if(MTPlist.Contains(int.Parse(item.房间号))) @@ -381,7 +396,7 @@ public static void 初始化所有房间连接() InfoLog.InfoPrintf("LiveChatListener开始连接非VTBS监控范围内房间:" + item.房间号, InfoLog.InfoClass.Debug); if (item.平台 == "bilibili") { - item.liveChatListener = new LiveChatListener(); + item.liveChatListener = new LiveChatListener(); item.liveChatListener.Connect(int.Parse(item.房间号)); item.liveChatListener.MessageReceived += 直播间状态WS变化事件; 已连接的直播间状态.Add(new 直播间状态() { 房间号 = int.Parse(item.房间号) }); @@ -834,11 +849,11 @@ public static string 获取真实房间号(string roomID) try { JObject result = JObject.Parse(roomHtml); - string live_status = result["data"]["live_status"].ToString(); - if (live_status != "1") - { - return "-1"; - } + //string live_status = result["data"]["live_status"].ToString(); + //if (live_status != "1") + //{ + // return "-1"; + //} string roomid = result["data"]["room_id"].ToString(); DataCache.写缓存(CacheStr + roomID, roomid); return roomid; diff --git "a/Auxiliary/\345\244\226\351\203\250API.cs" "b/Auxiliary/\345\244\226\351\203\250API.cs" index e13b5f1cc..d19acefad 100644 --- "a/Auxiliary/\345\244\226\351\203\250API.cs" +++ "b/Auxiliary/\345\244\226\351\203\250API.cs" @@ -35,7 +35,7 @@ public class 直播信息 public List<直播信息> 直播数据 = new List<直播信息>(); public void 更新正在直播数据() { - string UURL = MMPU.TcpSend(30002, "{}", true); + string UURL = MMPU.TcpSend(30002, "{}", true,50); string URL = string.IsNullOrEmpty(UURL)?"https://hiyoko.sonoj.net/dy-st/30s/6c6cb639-1d2f-4151-81c7-fd877700cf98.json": UURL; JArray jo = (JArray)JsonConvert.DeserializeObject(MMPU.返回网页内容(URL)); for(int i =0;i< jo.Count;i++) diff --git a/DDTVLiveRec/App.config b/DDTVLiveRec/App.config index cb2015ebc..e992731c4 100644 --- a/DDTVLiveRec/App.config +++ b/DDTVLiveRec/App.config @@ -1,6 +1,7 @@  + @@ -29,6 +30,8 @@ + + diff --git a/DDTVLiveRec/DDTV.ico b/DDTVLiveRec/DDTV.ico new file mode 100644 index 0000000000000000000000000000000000000000..75f97efe9e36368cd3569605d64076442ac362d8 GIT binary patch literal 67646 zcmeI53v?V;dB;bVaim?#&%}D#vP0}Bv7H{8_LN79ODQL`v`OhHg&YW^JX+vTdfLJ{ zKtt?PP$31Jgg_D?6bO$7NJ&EckSxiPEx+<|Y)ejJ;)g7)wR-p=Sx-N2|KFYYX7Aj+ zvpc&xE8CLS=kM>{nc3Oh`Tf7|-kE*KvI_8T%^C~;FScrm3akZ|Wz|4fL<{9|YEo-{ z)RMCMm;e9Ah89@RXQ5Z1c2Z1H7utU6#5&SZ)-c*W>cDbEZD_xIWO%^~&^D+J`Ze@0 zbT9NV=v~k)&~?y^!@~s zU(g=Mx=v^#bT9M{XdYAm<#r&Z=)L3M57k00f0GaVJfU*e+w235%-t`7q02g8dl1|0 zgzoJaT5u~=gvYY>L050Vj)2OaJP_0enT!qW3-$p;KMw?5uKD94#-3j2SJ2-;vmuLg z^_Kbw^xzmlwUA`b9^lBefTLOmxE+=kI@637MsJXpyc$No9(o^C0$HdFsSm;wUaRsa z514$w?A6HZO;Pm&=e}Q5Yl5c@FOVNpPpEB=7rgx04}pi1%p9yj?QOyMOa{;CiB zY6AN~tqIgN)dOCpdw}~UFZeBUJ;EL^Gq=5ySa$*U+lGC<6PgB1VdCDG-iKoW)k1>A z?Dd$=2PQu-cT;5ce$kJAj?3e?|G(fdBart%OwnHd=>-;4+jkoLSpj^I&JTKB;J(QV zw2XYf>vT`#$lM)=Xg}EZDD)t7Eo70V@{Rc;3X;bjS%Sl`SSI{TH{J#;O zg$|%SV)6hlbC|hxAf)~&?EihlA92cf;3V=Ns)Zzf_CXF_=zHLHGAcYq~gVbMWuGshT@CS5n6z;KuMw&paPpt|>rt%GPUp5=KCw__xGPJU5tL-U(2O> zfHv@lYM}&wLwhflNwF`s!w;w#R3|zPmW!Sq#|uLXVyF!@P~Kk>onsIis1#ZcrF;(~ z^Yx_{!2i=w-e1e5dH|I_d4T2C0)rQ5oyQM!zn$>H-b&GVxIESqFRO_kE1Qs)1g7-< z73o&!5F|Z7(WD?Au=i1l{YW()KV3QtnvmBs(GSwriu`Xy{v)rMy(#+n!Sw-of@;II zsu;$K8fd~^3V5*x{u%AFChplS!+iL3=_zQ{WaZxu{!lF>NZI;;{XzVp8fe1!(*x1@ z1~eaPfRe6d>&r}j@NR?g4EgWqtBBZtermw6=7d=%U5KoM8|L@Ex~@XJ zvc5v>-%u&qH-P_!MPgrFwb<8CE%r7cwxCbmpt0T{#RHd&Kb>t~C@>*k8r*Ig?PtSc4!*Hubi?A-)UY=$ScqGlv};ZpM_58Mr%V-I8&li0HtK1clX zF%NM0H$)mUXU|^I*pnA@_SARy8$Ce$)9C1i5^-ex9C+e7@d|22+r~v=FKWa-8b53= z#1LzsyyQx{o#GlLy`QxZ%=Z&_zK$Kt1EtvBm;aMkcMX*8DP+7JId4Hxuut$0QU_=o zaApO{f5ihyH6RUplQ*bN99lPDyt=Mj>?1EUR(H3zRNk_;x!US#ie!8&a=iob$2IE$ z#D|!D@M!ZV4;b_smR044e-!+qRR0tFgN^}V@Xvy~$qOCpXNiOB=AS#daaLVdedPUJ zjgfg>zny7yZNiVDOwi5YPae1(8YA}dJq)E5`1xS~+({~XW!WH>ugW|BAbGEPBOCrs z4e;cDNFGppF^2tb!5s4gU7I7bI-i|s^^H%A3Ba59S3?Jgy;nA4=9*#rM{JLMhdTx! z_kHr8=5;*2r-*(YFpdAbOrHma&!6WKqwvAAr~!Z0)e?C_4ClJ}zJWLKzXp2J%bvWD z6aNQB^UYt)f7!O@_9=a!@Ta+eI}c#irWh9g4e95MPEF{C55Csb5UJ=|2fx2mls6j? z|3O<{LKL=25pC%n;N@!MZPaCGuZLzpp+0v{{>wR?lj}kG?PrI6;1^Jv8IQ(x%Jfrj1n7Y0QuzWYRSui2|)jE)B43K{DvUh6$vsR;W z{+DzPnC%$A{DXOb#)V^;7knz#Qe2d;a|B`pt%Q0`BkxIQd&JAtsBfe7W9Tn~@}K`| z9Z1Wc&I3saAGl)xjRz`!YAYTnHwKj+}TAHoCIhV21j z1QkIIkj(#_;vn`hSUL{f4u#7f{y$ca^Z$C{PdThJML(4XJliYtKU3~=Eil!9;M{m_ zZ;$)TU5&x_bsir0pRNXYpe|~~Uk+zp2-d{EaOiaDAG`?fTj%Tnh5r{+p2MgG zEOoiDoy?v*@Kxd;rUy{>6ZIdQe8&I}XKilauH*Yhhv9*}&~D8C%&LpN0`{Hpt+R%D zcFYmoEweDrl-TpZARK8M=F8iwk=F%}!|=c-dtNA}&qCzn0Wh{4eVTa(j^IA*u&1aB z-0vR*e=N)C`Kfo#o$YiGeYCV|eeuHKp3?7) zo+uY1edS^(Rwf2s$7kpETq}CE%@Hy31MyQ?Gf$PZsm<|LxtIBXc3uYDw)e_!z2%gcR!I*y%E~%LI9X z{BWZEIuYMG2X$el*9Ru%>axtZCu#}aH;6SxDr0zGG?yEgQw_KiIva%l2#$eC%%9ew z{TO25CE@SZc*PSgfA)dPe@77h3(Tf-d zzTUm9csf4kmbC>&z#n=abcXmNx?(?=c&AzRW2~PJW&OPLJ0{hCIR{V~2Wb;`-VW`C zXvX}By)NAcqsPm|sRQ^8mX_K6=YH&k?DIz9}?@qMu8=Yf+lCNOu7x$&oY=x=c@P=c{Q zPnke{hri7K9GR=*LLT!UpZ`#E82r1XGGtHt2r2(n{+>2!Da{W~v|Wem%RU~+mH)=* zC~Cl+op`^nyEStUjG{(EcY^&{$v^X4SGjZhvC+Y@!jZx7zTc9l|0;iCPBlH*1KqAi zOun%1lXw2kSTQzGCQiKu4{UNg5LWK9cj}@|vBv0JTpJ3M^Xf(p|GN<{KtffD`p%p^ z+b8Z@_UPzf`80SyeW;w;Dt}_jeATEfPt=G@&tKMr{CZ#v=c#w%{L>O5_+bVw%6-zO z6YRVm2)-QWLUcZ4>waRN5B^}>$edHf@cEa?`M;;WJNX@S8P$OkZPzBQ6@*y_>Y{bH zmN7Gi&&db9IqZr57lLy(`NQST{J(ms`F9(y1E{qillfm6&i{yi8Rq`1-9f&PH+4-tPlM@RfdcKnmLGyl(rnfv5tuKz*vU)BbAz~2YC z^3T!-m=of9(S@!}v(C%wh2hqK@Akf2R6yUA3v$D`3SHMKgdV5!7V>}^x$X6aFLP#p z9_&9hA^aV_sm1~JfqZXRpA!b2|C{ok`BTiS7K{y)_QhLgZTIjeA7r2VeBT3@16JeO za1i{&o>T-i5bIR3J&=|?d0-s6BXs`s`47DR@8&C)m;5gzLX)-bX>r zH`ITXzuFGqh0~=+PwboXA@D!y@j&kU&tVMsAdLY*Zs1M)OQC)K?CtB^bges}PGh^b zKtY~D;BCNDe*Xvcypd{pU@3k`;@=R-1Aq2HN*{EMomy}+INj&+&z-$p1L~qbj<-gp z2YGMM;lC2GCz*d>-nuWkz*MW6t&&UgZ z%Kt{x|3=h*R?xA)9S59ie{|h23;yH*Ru0Ea@;|Wd-sf4X~1@r?MEwE4dn&*SwBpL@F3`U&hWKm1YuCI2RyKl?z9 zt_RZcch3I<%>T*HkgWeIbH8?g<0<)%oh+5tYr%hQ693%J2VX^9se+8D#(WUp3ylYO zzUi3r`cv4~A4A5+&1E6DT2M6Jg#0J|ETP3p%dc z=I9)2$)AoBxLf#q;T?!)LiE4@t^>R!4gYC){70PU!~AlM`?0@rdR<}Pz}te7`TNuY zw+`@_p!z_1z|Q}8b7XEj&F5#b<3_fr@pt9#SJV5XNVqXFHm!tldqyCp8pGnDio#8SMe|!cl z0{)wf{IeVfP*YYPd9uXn+3uYK5F1CIL_81Wn)A;6%Mr^z3t|6D!%lz7eLMe|KY1X4 z4^nyn^S|u)=j;QQe|#(P`8bUM_lL^AKKhgX=ZmIyYwra(?B^qH4VnE3u>T|CpN|_j znfd$qK$#av4{+XlV~+f@_JPa)INqxRcjEsk#ET(%pt)n?tjN)gB`yw!J>~yLpb+ML zGUqApNiERqyz<{1iS{%{8he_Hg%q<_qdFcaV}g$dLgJtCnBej!IABlLw%-l*$=3n+ znqUUwz`>{IiWh#esBOy+ZYWX|5moZ0t-`TcPJ^}cmJ$XG=KL-vEf^{NP&OV{o*C9uxZ^3TQtd_BmHmymxsuK(EQ zN?xkFdtk-; z#rf-q{YDe}#PtkQoeJa!Tt6uP46&aO{>{bFUgUr8Rww_t4yZoha|3-&pw0&p9@v5F z3Ule&LaN)D!3yM11+M>8IM;v7$1C0ORMsQ^6Z|)Zp^LD*Q&3$Tn@}Ky#oI2pC z1zZP|u|QrcPWC{+@n5a~%sf?0TNje}f8|}bXUw0NbH4BR`Eqe+*D`^em)yrrEfJ(J z_;dXLZ^<70INGZabxe8dyZl>G|Cv3<>^%@t{+qmz(gR8S@4GEU{yUr{?{C<1gZgi; z6kC6^LhRjelZdq~6+^uacjP>?xA|A)l>f|LiRaM1=PbV8H|8@TCgY3LOUMU}jo`4>~T=LPeQ`OLtN4xee zJ$Pv6GFiuuys%7kzPwZ%YhNn*4!%(g#NH@#eAMAhWBZtv>ne9{j}I&iGynJDIpaFg z#MONsP+b1o?EEMGEYEnrwE+C#7oY1yt_OmB{$J*QrJMgMe{Ltv3DVU9bv@OE3e@Yx z&RC6H9@He~aKTtJb2Wy;Up{BltcrI-bS}(TCMTMQQ54k+?k-zkS<^$7Mpwq9likWyJBmRS6z80#uoY<2OFxR6wKoqsVQRY6^0FIph zPNcb^E9Os;__GIEGO7Pn+WcS5@kBepJ9&&Cza-X^57fE8$~R~`hz}N{#?yNMDQi9D z{7&e-&6Z2Xl0s{}KNx%==gg=3EEV znBc53*V{Dr=X?&z+;2NSFC_EV#-hXMe;KMgd%D6JJ$d=D_vF9I-{=AFc;NDV zEkX0Or1ygBdX??3nVV;p3;?t{h7xr%3AdJ()kp|#KoXc}}`j^5=FiAB>;kb3f)!9$*FK?6;lE{~UbR3EoeD^@k9vplJ{v+AAXB zT+hO_pD4!t#=c$7_|N&zk>>$!OyhyP@n;`!H2Z<){^KrlX0Jv+zS{Bu^hs1hPA(qB zIYK-1IQk#OoaH94zh(^Av98n`=5tmL&Hur_pZNQEz&IyR#shC1u+RUr@5t%L2*=Mb z|6{h9M6VCH=F>GA@_^9?ST`o+@Krg3_2}_xG19w840TnCQ@<;df0G2iH~n8{My@Xf z`{|=6Zpi32VfEL3x%8?2Oa7Su^@B0VJrB^^ZvN9a0BP3?}|;pgCk zqtKC%bQpQsInuZA+-Pr=km^B%MxbF*9O|yZ??qOMq0S0%x}!o29Kzogc&${N*ms@i ze{r7Z#or`~%fCr9Q~u3L{GQOsSbgNJ(B*3~eqE$C|(wf5RBx z>$m?_srI+Y@ZAynZWi#2FErP||CT*P$(dQJeO`vYe}Uh3NYIe^XI#{)DbxZIP+0q6Qqpz%M<7v7EUdf>ah^jkLX2m2AppFAKXf0KlM zmm(pZy{Vt@!4U5It{}ht7v^i4hdFG z%|c7S|3&&vGJgBTmg@obf)>HuQx{A=*c9D~{mrM}l$mTdfBuRGO#I0Ust1&Lz(n(> zzcWX_^#cBnLPE;j3*;;`oC#jrY@#`yYn-AuoIO07b_Kp0R;_z|m75Tpv6fZz(RszOS^@4)lD} z@|Sagpml&efcgIf!-_#G_3Htlx6_cHPPW-hR z;Eo40AIP%)cdVOf9r{g40qS=V_`b1cOXTmNA3}$q^HAb*#?&@?pcr)l!gth7?A2vH zKA`i6zaaMX`%#nq7Fzz}8UWryu&)W({O6x)n?au~m-@EbIp|7LAzGrLX2y_+#bC&WsbN&t@ucO>|<#>R6;4bs84blhpIB^c# z??Jy1n(XN1>&u$Ip8qa?>46hC7g!HH1@;MTL)+G~c#mi^y-$SCi|$8^BMw35=<}l_ z`B`Ea!QSHm@`Aq);_!pbT=jtF10PR-`4iBbsluKNkQ0B^10McP9pH0A<@3YfZ@*8# zpBGU-J4o!Eeu6)FArlYS-oW4J!27)cJwSeFj%-ElUynE?@}6I$hyQaa=6j|&pvs@- zgB}lnGxN9S1n&Do(gP;`x)(fkK=Fa=2U8u;_J4BOuxsgAO z13||E=B`GM2b^(0%e|F>IPj`n$(O_y*MNPboE|c zuX5+M^)HMYF|PoMwXh0p(S-RH=RQ$?LS_Z|M^ z0oMn59pK#O=;Sz`1Nz2fuIc6mqu~B)jQ@YoS%+)-&ECJ=q#lo{)=tTveUNG{z`XUS zi~*_myK}%yJOKVlb-+9~IFC8w^I(4$@_i=S*1m_YvR6HxGk>lPDfqkB0rdQL<^diL z=rw?Rp)aF8*8t+K%3hA^#>IQU{a-Q1D<9lF3v;}y+*R(}mi+PkKl%Qjn(y3ZzUiXI z-}^fPKIZ@?{>)pCejZTSw-yh9`)249cn_!&f7hb`pZDUIdNmr3fQLUZX6|ZC$DY^2 z1MYXnQ2#xj3#B<=ko@OyAP9e({TTAU9n2p>zTbv?pM8AKbStL(eKy0(zPiXc0!IG2 z514PNsIup_#{(&90DR#&7hn%i&a)2^`F{@M!Ex089bkSxbO)GMb~i=~>GJ|tZi=B)R5xgMR`@8*6u{4ap>8K@6>6};=9Z_#_i$n!U0J~y`$p9RBbbuxRwSGV>Y z0S|xTO3Zb>>H696AIH3}AL>Jn9|q%nP%GL`Bc~q*<1Zq90KDG{){Bwjk+;)@-exxP!eO-+gy(PJflwuh#n4Xnl8w&ixCt z_3i^W>#fz!2Hanz^{cf$zXIMq(JvG&mSyo1T4NQ8^XT&vqCOooPrt*m_zBAO<656~ z;66U?c@h29_5!)R(EDq&^(_`7u($6p_OTUi^vnh%Q~y4mV6~91)7~C^9Dv03YM-7t zUVyuvo{6WAHJ&~W9bO>*xA#Yf#?!|Rz5Uf%f0fp+*7|rrb^r8Go<5F1avuxve5Bv; zgyhTSKAuqO{%UQ#-e0Ayr@sCAIlof(XS>J4-acLb8g2WO{b_h?mk;)jeqpM9A=bP6 zvAs{<_7AOJV->i5^XYd;zuL!}wnqyt^6#&a{!gs8ynS@ZmF{|PAB*k$LxY}=u}@i| zuGjm(=lTV^lNHb2o_aEUJnO5q?N@32)mk52_5SqmYM&ln?Zfh({wl4%+S|9QQH$eu zX+CU_=&z#96Md(6x$EVlE9;fM5Vkk?{>goKK|Wji{z7!v2g`XpxwM+@&Fj}_>n*po z(et6y=h`RxczCXzvfrWg*Pw6jUcNrs+r$-@UuDy?b}3?{04Q`NawG|Aj+@&j0`b literal 0 HcmV?d00001 diff --git a/DDTVLiveRec/DDTVLiveRec.csproj b/DDTVLiveRec/DDTVLiveRec.csproj index d912e7e34..f6dab02b1 100644 --- a/DDTVLiveRec/DDTVLiveRec.csproj +++ b/DDTVLiveRec/DDTVLiveRec.csproj @@ -3,6 +3,7 @@ Exe net5.0 + DDTV.ico diff --git a/DDTVLiveRec/Program.cs b/DDTVLiveRec/Program.cs index 2be2cb15e..7024a9fa0 100644 --- a/DDTVLiveRec/Program.cs +++ b/DDTVLiveRec/Program.cs @@ -1,4 +1,6 @@ using Auxiliary; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Drawing; using System.IO; @@ -15,19 +17,19 @@ static void Main(string[] args) 下载("14275133"); #else - Auxiliary.VTBS.API.VTBS服务器CDN.根据CDN更新VTBS_Url(); + Auxiliary.VTBS.API.VTBS服务器CDN.根据CDN更新VTBS_Url(); MMPU.配置文件初始化(1); new Task(() => { DDTVLiveRecWebServer.Program.Main(new string[] { }); }).Start(); - - + + #endif - new Task(() => + new Task(() => { try { - string 服务器版本号 = MMPU.TcpSend(20013, "{}", true); + string 服务器版本号 = MMPU.TcpSend(20013, "{}", true,50); if (!string.IsNullOrEmpty(服务器版本号)) { bool 检测状态 = true; @@ -41,7 +43,7 @@ static void Main(string[] args) if (MMPU.版本号 != 服务器版本号 && 检测状态) { MMPU.是否有新版本 = true; - InfoLog.InfoPrintf("检测到版本更新,更新公告:\n" + MMPU.TcpSend(20014, "{}", true) + "\n\n", InfoLog.InfoClass.下载必要提示); + InfoLog.InfoPrintf("检测到版本更新,更新公告:\n" + MMPU.TcpSend(20014, "{}", true,100) + "\n\n", InfoLog.InfoClass.下载必要提示); //Console.ReadKey(); } } diff --git a/DDTV_New/AddMonitoringList.xaml.cs b/DDTV_New/AddMonitoringList.xaml.cs index ea56d8f7c..2584a8136 100644 --- a/DDTV_New/AddMonitoringList.xaml.cs +++ b/DDTV_New/AddMonitoringList.xaml.cs @@ -142,7 +142,7 @@ private void BT1_Click(object sender, RoutedEventArgs e) NewThreadTask.Run(() => { MMPU.TcpSend(Server.RequestCode.GET_NEW_MEMBER_LIST_CONTENT, - JsonConvert.SerializeObject(NEWV), true); + JsonConvert.SerializeObject(NEWV), true,50); }); RoomBox rlc = JsonConvert.DeserializeObject(ReadConfigFile(RoomConfigFile)); @@ -183,7 +183,7 @@ private void BT1_Click(object sender, RoutedEventArgs e) NewThreadTask.Run(() => { MMPU.TcpSend(Server.RequestCode.GET_NEW_MEMBER_LIST_CONTENT, - JsonConvert.SerializeObject(NEWV), true); + JsonConvert.SerializeObject(NEWV), true,50); }); RoomBox rlc = JsonConvert.DeserializeObject(ReadConfigFile(RoomConfigFile)); diff --git a/DDTV_New/App.config b/DDTV_New/App.config index 7a6c63fba..8b7bb3b07 100644 --- a/DDTV_New/App.config +++ b/DDTV_New/App.config @@ -1,5 +1,6 @@  + diff --git a/DDTV_New/MainWindow.xaml.cs b/DDTV_New/MainWindow.xaml.cs index f6ca0421e..53c95a6ed 100644 --- a/DDTV_New/MainWindow.xaml.cs +++ b/DDTV_New/MainWindow.xaml.cs @@ -57,7 +57,7 @@ public MainWindow() InitializeComponent(); this.Title = "DDTV2.0主窗口"; - + ViewModel = new MainViewModel(); this.WhenActivated(disposable => @@ -515,13 +515,13 @@ public void 公告项目启动() NewThreadTask.Loop(runOnLocalThread => { bool 动态推送1开关 = MMPU.TcpSend( - Server.RequestCode.GET_TOGGLE_DYNAMIC_NOTIFICATION, "{}", true) + Server.RequestCode.GET_TOGGLE_DYNAMIC_NOTIFICATION, "{}", true,50) == "1" ? true : false; if (动态推送1开关) { string 动态推送内容 = MMPU.TcpSend( - Server.RequestCode.GET_DYNAMIC_NOTIFICATION, "{}", true); + Server.RequestCode.GET_DYNAMIC_NOTIFICATION, "{}", true, 50); runOnLocalThread(() => ViewModel.PushNotification = 动态推送内容); } }, this, 3600 * 1000); @@ -536,7 +536,7 @@ public void 公告项目启动() NewThreadTask.Run(() => { string 服务器版本号 = MMPU.TcpSend( - Server.RequestCode.GET_LATEST_VERSION_NUMBER, "{}", true); + Server.RequestCode.GET_LATEST_VERSION_NUMBER, "{}", true, 50); if (!string.IsNullOrEmpty(服务器版本号)) { @@ -552,7 +552,7 @@ public void 公告项目启动() { MessageBoxResult dr = MessageBox.Show( "检测到版本更新,更新公告:\n" - + MMPU.TcpSend(Server.RequestCode.GET_UPDATE_ANNOUNCEMENT, "{}", true) + + MMPU.TcpSend(Server.RequestCode.GET_UPDATE_ANNOUNCEMENT, "{}", true, 100) + "\n\n点击确定启动自动更新，点击取消忽略", "有新版本", MessageBoxButton.OKCancel, @@ -590,7 +590,7 @@ public void 公告项目启动() NewThreadTask.Run(runOnLocalThread => { string 推送内容1text = MMPU.TcpSend( - Server.RequestCode.GET_PUSH_NOTIFICATION_1, "{}", true); + Server.RequestCode.GET_PUSH_NOTIFICATION_1, "{}", true, 100); if (推送内容1text.Length > 0) { runOnLocalThread(() => ViewModel.Announcement = 推送内容1text); diff --git "a/DDTV_New/window/\345\242\236\345\212\240\347\233\221\346\216\247\345\210\227\350\241\250.xaml.cs" "b/DDTV_New/window/\345\242\236\345\212\240\347\233\221\346\216\247\345\210\227\350\241\250.xaml.cs" index 1caa8950b..5687ce36f 100644 --- "a/DDTV_New/window/\345\242\236\345\212\240\347\233\221\346\216\247\345\210\227\350\241\250.xaml.cs" +++ "b/DDTV_New/window/\345\242\236\345\212\240\347\233\221\346\216\247\345\210\227\350\241\250.xaml.cs" @@ -42,7 +42,7 @@ private void Button_Click(object sender, RoutedEventArgs e) try { roomId = int.Parse(唯一码.Text); - if (roomId < 10000) + if (roomId < 10001) { string roomDD = bilibili.根据房间号获取房间信息.获取真实房间号(roomId.ToString()); if(!string.IsNullOrEmpty(roomDD)) @@ -73,7 +73,7 @@ private void Button_Click(object sender, RoutedEventArgs e) RB.data.Add(item); } } - RB.data.Add(new RoomCadr() { Name = 名称.Text + "-NV", OfficialName = 名称.Text + "-NV", RoomNumber = 唯一码.Text }); + RB.data.Add(new RoomCadr() { Name = 名称.Text + "-NV", OfficialName = 名称.Text + "-NV", RoomNumber = roomId.ToString() }); string JOO = JsonConvert.SerializeObject(RB); MMPU.储存文本(JOO, RoomConfigFile); 提示.Content = 名称.Text + "-NV["+ 唯一码.Text + "]添加完成";