From a63c18e22aa6a442f53b0452bfd8ff0a6d0c46d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E9=A3=8E=E8=BF=87=E5=AE=A2?= <3529987066@qq.com> Date: Mon, 1 Jul 2024 18:10:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=EF=BC=9A?= =?UTF-8?q?=201=20=E5=B0=9D=E8=AF=95=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=AF=B9=E4=BA=8E=E8=B6=85=E8=BF=87=E9=98=88?= =?UTF-8?q?=E5=80=BC=E7=9A=84=E6=95=B0=E6=8D=AE=E9=87=87=E7=94=A8=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E5=86=99=E7=9B=B8=E5=BA=94=E8=BD=AC=E6=8D=A2=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E8=BF=9B=E8=A1=8C=E6=B5=8B=E8=AF=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignTimeBuild/.dtbcache.v2 | Bin 147894 -> 147894 bytes .../.vs/JiangsuEarthquake/v17/.futdcache.v2 | Bin 540 -> 540 bytes .../.vs/JiangsuEarthquake/v17/.suo | Bin 322048 -> 315392 bytes .../JiangsuEarthquake/v17/DocumentLayout.json | 113 ++++++------------ .../jiangsuearthquake.metadata.v7.bin | Bin 223244 -> 223257 bytes .../jiangsuearthquake.projects.v7.bin | Bin 10809868 -> 10935463 bytes JiangsuEarthquake/JiangsuEarthquake/App.xaml | 2 + .../Common/ValueToBrushConvert.cs | 41 +++++++ .../Models/LowerComputerModel.cs | 7 -- .../Views/SystemEnvironDataView.xaml | 21 +++- .../net6.0-windows/JiangsuEarthquake.dll | Bin 5173760 -> 5193216 bytes .../net6.0-windows/JiangsuEarthquake.exe | Bin 240640 -> 240640 bytes .../net6.0-windows/JiangsuEarthquake.pdb | Bin 336416 -> 343764 bytes .../bin/Debug/net6.0-windows/Models.dll | Bin 48128 -> 48128 bytes .../bin/Debug/net6.0-windows/Models.pdb | Bin 24656 -> 24656 bytes .../obj/Debug/net6.0-windows/App.g.cs | 2 +- .../obj/Debug/net6.0-windows/App.g.i.cs | 2 +- .../JiangsuEarthquake.AssemblyInfo.cs | 2 +- ...JiangsuEarthquake.AssemblyInfoInputs.cache | 2 +- ...uEarthquake.csproj.AssemblyReference.cache | Bin 15953 -> 15953 bytes ...uEarthquake.csproj.CoreCompileInputs.cache | 2 +- .../net6.0-windows/JiangsuEarthquake.dll | Bin 5173760 -> 5193216 bytes .../JiangsuEarthquake.g.resources | Bin 4702690 -> 4703031 bytes .../net6.0-windows/JiangsuEarthquake.pdb | Bin 336416 -> 343764 bytes .../JiangsuEarthquake_MarkupCompile.cache | 2 +- .../JiangsuEarthquake_MarkupCompile.i.cache | 2 +- .../JiangsuEarthquake_MarkupCompile.lref | 2 +- .../obj/Debug/net6.0-windows/apphost.exe | Bin 240640 -> 240640 bytes .../net6.0-windows/ref/JiangsuEarthquake.dll | Bin 175616 -> 177152 bytes .../refint/JiangsuEarthquake.dll | Bin 175616 -> 177152 bytes .../bin/Debug/net6.0-windows/Models.dll | Bin 48128 -> 48128 bytes .../bin/Debug/net6.0-windows/Models.pdb | Bin 24656 -> 24656 bytes .../net6.0-windows/Models.AssemblyInfo.cs | 2 +- .../Models.AssemblyInfoInputs.cache | 2 +- .../obj/Debug/net6.0-windows/Models.dll | Bin 48128 -> 48128 bytes .../obj/Debug/net6.0-windows/Models.pdb | Bin 24656 -> 24656 bytes .../obj/Debug/net6.0-windows/ref/Models.dll | Bin 7168 -> 7168 bytes .../Debug/net6.0-windows/refint/Models.dll | Bin 7168 -> 7168 bytes 38 files changed, 108 insertions(+), 96 deletions(-) create mode 100644 JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert.cs diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 index fb6cd230556dc6c95a1b55299881cb13093c1c4a..5b9ead6444dc353e5bdb1ce28df00a11247e383b 100644 GIT binary patch delta 24596 zcmc(n349gB9mn%#C&;15VGtAqK?Do}0YVZY7>Iyeg4`&IKmZRE1o75I5XEYhOP-1s zUM-bMy*R{rpjNB(wo*`wXSG`G{u=6urN95~{uAC9AixW}&u8BLX6L&z`{r%-{b%O4 zSv9A|syQ_hr!7dFRMe?MPD#mxE_rzqJB}|Ym^iLvd|qzBq;VxB1qGctjGHuRe12~3 z#PNAu@=H1ubnKE-&}CfCxSaglaRvDuJLh#6*J;5`4Ly_7@!{noll8_;nK^OT)SlC4 z&N#Dp>UkGVoPNQa(&XyWWMb)I$?w-BiW3FN|~wC6aD=<8PUt*rb%W-#t}?SnQAlNEY?SI+nlKd(@{(< znT}>^#nhUq4bw49*-UMjq|RfxmE+qnNqsx0!{1>g2gfI{iwbsld?Oy;o(*?k%3&%qP)Frc3Mn)b*K2rfxSEfRyox&s)N^hRZt-S84YAj4_EnL0%&BV1PasKMb?<6K=HY`GY!`&YT^?Q{D2bPxN5EIldMON~ojft$> z1}5Hns6j(hibkfi?1ct#Cdi7R!%UDRhh}d|G&$gK6C5g;LCj<~HbEXU(E*fvMep2p zijQt$f=+TkQjR{t1i6w~Cz+-uXe61 zYZJ67uc}R0Rrt;`YNIE7j6t^Bhi&3ML|dhfHE8EjZIx=TR0o5ca>|zmOVM7jj*4|M z=v4wbaSynt*pCJ#~T#6RQH$)a^lYK zVS=3UUd@ry=Z@%8^wgS)4Nhq7R@GChDvYb@Wr9Naww8U6$ntyZv3(3qbPw&Vhjxn( z?Q4Q=E}i>TfW>t*M`W>VZm~WH88-`l)|L0~H&r*vSS%+{y+kHB_l# z2E$!ys8S=88fh@fp?r)`Y_wvh7@X>07_HP8rA{+A-KEATHCCxJ492QtV=bOI++Cr7l(KGK0%q>QbeyQ0htp-=(flY8EL! zyw6`{Fx$muDKUM)WTxzLO zcM9dp&+J_Wce~h~iY?R1?lHL6rIsmmpHlZ5Jm6CIDfJtrerxa>QduVcwP1!X*%!XB zT*2QNJm^-pT&WdG{oddqms+9JN~Qi_@UTnyD`PC^5#M4TF+q>=TWk+GAMS`w>rt)h zF@wk5svgw_S1GmHV2w+yQfh5T@$=&egLN*pR7^|VsY7(DAzPb;-v zspkxykEp2s<xhQQQ&r*QZ+5X9oXp8~juo{9LIo z4F2g-pNEuOe_ty0mBGJU>`SfeYo)$1__s@atyG{C4F2O%fl{SPZSf8M>tdyfeXH1a z2H(5Xw@Uq>)Q<)~xzrCzZB^=Lga4IN@%6V=v2BWFcu088AY+?S#*4or&x3U-$J~sn$wmE7jJ+v7}Ptzih?YDc0UY2e-0zO64fk(L*Pf%2BGbQn?nu{_1{ zJruZDo>E#eY3K^mMTz#fr7E6Fl^CsbZyiE7ixt zi7wS!slH0}^Uz-?jlbl&L0`oNC^pc;Np58Wlp3VeU=Js|)F7pXC^gi>FqazQD>huQ z5gtam*l?vrDK*-|DK0fisZ*62 zL=Tf(szj;DN}cK9tdJ`E{bTn}R_tuW&haqCt?X>2&Q4^v(0T&1Qdb-st`E;Y@I z+s6#WF7PnZ#b#(_7bQWDvxzr^}T^>?$|GUD&l`eL3%fnSJ zRd)5vR%(uit6gfg)-_kDYdl;VQRV%Qxr)tG>^cv>ax0ss)b&c;;NjOUb-hwIDs_{G z`7U*%r}5tc#TI&4>|u#ZEmkV2)GZ!vb*ZFMw?!0xf0uf=-NkNG><+E$ zP7imv)E!FQt<*9P_qf#EO5Ll}eID+Qsj~jZy^1}c*l#@i)~)OTrIsu8I}Z=K)N-X( zDD`^}54qF|Qepd8sn{PpJnUjCwX#Q)dep;XF7=2~k1Msx!)lj$T&XoN#`FG7m#<15Af<>6}=`${YOMyY>$2wdtLrJ&S*Je0Z= zl-i=ye|-<%y4V)QzEkXb4?noncS`-J)K4C^y3~(K{jAjgJZvkcqW;Ivie=b122WTR z>x_RgZ2UcVN?D6cm-1pN=o?p6%?5qT!}-2a2X}<8!0#VJ2iTy0In+Od!gqc_)wQ`A z7B$`Gs_RMBQtCj9gIubXQni&j*rJYg=f7(!R#&ll7WLiA>MC`JQdt%aT|4ppk5 zMI(puaj0U4DR#I;V+X@wN;OgH2#cmJ)kLXgN*!s@+@+c+)xzrd=O~MoF4jV^qqVYD z7Oh?CXr{SafxI9|wD0QMmUzh5mR6nKqTMQ5?W&G1mv4M)6WHHFCY@kwul{(pCh)WHQsh}YK10QOG zg7QD`g76Q#pfow_`$RQ=nASAhVuV}MFl}$7Qll(JyVOXfPEqPqi!m;Bic+U3b-Kk^ z-^ET->oS8z&kI*E=&Qk1bi*r&iQfDbOMX7Tw z&U2|LN=;R2n#K7pHC3tUzG5>hE^x8wip^B&LW_%BYNk>bD|Ly*r7m@`QkN-pxy2Qh zL3pEhYE3Q+T&CESiuo3^+{&(0>MEsXTg-8(tCYH0sks){q*84E>KF?K#+U20HW*lb zxeg33*YKU^H_t9iEW~xT2)|;wp1B3M!S*i2uPtt5?&hGjOjqG18*b)Dn+4Hkq3sha zW#OW*lEwB!+&tJ~i9N9tN$y<Wnw4YH=GkOD%5a<_?QHxw*^YZf=%Y+{4Yi7Wa`) z;(pt&lyAYoctF$xRLPA$C0ZTM%!B-(D@bkqB&grNRLm3&41Z=DB%5|I$5v}5x>>T< z)`Nl z!AgssQrMG)g)HRKcW=paZ9C}3JlC`Png09=xI~SCQo==O3>Lw4W(*ZElwyR45fr0E zjHVbPVhqJt5o0OFix^KaQ3RJ}ai$2azTzAaTwld`BDjQ#^F?r#6c&=I1=kL7g9t7U;wBMX0mMQP3n^|E!DT$$ zB7!S*SSo^xakx{2&-FGe6U8Mp+$VyoW?T@X;HnrG#3;D%g%u*WwuO}QTva4GOD7aG42fMXaTGQUuqE@U)1hDb|bNf)8F0!8IKpFNxy14PFt!r5U^?f{QPB zQv}yn@Qw&Bpy@xK9xL|B=ETit~zkNfr9G_ z_*w*)4iFfhipv8im0er_z_%he$B!RGa2g+5MR1}X+eB=mFdl_rFqJ+s^ z)S{>@qBccc5p_LIUGuzTK3noxENCdgZ^)89EaAj+W7*M|B~3*%rD!gqIYmnmEh$=y zXibqVBAcR}h;|e?B627?i|9;|CnArctB9@?-9&VwC=$V`P9MdhIGu^!A~<8o=|~FB zNn(HqPCH_d2+k~Gh=?H+!$l0I7$ss9#i=4V$%oTLa2gNeL~y1KB_cQ($C)+?PPgG~ z5u8zjf37IbnqiuVX%sU=aOw*eis0-PE)l^AEL<+)atdFBPcd7>Y>K%e=2FZPF^}SU z5!X}PDB?zn1tJzuEEd6u8zjSuI5~scWEZDjaEA!au;6YHoJ8Ra2?eJ~@PG);gkZS{ zPIh302+n74CWC@A7I;JiCnfN>2+liTjR?*xV4Vm~9^fevoFCxeU#>q+0dRm%!BIY5 z6v2T!UKYWzI!Eag9F5}*5gc&iZ4n$(<6RLPHDjX)4vg`>2#$R@u%+PWmSa~64q)+_ z2#!(lg$NEqIRKUWA4i(_Ms{&935ei$5nDuXM2PQ1aL|VzMQ~ilK^p}}Zpg3{8NAhd zB0S6C6|dyJr9ppgxTm`8<~RwpL~tmC+9EjEL0u6X&-ge*6vr$akWg?`!Z8O02Oel5 zf@2Fb6VZ&Kg@_guM~mPX0BuAt%tu=h4CK*X1Y>n{6v1#Dxgr>FBVPn#Y7~lK*bKkB zD2B%9A%ej#P7uNP7JWo8ghf9Q3{o*r1mjQ)7Qs+6DBve$csWe+3>Yy|1Y<&+B7$Kb zP7}ev4rhp9?1l*<7@jfqlKy7|#`uc67-V6J2*y#EDuSUBri)-Ogqb23@8Dt)3~3mz zP%vo0l_D6I;3^ReJs4L|Ft`W?@&p-B{DD8lx8q?uKmrOp5=9+&R6?M~h(B(zDlS`H zR>rHAMQbgdsGw*ai=MRjV_fu9cod$ttg{r)FgC2zR0qd zEdCrH`0{o|udwJZ7O%!ducb8jIt$;hcrz}1YrEs#X3;wqe~pXYO*w9Zgy4U(*cg{? z+U~&jSoFTd2XWEgw=3Grq7N-TVy7-(prP^E#}W*E5^-TauPoR6EegMa$LvYvUjXOf z*vGOX?scklPX3uNAN8+%ch5Qb7sGtqi7bC5%*Q>){Oe&p>Ml9{?Jytr5a$80A>0x5 zivaJ1`M4*T-yG)SkI(#P{2cS~556zLVmpX8Qj5>oAz#R+Um`n}So~9Wd}#;aD~m66 zS1JA_$IqHICN%8Q34B&-aqM0lBzWlroC%|67vEU?+aj>8b$20qyGKxq4Z-3+u`IR0 z9P#&FEpKz>E7@X;i7*1(Vg=k{gL(L`4Hn^Bi|=@5+_5A`2Db$BlkKXTJoCLxPOfe) zGC$blht*AsgMPF{!L}k~B#Q8pU0tV!nVqP%l_B@fHrZ%HVo37Knr4{)KknGZl#yA4 zTS?x=bUV`>ObPD0o7-hf_b?gemvifJYngtc&g8b9iM_|`86d|afSuWlw=>ex!H~^Z zBxL}@I68b)(n(t_QzyYPQ9aYCt6FAU*A6VQ@eCfr@~Fwmcw{AJkDJ_Ui!86)6#uK+ z7mWL(6RVWdb@yGYzSvk(yPpGysL6fdVh#I$Ke||b4tV14a=*A({d3*!=O`=c{(a(N zmHwB(Th!#fcd`0nW8IG~R?gt1Ui}=2Mt!kwT&yyA#Sw1Q^__Cy9#J*)-d{5lwcLAu4ZZj8#CXc~IqHup+a2dAzqYg(PyP7n-(BZv zbjp0+OXI2Y1Vg2rr%{jXz46qSnUScn1NFN+C=<2a@A5$XF8ACl8a2ZnQ?Dov&eRp0 zI+>{JHhHi%nKrv9+jiZesVg{DY!|J-E$VZ&DC+)wU>A)VN^y%uD>(beE-I5-@!y-e zMS1@(d&$&Sbc$7E7p=f8%GsZ&$-T9L^4j7gTvXR?xI9A#+pcV$(GPT$xIClyJ34Jn z2u8xSd8YhAaJDd_(&F-r+vh}Md|^~%^W-dK)MWZyp7Q&@OPgmHA61RZv%LRh(lq*% zzp#03|2M)J)rd-u%QI@9ld*C4S7`IpCab{Z$>0B7+dSndpDJ>Bmi52PEJq#tOPgm@ zAn$2+d4}zC!aDB$ifx`z`&Hud^ic_$CqH*pxjeQ1W%fOMarQm#i*lQ1RKoZ4yF8_R z&g#ca?!e|5omiE)JpIbpJgd;<8TY@eP(+`yBAaJa#Ewe8%aiSMBkHGEUTFg*MNqEL`G=sPwr!dH>zD&6AB*mCMtw zjLowOU7lh8%Tia=u@&1q%L-$WMwh40CA9b=+p*1)-CtEMProuY&nk3zO8?7pVEE#4 zVB8m}Hcu^#sWiGg;n&kqZ~aUh;toOU=@2wasRo%i)TOeN+5@NOFU(t9-;6%4WA#kE zMRD;nqW0G5DfeG4n?{xG%<5T1PR}y))~>9c(HJQ0PEU9Ki)+A9U$|D!lwSxg5J%Kr zJ3ZNcN3Cq9R?jMOdg}bwF0G#77-*+X&q^68xx5|!iAQEhXa0+e-%-a_nOl&#HR3EiSvt;}qJocSiQoBDkOQz0$P1iH4I=5tM_rs_0AnJ^Cx+N>J zI5x~Iw>U25s%~g*Y~*K#+ry&G;n8M0bEB*|@1eJGQAOTHG|r^4u`z!_LSy54KejY- z8RVB9#%h_gUvLGrGSgVlRz|mGU7TC~a{NG?>U;f@0<|9i4 zBl*hM4b$j0l>5(a+YNu|HdH6!Zd(X>{ly-_DzXrYWpIAzaho4{*XD2M{91^`zH9w* zonCZc#a1r~6U2WRzUaS<pB@_0FgWi2s(EOrqA<8~Y8dQCad2)F_;!glc~u_<=SvuzpGoIx6bJ7t3~nyB z=H|RLSKx9&*$to3}*lH)9ceXXenLYl3l%b&*M}o3~nuL z`K{U5FP^?Zwv=VFsB+KW5Z=QuSmM9kdHyEdVKBe{J$m9MU16}lhfmz3D-8Dc@QIsr zg~8#IJA3fN4X?Pggu!zE*^?)3(iH~t`tukIw3ENLcKmzG5s^btiKlMT5eEBv@zhN^ d!eHNhlx81?!8!5-1mob!hrz3RbTBjP{vWsg;UNG3 delta 21940 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 diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.futdcache.v2 index c9e6813239b739e8b11e349d9721fcbf601c286b..57f0e939210cf80b3e8c6ce000d8dc5f97aff0c0 100644 GIT binary patch delta 27 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 JZN;PL{{hLPtvdh! delta 23992 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 diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json index a2d8a1b..795e787 100644 --- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json +++ b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json @@ -3,29 +3,21 @@ "WorkspaceRootPath": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\models\\lowercomputermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\lowercomputermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\systemenvirondataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemenvirondataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\models\\seismographmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\seismographmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\common\\valuetobrushconvert.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\valuetobrushconvert.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + }, + { + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\realtimedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\realtimedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" - }, { "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}" @@ -38,11 +30,11 @@ "DocumentGroups": [ { "DockedWidth": 163, - "SelectedChildIndex": 4, + "SelectedChildIndex": 3, "Children": [ { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 4, "Title": "App.config", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.config", "RelativeDocumentMoniker": "JiangsuEarthquake\\App.config", @@ -56,77 +48,50 @@ }, { "$type": "Document", - "DocumentIndex": 4, - "Title": "VolCurCollectorModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs", - "ViewState": "AQIAAKwBAAAAAAAAAAAkwMIBAAA1AAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-06-28T01:42:56.109Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "RealTimeDataView.xaml", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml", - "RelativeToolTip": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml", + "DocumentIndex": 2, + "Title": "App.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\App.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml", + "RelativeToolTip": "JiangsuEarthquake\\App.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-06-27T09:38:54.977Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "BoosterStationStateDataViewModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs", - "ViewState": "AQIAAFwBAAAAAAAAAAAuwNkFAAAIAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-06-27T06:25:37.202Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "LowerComputerModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\Models\\LowerComputerModel.cs", - "ViewState": "AQIAAFoAAAAAAAAAAAAuwIQAAAAvAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-06-27T05:54:59.023Z", + "WhenOpened": "2024-07-01T06:30:26.069Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 1, - "Title": "SeismographModel.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\SeismographModel.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs", - "RelativeToolTip": "JiangsuEarthquake\\Models\\SeismographModel.cs", - "ViewState": "AQIAADUAAAAAAAAAAAAUwEoAAAAAAAAA", + "Title": "ValueToBrushConvert.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", + "RelativeToolTip": "JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", + "ViewState": "AQIAAAMAAAAAAAAAAAAAAB8AAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-06-28T01:41:37.637Z", + "WhenOpened": "2024-07-01T05:48:58.03Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 0, + "Title": "SystemEnvironDataView.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml*", + "RelativeToolTip": "JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml*", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-07-01T01:00:30.386Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, "Title": "MainViewModel.cs", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", - "ViewState": "AQIAAKUPAAAAAAAAAAAAAAsIAAAIAAAA", + "ViewState": "AQIAAF0BAAAAAAAAAAAwwAQCAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-06-26T09:47:38.344Z", "EditorCaption": "" diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.metadata.v7.bin index 51e37165303effa237e02bf69ecb7c7accba9201..55bb6c2eb8c95199232c562f2bfc3bffa62fd87b 100644 GIT binary patch delta 78 zcmeCVz&rB-FB^k3KLZ29^n)(U9*usjevDiFm>$38wE_xqxS6;)S(;loZZ~|xbUa^( g=hG6PN(KgIAXb=mH)hS0=@){TwYHnYFyG(?0Grhp+yDRo delta 74 zcmbPvfw$)ZFB^juKLZ29^m8uE9*usjevDiFm>$1oRGI83E;;#w8u#|(H%yE2g$mgh d1646FFavQ%<7>7jlc(PeX4cy77{h#n8vuts7+wGX diff --git a/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin b/JiangsuEarthquake/.vs/ProjectEvaluation/jiangsuearthquake.projects.v7.bin index c228c7307efbf35f3f48183b0ca3f114ab339231..0d9491b20f3b3bbd562f90236da09352cc5dd988 100644 GIT binary patch delta 374 zcmV~$SyK!E007`AZK$;5?r@VFxsSFG3K5kYg`AZul&hpzd~A_ca#eEGj2?S1v*Ty@ z31)gWqX*BvuWPI~@crjNAS_P22@(V(nrM>Ak|awpMXI2wrb#p13^UC#+Z=PH%aAF{ zJo7EE&?1X1vD7lzmdmliN~^4vYmK$mS#N`lHrZ^8t@4EAE3nOWI~3Y!m)(jK+hebN zO6+$)se=wFQ?9~cm5w;-nB%HcJK>~LYMge)S?8R0L9IIVF1qBhE3RsA&2=|4YI4&p zx7~49vljQXy01;U2ObK0Y0cRot}H4%S+v&Ug_~#uQ%R$=e-a5^c(Qepie&g v;;V0lehjCK$41A)83~D@VBFu|q1dl~;XkRd(dxlqcO*J86pM}wx0n0}`PZQ$ delta 339 zcmV~$=QV&IE%0LV*D*tQ00(z$&Y)5n-)$BCQu?gJ>JY*d$h*c$;mJAkkLaY`4QsyCm6d zk7Rr8v)=(J4oY=MnsgZsJ0eq-Y)9od=D1uZ + + pack://application:,,,/JiangsuEarthquake;component/Assets/Fonts/#方正楷体简体 diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert.cs new file mode 100644 index 0000000..e9ccbc1 --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace JiangsuEarthquake.Common +{ + public class ValueToBrushConvert : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + double number = ConvertToDouble(value); + if (number > ConvertToDouble(parameter)) + { + return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 + } + else + { + return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色 + } + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色 + } + + + private double ConvertToDouble(object value) + { + double d; + double.TryParse(value.ToString(), out d); + return d; + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs b/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs index c5b9548..f1d6dfc 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Models/LowerComputerModel.cs @@ -928,7 +928,6 @@ namespace JiangsuEarthquake.Models if (byteLength != 8) //长度校验失败 { string content = "接驳盒请求读取上位机现在时间数据长度校验失败"; - sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据校验','{content}');"; DBHelper.ExecuteNonQuery(sql, 1); @@ -949,7 +948,6 @@ namespace JiangsuEarthquake.Models catch (Exception ex) { content = "接驳盒读取上位机现在时间长度校验失败信息发送失败，" + ex.Message; - sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');"; DBHelper.ExecuteNonQuery(sql, 1); } @@ -989,7 +987,6 @@ namespace JiangsuEarthquake.Models catch (Exception ex) { string content = "接驳盒读取上位机现在时间解析成功信息发送失败，" + ex.Message; - sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');"; DBHelper.ExecuteNonQuery(sql, 1); } @@ -1003,7 +1000,6 @@ namespace JiangsuEarthquake.Models if (byteLength != 18) //长度校验失败 { string content = "接驳盒告警数据长度校验失败"; - sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据校验','{content}');"; DBHelper.ExecuteNonQuery(sql, 1); @@ -1024,7 +1020,6 @@ namespace JiangsuEarthquake.Models catch (Exception ex) { content = "接驳盒告警数据长度校验失败信息发送失败，" + ex.Message; - sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');"; DBHelper.ExecuteNonQuery(sql, 1); } @@ -1067,7 +1062,6 @@ namespace JiangsuEarthquake.Models catch (Exception ex) { string content = "接驳盒告警数据解析成功信息发送失败，" + ex.Message; - sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');"; DBHelper.ExecuteNonQuery(sql, 1); } @@ -1117,7 +1111,6 @@ namespace JiangsuEarthquake.Models catch (Exception ex) { string content = "接驳盒告警信息解析失败，" + ex.Message; - sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据解析','{content}');"; DBHelper.ExecuteNonQuery(sql, 1); diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/SystemEnvironDataView.xaml b/JiangsuEarthquake/JiangsuEarthquake/Views/SystemEnvironDataView.xaml index aa0a375..7143c1a 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/SystemEnvironDataView.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/SystemEnvironDataView.xaml @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:JiangsuEarthquake.Views" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:hc="https://handyorg.github.io/handycontrol" + xmlns:Common="clr-namespace:JiangsuEarthquake.Common" mc:Ignorable="d" FontFamily="{StaticResource DigitalDisplay}" Name="SystemStateDataPage" @@ -118,6 +119,8 @@ + + @@ -189,15 +192,15 @@ -