From 1b18c3d1708de5396a183989237930ee52a9a9e6 Mon Sep 17 00:00:00 2001 From: 2509_92447106 <2509_92447106@noreply.gitcode.com> Date: Sun, 8 Nov 2026 09:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.props | 2 +- build.ps1 | 2 +- build.sh | 49 +- .../EarthGeographyModel.dll | Bin 32768 -> 40960 bytes .../earth-geography.model/borders.json | 2 +- model/earth-geography/src/GeoModels.cs | 9 + model/earth-geography/src/GeographyRuntime.cs | 25 + model/earth-geography/src/GeographyView.cs | 652 +++++++++++------- model/version.json | 2 +- .../Services/ReleaseModels.cs | 2 + .../Services/UpdateService.cs | 44 +- version.json | 2 +- 12 files changed, 532 insertions(+), 259 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 533ce6b..f89b1ac 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,7 +21,7 @@ --> 11.3.9 8.2.2 - 1.0.1 + 1.0.2 NeoRF Earth Model Studio zh-Hans diff --git a/build.ps1 b/build.ps1 index 059e000..5fcc238 100644 --- a/build.ps1 +++ b/build.ps1 @@ -42,7 +42,7 @@ $TestProj = 'src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.cspro $PreviewProj = 'model/_engine/PreviewGen/PreviewGen.csproj' $StampProj = 'model/_engine/VersionStamp/VersionStamp.csproj' $Sln = 'EarthModelStudio.sln' -$Version = '1.0.1' +$Version = '1.0.2' function Stamp-Versions { Write-Host '==> 自动计算模型版本并生成 version.json' diff --git a/build.sh b/build.sh index 726ae16..215d74b 100755 --- a/build.sh +++ b/build.sh @@ -38,7 +38,7 @@ PREVIEW_PROJ="model/_engine/PreviewGen/PreviewGen.csproj" STAMP_PROJ="model/_engine/VersionStamp/VersionStamp.csproj" TEST_PROJ="src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj" SLN="EarthModelStudio.sln" -VERSION="1.0.1" +VERSION="1.0.2" TASK="${1:-build}" # 按模型包内容指纹自动写回 .json 的 version,并生成 version.json @@ -144,20 +144,47 @@ pack_models() { } # 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置) +# 产物命名:GC-<版本>-<系统>-<架构>.exe / GC-<版本>-<系统>-<架构>.app +# Windows: 单文件 exe 直接改名(本身就是可执行产物,无需再压缩) +# macOS: .app 目录整体打成 zip,但文件名保留 .app 后缀,便于客户端识别 +sys_arch_label() { + case "$1" in + win-x64) echo "win-amd64" ;; + win-arm64) echo "win-arm64" ;; + osx-arm64) echo "mac-arm64" ;; + *) echo "$1" ;; + esac +} + pack_launcher() { - echo "==> 生成启动器更新包(不含 .GC)" + echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>.exe/.app)" WIN64="$ROOT_DIR/dist/win-x64" WINARM="$ROOT_DIR/dist/win-arm64" - MACBIN="$ROOT_DIR/dist/mac-arm64/EarthModelStudio.app/Contents/MacOS" - [ -d "$MACBIN" ] || MACBIN="$ROOT_DIR/dist/mac-arm64" - [ -d "$WIN64" ] && ( cd "$WIN64" && zip -qr "$ROOT_DIR/dist/GC-win-x64.zip" . \ - -x "./.GC" "./.GC/*" "*.DS_Store" ) - [ -d "$WINARM" ] && ( cd "$WINARM" && zip -qr "$ROOT_DIR/dist/GC-win-arm64.zip" . \ - -x "./.GC" "./.GC/*" "*.DS_Store" ) - [ -d "$MACBIN" ] && ( cd "$MACBIN" && zip -qr "$ROOT_DIR/dist/GC-osx-arm64.zip" . \ - -x "./.GC" "./.GC/*" "*.DS_Store" ) + MACAPP="$ROOT_DIR/dist/mac-arm64/EarthModelStudio.app" + [ -d "$MACAPP" ] || MACAPP="$ROOT_DIR/dist/mac-arm64" + + # Windows:把 exe 重命名为发布名 + for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do + RID="${pair%%:*}"; LABEL="${pair##*:}" + SRC="$ROOT_DIR/dist/$RID" + [ -d "$SRC" ] || continue + EXE=$(ls "$SRC"/*.exe 2>/dev/null | head -1) + [ -n "$EXE" ] || continue + DEST="$ROOT_DIR/dist/GC-${VERSION}-${LABEL}.exe" + cp "$EXE" "$DEST" + echo " -> $(basename "$DEST")" + done + + # macOS:.app 打成分发包,命名保留 .app + if [ -d "$MACAPP" ]; then + DEST="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app" + rm -f "$DEST" + ( cd "$(dirname "$MACAPP")" && zip -qry "$DEST" "$(basename "$MACAPP")" -x "*.DS_Store" ) + echo " -> $(basename "$DEST")" + fi + stamp_versions - ls -lh "$ROOT_DIR"/dist/GC-*.zip 2>/dev/null || true + ls -lh "$ROOT_DIR"/dist/GC-"$VERSION"-* 2>/dev/null || true } package_mac_app() { diff --git a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll index 53442514395e9ab520b33a7fb50126cff11db394..a73ab4b31aa997f0e5f6e4c1eb1bd68d84fff6cd 100644 GIT binary patch literal 40960 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 z ze43-h*f@B%uf1RrC(HL%RRHiDrcex+UD`6^0(d9tJi%b#)U;?NYLhQ#m6zT-B;i&!;< z_@KDe^L;)HVL!x(mb|*h^5_v(}&8 zKJfwU{fX*u|I-~1=T%9nJ>d0N;sK_9r9J8~@y3Y{M*~7!UlxIf4v7k;e&zX7Q4-V? zNon8nggqfKYnbGGNx2s|#v?7MsFk3K#RFN%DV`EBzlKY2*B8gN@!}jstti&@@!|qS z-Cq{RLzb*xY66Zv@N9#4#!;kWRx0XE zN3%Xf%)p@urQPn>h+T2BqP98O^=aZ$Onp-<4xa0oE+VxgIV4&=&7K+JFE}5eKKiGz z#uF94nidR=j>SXYB&o0rlR#Hy~UvnqK7Ddf1eZzB^ z=uyF{f%=}Jii?+l`iZ1?lTN|` zS-94Fl`u9*od*iHdIyD1QB=Z^C{`4eFeD~Qic7d!oUPK@isRm^MU$c~EA9rhDo^qn z(WcT$i|WKRqEk^*i;6(?DC%K%9p3fctEflaMWBWhMfJQ+98eV1^Lp_iMNvI(5Fb_) z)$;~%L{Z-f@AbZ4Jgle}!b9Ez;!#O)8*UUYsWdA6M)8`WsPr4f9~4EU-z5H~C@TE} z;vGd%={E}(1?uP(D*a|rBq=W87Ez<%;@h(Q{bodlmJts}7^)N<}^DDgt$#qNoiY5;rS~+HkwL zOHy3VJH%0yR#oyb?;YY1MJ+6O2-KJJB<~c@sx&V~)}7*cMbXH*Q~X>}7owhbiC-yd zE9!Zd_@knJR(^qgw|G-gua!S1?iPG>1q)I=?-A}Txe<9#Sc=+#v=57NMWxV&kBBLf z;x^nX&QfX5!n5Bi&Q;VeiZoCw6t&1xhnQ!LqLz6Ohlx#!y0g3vKONVms0Yi7KQ@xi`j8k>6j}GMxKUAeA?<$gAw_)>X-C9I6m^;J0{sDTL{WQv z&xr@brxf)N(jF9#D(Z2hJt&@1)Ng`y;^X2Qih3(p1nPT=npXUE??d9pimEC84yczU z#a8-+Si6<1dl#Nwd*1sAG02qkFGs}>RN9wIU-TXoXKj;`dyQAU4~u3+?JWIo?`K4t zqFUYWct0b^D83Elw5tkA|^3)4Pt3id__bQ^?RnK43n%^BP1OGYY;UE>qMTeMZ4kVn0)|gs+L~RoZQ0M#0y_?Rja(#l0%+yD0CtSlT9a zI-&Ep=wwQ2d0No#%u#uVg|0s>_9-f?>H0I`CPf_p^$l@QQE!9#rg%tE&AKVRB_3r; z>im{?Ql&j1Y6`vu?V3oH=ip!6IL$!3MSFe8Cl2Ds0P)i-DLEF-7&MmDn2%J**!ahQ z8;IVB(_Kn=w{ofzM+BOXko4<D<*%5Z=p4i(c0$NR%{2GCWKlg!UG8sEh_M?-p5 z1e+*8UBp>N;%{>6D#3S%I_&9fneByC6H0XmN_D=6R8z!@=se^NOH(#3LcM=0SVi+9~m=q5$A?eBlnQ)y@%>W!nK=<#FvOeyZ3MPv{Si>(-jN6iwR|xLVWL!YA~F zWw&c5xmG8+jVE;~<)lt+Kgo4IsUP!8JD?8wC&E>!t2LYNzx{-z(Y)=Ko3GAJX-=^u=yn z|C9bGPI5ikOq?6MrPJOtq4k!P>RYs*gd%!O`;;TDCA9mk8Q^~;I7iov+dO9>FYQ|! zHQl%XunN#J^x%d13EsiJrPI!}U;Bh{nLfm+v$Pu=R8}U`uOHOvd{^lo)D{FT0K5Xx z_(53dI{ko_a(@7Nb`?FKAJ*K)CjsjiE*kfUuAwiULRmCU4rot$zNgbTd{IBj7OpiS zp+5k>A^0X>PtlutBRHoi)i8~t+WCMj#*DDv*aH5?MF)?H!`ipTH5rd+8v=+3 zShUJGuD#E*4)6tQD`2NbN8N517c-Ku9!}vnuaA47mwTa?d!d*)S2E{H=A6J2h%Lqm zZ9U)wPQ8{>KfrzZ0a0IA@3=!;qpbq`lD5|2Q=G~AdPkCFp3s|0H#@FnZTGT<2Ux=c z%=r{^9%asxEdL~Hc$8Dgs&(1{?QM61Gs*mCP=7Z#``nwI-(~q9DgI3N4bCU@^8-nY z;rj4l=Udu$jgJHVL;oz`Zy0s~_QQH#aBBK*t*<)ofVOWqTeO4zpE(a0uX=vrJZS9m z{N8!k_*UtEJC8#0EoV7;&1079)Yk{JdFA6w%UBhPnyXOr^UN1f^NY<_#UBfLfYUrm za*KY)Eqa8l_Xu0>cbsY&A1#YQ!&BM=7$*-EMa|zF;mwZB4OAFYxL5PmPazz79^wxNieK zkI{R|SmXab@W$ZtfHzn#0?x-gTBN)Eub@`r!&J8w3mD9dYyH z?wL5f?r_Z%8S%PrHaJIoHHiA}E~vq&+abX5;%k6Y#kT<~@%s=pIQ_N&&lZyan?xnx z1)>eGRqO%WhIO-%^)!hA@ljtBm$IB;jQK+h4>LT%GDkS|ICGw6&eO~}#hh1|^9pke zjdU6s)!d^U5r6hgWzJOQ%mU|Mz9!~0F{eelNgVaHfbaCTGryhr3C?>BbFN{|0dPY8 zBg{F%oTK1W_@8FZ)66*mPL=;<=DeaH)#P<9<#nVw{T`ia710M^$%uYCY&%V-I?Mw6 zBH$6Rz~8{B4V>D>v|mQR4=^k2iA1FZ81<41uv`=4g~1n`UeuQ2{P@U3`@ z=ZI+c&oa0~;7)%FV3$8;T!Z?=46088oPYTa0QUQj0$%4o!SW}7JN>US{yOjv`aO;# z;y(W@z|Z?z0H5?H0H5_AaFG53z@7fX4$^s)IY+^H!GD}NCxHLne~S61nDaU~|MY84 zlJ_`|h(KU6sj_{X>i&W_TQ&FZzx%eu|-Hl8k1Ow#f_|8O9h6F+9xh zI7=R9{1ijY#km+ZGK{%MTa57`#)lX`%3H<@EF763}0q=%6$z+xbRRZ4GbGSG{&|w9%Fon;UVT6X8aiA#~FW_@l%Yy z>iLK`=6lt1lX%f5aGHdgdr6xEr!vQU4xE_1=!-CaGV>c4-_9_`oI%Ei7(c}LF@~am zv_%*;Fx<{?kl`VQFEbQAZVSWh3c#Pr83||eZ2ojBjVy0nSn1Ami6Ee#|0& z(i|jy2gAW2c|u2sIMWz5GwfjKC}uvxW`-RM9VIlnI!dXf4={X{;j}X1xUo0sb5$Y6 zFVPkwUhCCv(eBYcs(nTKiRRMJ(J#?^^t<$5>l2Jhqs!QD+-saLwmSwLPdXCL+nnEb zzUG`}R-3hEpZRg~H>Stc;BsQGf?p_cT!;M#_GH+Zm{_4)*qOKy`+M+PlU}?IQh?u~ z^5Mw=KQ^xctT=@tf?R(sT2O#rJuO}g_-Gly_cPudCVWE)L7#gGU|De!;AF>Iz?%!# zXF2y2UkZF?5%C{)k4$|r+&L!ys&EhZOH2C!PZSY++?C54FQK0#m1SMZsjrulj4U_9 zrN6>8U*Vx#N6QITlwO~e`3%ck>7!gvGW=JNWVRIFQb2dIbv%(01k_;*?D?@TA}f}# z^}?{7hNn(k;FrOE8uoP_;NxIJ4VEhaJ^^;r@HUwr_$1g8J5xX%_rY;r950Vi2~Akt zH9XlE0=^u&HL(Iv#~tcY;O7DAxFcN-`~pB7_n^lEUjwM)?~zOdz7~-7nias;0qUYv zOa{IlkoKQbfo}xVaUXp;@GXEi;}SE0Zv)iD#n_E%;u1g|ch@U{ZwJ(IZ@n6LJD`pT zdk*k8pe}Y|->QjDKwaz-^MEG+b;K`c0Z#(zxc9ygcnT2DjA4hXiT45GOZWU?C0nW0nKI3Kr7DAfS%@a0~FO z0d;W=?4;pd$OXW!gSBvv9FTse`$FLF2h=gEE&_fd@6T_7wKTlp+bUux>uT{kp=mAJ z7Oh` z8X&*8;PZW)VBjDq`)PJP#pH0QYaumK?gY*g=~sgdj41h8?Ye#p-aVW=yo}p$-Z5O? zMwfh+W4PQYK3mG?K@Mjh^ir74qp=uQ8i{xg2cu9PkWJKtF+p1 zs}h;s{5&?@8}AxjWSzJm-oG)H?2E6BCDPmLM00}G$I|^ET9BtsH1@{2>%>Nsn@ZP> zYF*X@qm$6cd7~ORPps(cZr?snaH;G2deGE)ToPDZ2J(y^BlAZonlDzz@buu``FoMJ zWDzo@I{MHjqBGvxwoI&S64YyT&0<9&nOp`l&1)8|J-g!RIFROaY|q+QItFtl6}d8= zQrOm1cRXVYK}VKY726R{+9}IYX^ae;YD&d2y~sm_uN1BQ8JMo7AEOH%2|XS+t`E zpcGWPrw8t0MJnAD>m@pyWi_hZA(|kSP9-|T$~3?^EgefPZ);l?Yrh<}U6F_gANcN7I+8occx75~mkIqNMkDWq!(up1# z%wr2Ii}&t{$H&mQD%QI?F%};ld6ZRJ+jqsgVjD5rP|)aP9$grEsr2ZyRSC@H(QKaL zquD%7#t@eif3&>v0izRI2WLdx&LEZ`MWgT)^k>wXKV&rc_r?EFE9Ix1A@rXzAXax*VD) z3`k{Y737>NQtf?`k_$8^v}86WG6@oCPW91+)(pA2vd3SCwFF*+(&6iK6jlQ&A(q+I z+S?CwMXI}3Vi~5X&NSe;WJZ)LT-Vp#n*hIs9hOa@LHM(UJ-hnz7_D&YanY9H3zbfT zkQ%##uEd~~X>BUmpCrcGbm}rxHcK}p6Yw8#>JzpgS(t0X2)qy33|^7~6S<&?46kcq zIh;?Tvk$4u;+=_Zh4YB$OQ$g&n=qOvxhdAeS372?Sq2Zth0%JEY$8f_f~@cIWHQkM z9+pf%xr)JIC*z%{sK}6y=G@%(+^w*3npXfMbu{*3q2AF4p$*-;u_)|JP!~2~2;@@M z#QS=&9Bk4Na-;oz!U@66BKC#do&GcE)=#u#)jij?WR(@?@Oc3pFG!iKbHmBMZe~ zQH$+mEHB+|5bV&=*WR1cNfTH02$r$Ec?ot7o~YgZxg2V=Gru>nBauWSbE!1qIJ^_< z)BP*sy%OhOg$HteN6=Vn>CVKvGl|~BZW`CL#`9=uOHrP_LE$AQI9AW)_YqK)+_rem}wa_0O+lJgH^wDrgKkYoqG zwEmNy!|H9vKkMOW5ypW*iE9zS5Z>02j&))_N-l*rup9Ls$0Ee1(K(Vg-0jq;u|?9< z#tq#Wj1KPRcn4))o@tNuP^x^TMyyJ8D&Lllqt)yl$#cnVmuOj*?#t|ART3k2Be7+j z^2*DqM5#4$t&?<1OIKH4FAbU2R5F3)VC|JD6vf7pE7Q23fs#k=FP0w8!>I2C+ZNfu zwLw6?3qA&*hXA#6Q=$VHhgysgZ&kdzlVspG#ZH9qJFpswwFv-<7~wvF!Jd4j02VI| zfwMf8?%l<{yS2BkBay0+c*o@;(T$-OORDf~6_zhJB3g_vt~%hqu+a2@!HXpA0Hms{ z=Vv`IJ8H2u);)G|O-E8Hpv{QbNnm}v3wvF7M>0h^m4w^G?1PV1WP7ZOEkK(vHNHgK z6{%F0SObrPnHB5Kkne%l?~{^t1jpve5@a!Q6cnIwN|vCM5fNNAYhF|*TGqz9Q69yW zgi-WLSF*?Qj?OsYJ1~psibX7zCS>{h`eN8G5-JCdiin88dnH1s0xCk}f^B?+B;>t795Z|A|_J0BYdfqKyRWV|s0 zMr#~hknHPH#o%{gY4oka6$Q|RYCS9>Wr5)wl4Fh?_h5^-q0j?UNV#<+8 zE8_@2$OTh7@y*}=QDp>=a)}|(l3OD|mRp|^Dy*QjP#Oztgc!DM3B{34R}Y4c^b4)M z`1RdY@pKP%sM23Gc6T&kAC`vyhncYuw6@1ElvJ3*T6r59PmA+oyJM}q?XWp=gkg2y zaG7^}Js60XTT;2)^QBn}ZNi|WMeQ27H*LHP=T0yKZztJ+b`Kx}Zw=U=Ar_Vth7RGf zbVX3d=k_DA<7xBDE)wByuR7tu+(3QXQ&{$a)zH}rAYbGu2xo0fqE9i?vA%Y9(gG37 zh{hcmyLZ;mVNs$zOE)KC=y6tAJRyAue#Z1ve# z3^k?D3w5ATkP&PKT&WDTmM1_e%kd?T-PVx}=VcZeHL_L`L*tY(aw#%JVpKruuGF3! zKS#A;N23zB9@O75uiVASc?uat(k!OjisbAz-Xk+-!(ruvGc{||i7t*yvaPd^3;6U6 z=O5Vwbu5tMufthlydy^|^YA&vC~l5Hjgk9J?l^_omdHz?#wd~-W8+Car4no6sdX!A za;qLj4i+>zA*`{RXLqz6rq<-*)M3*0p<{MrU^FYQqed4yOw2!CN>kmEyAJ*+k44TS zH=!=%Q-cf^gN(pZ2j{~bmhT}X2M0N6iOGp3b=$aY7n`P#!2HOi~^&+ zj35Vy3ssv>0$7E_mZkQ#?uvD!_Fzc$vc#%buNnir6dkmK%$-Mzofx#B+k3@@J7@!G zZzM$r&Ts{Wbaz~;IWL~*+$A;Tp;#;PDB1>Zl5(~O-hi+O$Az@!txqvQwN_46w6t{h z^!2KZ$nZ5@wh23}1blcSt=JUoGWWbxI&lSx%IDL9my@D0n&fVkbI@3&+^Z3EkY{El zHoB6q>nbUR@w6mXVjY)yB+VnE7eSyTxg7Y%UeWr#w6qgVD2`3Ij2y*dNG7zk(>bp? zQb1qz_2y=kJe*L6D|{y*m&V4z8oE2a2CZfN)NDlP>a36{+8V&+Gfu|@S%kem@6FWl z16u|8vA)G)T?j?H;=O6y9*{Ea>be`l1AC7>YR68)3>+AOvAo`7nhd0Rm+5SP%T(KL z$}JCxFtI62q6;a(7{N&tH%g%xnZ#+|i`cp&4y1Q4ucrt-(G&!UiS~Y$SIY!#$#V%b z7FU3g>=&zXV3EKL7S-$(F`B3Sbd1!=r!E|o*j#Q9&bVa|L~_H;!`)`vN-p8c5qkHl z(JS#(PaDOqw4t@#gzX-=u`P7gONm);%JBv&me@^f{GrCTZ~AfT+)ZXLqStn<1nv!Y zO1tr`!C&;s;4Wx4epIv_*BGc?+#yYjOfBsJH-2Noktrn-{sZ)L#6X{aR@w?$h?7E>&VSzBVNar;53_H(QIh zt?Td=p1GThUb2LSl;x0H0sad76LaoZGvm_WI&)n_dmuO9Mep%mdEZBN`P%cYcNa2GFIM8cPou5z+d8vhdLw`%k>QN6fRu8l~ckwI2PN<~hpnnytw?wV7d%Q2x<gby$GBpq)S`OLmGOacgNkDGjk~*a@0bi4&Ql7Lo@4`&vqh> zGL0;@0Jo>FK)tIWxdx+!M!P5=ZL%*l1D11r4mH47GCn7y_Bv>;Mg1@upiTDGa`5n) zE7J>*T8mPU*Koh18J>5vf)vlC80ptUA=R{H;QRYOwg1i??`zZi`IZ(1AI8Y37MI># z*QFKAygY|XK5?{y($-t9sur67H6>3R&97uI8X@J{)H>9OYhe%U-;RFViEle<83RWB z+73Qy1e$ti2RKYm%9hRYiY`zVwCjg(ITjp>lRrnub4c z1v20Su+AdXN$5lg@kbH$fE9x*1au955K-uXK)~VEg69w@BM>1_MPNP&x!vB9;1)d7 zyG5JmM^3jn7Z3kW5{6fEo5T%Hke6uzml@m~Oa!~|?|s39iE@KO(@p$V{@}j?E~vuQ zPqhj5ap``Nu!d$y!CFp~5&Um(s8NcxxJrUUtF>U9WJ5wSFGBHyc%hDT zPQWjV=ty@vTw1WpBOEBwiI0@rATL{75r^i-C*X1fyGpEnEm)6#U9uVV?uZ~B)XOB) zC?wEuopkPl#b7c*SGiG{m=+wovjDZRaY|WB^`Ai4dY8*FG2jjaQ1QW=k8W|is>W;wPpAHW7!+_v2d03Lcp&=F;y3U2a3^;h$&$bQ@ei5z2 zPxu&Q8>!_9rwdw+OX4Zkbes!1VGTaZq=Y9(!Wul`i5Tczr1|_V)93S9gD2^K3|1qZ zG!#zy&>F=bJXsVmk-;Avy4f1~pfz---yd;;5gdGw>*boO=@@GP3^qTi5*&QqjS~ER zYv`j~;?O}FS2^-9kCvmPwcfn}P&Y#wzPby)yh9($<>YG34bEk=y{1bAbEUeu<7GOPVGX{fF4C^<0wNWwz%~G+ zFdbNW@M_nL;KeY*vs?tGA-Wy^C;HJ(sM>JDDy0)SAvgj51|KBj942jwJC^b6^qds8 z<*@E{TZ4b~QTOtAgC_X8!M890fXboCDbEt)uYQ+P)&RAe=qFe71WKiu{U=;8vqPBL zA+5+|!s`TwF#ceWf4L1zPs8mNm}%sTFvpx;3|eGAj*%>f@ds(*Q09>C#b3i1{Fllo z;41MP+RzD1)Zh?I!ql@2PZq+B1&2;rLmq3W#Txo4RX7kFde$0x$r^gzAMEp>8011* z443AISMmFSxWg_N`=k>N*k247?aM@%Lm2T$uQiB=}+t{Z$(2 zEvL(XPcdOCT-b}qiF}e=zt1jpo4UiqdV-`rLLMyO{A9<8e%%a^&*N20>7AgiQFWcB zu5(S!hj@Up2J4|~Xd;xJM@ol?%j-4SRKN>q!AsD=!FcczZ^XdmoM16Hf;i{kp<-P6 z5U5~P!0UX(EcSpoI21rl{Q_QcC;*>K8Zjg=0=R}WN`n{iC>p%3kQSLsptmd-304K? zBh4zJf~_Jc@eQ6SgWsSP41FCO{00V?k5(e$odjMa+&RLJxm6@+IZ~;9azp|PL7vwh zMz~95e$bIDz6M z>fUIU6}4H@vaD$~Yi^b`*CjI|7LvsRk(%nWGWBK=#h3wfKPD<7wcLcIfTDl`yVsC{ zo`DF-_$CQnRH#Zw%NbhQTBkJ~>&2b8!g_FoQQ^i{cSJE3d{M3dNYeu1h8dY(_nP*GfK9jNd=SBj|c~6Ao?G;9m9K_BbE^;(j@fJ2lAZ zG!X=TtG29W&GPk4xNU`p>8fm>up3SR3IfI1$292a6g(+R_cGm-BLWF8US;4@Z@hq@ z370ylmqaam3cf~{5(pQc*U-2+;_r$$4QMRh&C4Bk!iG3 z*T6w_snt5r@sjPp4Z%H*)v-jkyE&z9o>NoU|6<31N4YhDR}%1{w#xe^n1n*d^Mt|= zYj@i>dZ{E+-PT}h*!NWNHn4Dzn9Pu|kFuqZIv=NU3>@Ndfd<_VYm- zS2#VmVJ@F?MAWJYUo7v*Mrl1s{kYlzq#ejhBdH<+d7pKy&8=T7u%79^=czUKeei=3QzHP)TAK&Y}m)~3ov`v(3x;o&!b_=lEhYfn!7M=YT6K)?^-3=VHF`#n0p z8^tHN^YGn#Oo)rgA*#>C22N`6eo`ymJlcr!!gat}@RrUR&@F%~fYawG#~)A2SxU1k z_g%`V2vc#DD~e*^(u^;?`$Q*VEBK@f&vN2SY9~&n=rfITt>;rKJoBMW;1hgq#RB4U zjwhj1L!IdCjZVDqh}9@f_pr=dv|Ik0kFz(}0O#Zg-Ecyh!bu>VBzD8|tihGe1?jVf zPtDdrqY!KHb{W0J4AIi$G=e@L3z*Lx9|JZVjCoujJhMXKt%e65T0CLT)bB z;hesW;L`nrT-$1Kmtiix@=E2GL7uEb_aM@^#-Jxx+xJ#(4a!e)`3N$gZxwWPvL>=Z z586*H>O}3a(6CF|%;jFF_+()!*R}&u(pvx1@>jr{)4OqLwn-nKkmg#GZ^sDU53}tS z;hye8E67sxxtia58?I-hHFLJCM0@E3dl9~MsCx%vJ8Op<`zx??eVjQS+ O;JEhxfBxUI!2ba}!+UxF literal 32768 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 NameI18n { get; set; } [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); + /// 复合分界的逐段明细(如亚欧分界的六个地理标志)。 + [JsonPropertyName("segments")] public List? Segments { get; set; } +} + +public sealed class BorderSegment +{ + [JsonPropertyName("name")] public string Name { get; set; } = ""; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); } public sealed class BorderData diff --git a/model/earth-geography/src/GeographyRuntime.cs b/model/earth-geography/src/GeographyRuntime.cs index 4e61464..13fbfcf 100644 --- a/model/earth-geography/src/GeographyRuntime.cs +++ b/model/earth-geography/src/GeographyRuntime.cs @@ -87,6 +87,7 @@ public sealed class GeographyRuntime : IModelRuntime Spacing = 8, VerticalAlignment = VerticalAlignment.Center }; + actions.Children.Add(MakeModeSwitch(view)); actions.Children.Add(MakeToggle("五带", view.ShowZones, on => view.ShowZones = on)); actions.Children.Add(MakeToggle("大洲轮廓", view.ShowCoast, on => view.ShowCoast = on)); actions.Children.Add(MakeToggle("板块", view.ShowPlates, on => view.ShowPlates = on)); @@ -172,6 +173,30 @@ public sealed class GeographyRuntime : IModelRuntime _ => new SolidColorBrush(Color.Parse("#96C8FF")) }; + /// 3D 球面 / 平面等经纬 两态切换。 + private static Control MakeModeSwitch(GeographyView view) + { + var sphere = MakeButton("3D 球面", () => { }); + var flat = MakeButton("平面", () => { }); + void Apply() + { + var isFlat = view.Mode == GeoMode.Flat2D; + sphere.Background = new SolidColorBrush(Color.Parse(isFlat ? "#16263C" : "#1F5BD6")); + sphere.BorderBrush = new SolidColorBrush(Color.Parse(isFlat ? "#263A56" : "#3B7BFF")); + sphere.Foreground = new SolidColorBrush(Color.Parse(isFlat ? "#9FB4D4" : "#FFFFFF")); + flat.Background = new SolidColorBrush(Color.Parse(isFlat ? "#1F5BD6" : "#16263C")); + flat.BorderBrush = new SolidColorBrush(Color.Parse(isFlat ? "#3B7BFF" : "#263A56")); + flat.Foreground = new SolidColorBrush(Color.Parse(isFlat ? "#FFFFFF" : "#9FB4D4")); + } + sphere.Click += (_, _) => { view.Mode = GeoMode.Sphere3D; Apply(); }; + flat.Click += (_, _) => { view.Mode = GeoMode.Flat2D; Apply(); }; + Apply(); + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 }; + row.Children.Add(sphere); + row.Children.Add(flat); + return row; + } + private static Button MakeButton(string text, Action onClick) { var b = new Button diff --git a/model/earth-geography/src/GeographyView.cs b/model/earth-geography/src/GeographyView.cs index 30ca0a6..6779080 100644 --- a/model/earth-geography/src/GeographyView.cs +++ b/model/earth-geography/src/GeographyView.cs @@ -6,15 +6,17 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Input; using Avalonia.Media; -using Avalonia.Threading; using EarthModelStudio.ModelSdk; namespace NeoRF.EarthModels; +public enum GeoMode { Sphere3D, Flat2D } + /// -/// 地球地理模型画布:**纯线稿**球面,不填色。 -/// 三个图层可独立开关:五带 / 大洲大洋轮廓 / 板块与洲界。 -/// 拖拽转动视角,滚轮缩放。 +/// 地球地理画布。两种模式: +/// · 3D 正交球面 —— 拖拽转动、背面自动裁掉; +/// · 平面等经纬矩形 —— 课本地图样式,整幅一次看全。 +/// 所有要素都是线稿;五带/板块/洲界各自独立配色,便于区分。 /// public sealed class GeographyView : Control { @@ -24,19 +26,18 @@ public sealed class GeographyView : Control private readonly BorderData _borders; private readonly LabelData _labels; - // 视角 private double _yawDeg = 10; - private double _pitchDeg = 18; + private double _pitchDeg = 15; private double _zoom = 1.0; private Point _lastPointer; private bool _dragging; - // 图层开关 private bool _showZones = true; private bool _showCoast = true; private bool _showPlates; - private bool _showBorders; + private bool _showBorders = true; private bool _showLabels = true; + private GeoMode _mode = GeoMode.Sphere3D; public event Action? StateChanged; @@ -49,37 +50,24 @@ public sealed class GeographyView : Control _borders = borders; _labels = labels; ClipToBounds = true; - ClipToBounds = true; Focusable = true; } - public string CurrentLayerName => _showZones ? "zones" - : _showPlates ? "plates" - : _showBorders ? "borders" - : "coast"; + public bool ShowZones { get => _showZones; set { _showZones = value; Redraw(); } } + public bool ShowCoast { get => _showCoast; set { _showCoast = value; Redraw(); } } + public bool ShowPlates { get => _showPlates; set { _showPlates = value; Redraw(); } } + public bool ShowBorders { get => _showBorders; set { _showBorders = value; Redraw(); } } + public bool ShowLabels { get => _showLabels; set { _showLabels = value; Redraw(); } } + public GeoMode Mode { get => _mode; set { _mode = value; InvalidateVisual(); StateChanged?.Invoke(); } } - public bool ShowZones { get => _showZones; set { _showZones = value; InvalidateVisual(); StateChanged?.Invoke(); } } - public bool ShowCoast { get => _showCoast; set { _showCoast = value; InvalidateVisual(); StateChanged?.Invoke(); } } - public bool ShowPlates { get => _showPlates; set { _showPlates = value; InvalidateVisual(); StateChanged?.Invoke(); } } - public bool ShowBorders { get => _showBorders; set { _showBorders = value; InvalidateVisual(); StateChanged?.Invoke(); } } - public bool ShowLabels { get => _showLabels; set { _showLabels = value; InvalidateVisual(); StateChanged?.Invoke(); } } + private void Redraw() { InvalidateVisual(); StateChanged?.Invoke(); } public void ResetView() { _yawDeg = 10; - _pitchDeg = 18; + _pitchDeg = 15; _zoom = 1.0; - InvalidateVisual(); - StateChanged?.Invoke(); - } - - public void SetView(double yaw, double pitch, double zoom = 1.0) - { - _yawDeg = yaw; - _pitchDeg = pitch; - _zoom = zoom; - InvalidateVisual(); - StateChanged?.Invoke(); + Redraw(); } // ---------------------------------------------------------------- 交互 @@ -95,14 +83,15 @@ public sealed class GeographyView : Control protected override void OnPointerMoved(PointerEventArgs e) { base.OnPointerMoved(e); - if (!_dragging) return; + if (!_dragging || _mode == GeoMode.Flat2D) return; var p = e.GetPosition(this); var dx = p.X - _lastPointer.X; var dy = p.Y - _lastPointer.Y; _lastPointer = p; - // 跟手拖动:像素位移换算成角度 - _yawDeg -= dx * 0.42; - _pitchDeg = Math.Clamp(_pitchDeg + dy * 0.42, -85, 85); + + // 跟手方向:向右拖动 => 地表向右移 => 经度增大(原来是 -= 导致方向相反) + _yawDeg += dx * 0.42; + _pitchDeg = Math.Clamp(_pitchDeg - dy * 0.42, -85, 85); InvalidateVisual(); StateChanged?.Invoke(); } @@ -118,42 +107,22 @@ public sealed class GeographyView : Control { base.OnPointerWheelChanged(e); _zoom = Math.Clamp(_zoom * (1 + e.Delta.Y * 0.12), 0.55, 4.0); - InvalidateVisual(); - StateChanged?.Invoke(); + Redraw(); e.Handled = true; } - // ---------------------------------------------------------------- 渲染 + // ---------------------------------------------------------------- 渲染入口 public override void Render(DrawingContext ctx) { var size = Bounds.Size; if (size.Width < 40 || size.Height < 40) return; + ctx.FillRectangle(BgBrush, new Rect(size)); - DrawBackground(ctx, size); - - var cx = (float)(size.Width * 0.5); - var cy = (float)(size.Height * 0.52); - var radius = (float)(Math.Min(size.Width, size.Height) * 0.44 * _zoom); - if (radius < 8) return; - - // 相机:先按俯仰转 X,再按偏航转 Y - var cam = Matrix4x4.CreateRotationX((float)(-_pitchDeg * Math.PI / 180.0)); - var planet = Matrix4x4.CreateRotationY((float)(_yawDeg * Math.PI / 180.0)); - var combined = Matrix4x4.Multiply(planet, cam); - - DrawSphereDisc(ctx, cx, cy, radius); - - if (_showZones) DrawClimateZones(ctx, combined, cx, cy, radius); - if (_showCoast) DrawCoastlines(ctx, combined, cx, cy, radius); - if (_showPlates) DrawPlates(ctx, combined, cx, cy, radius); - if (_showBorders) DrawBorders(ctx, combined, cx, cy, radius); - if (_showLabels) DrawLabels(ctx, combined, cx, cy, radius); - - DrawCompoundSphereOutLine(ctx, cx, cy, radius); - DrawHint(ctx, size, combined, cx, cy, radius); + if (_mode == GeoMode.Flat2D) RenderFlat(ctx, size); + else RenderSphere(ctx, size); } - private static readonly IBrush BgTop = new LinearGradientBrush + private static readonly IBrush BgBrush = new LinearGradientBrush { StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), @@ -164,11 +133,32 @@ public sealed class GeographyView : Control } }; - private void DrawBackground(DrawingContext ctx, Size size) - => ctx.FillRectangle(BgTop, new Rect(size)); + // ================================================================ 3D 球面 + private void RenderSphere(DrawingContext ctx, Size size) + { + var cx = (float)(size.Width * 0.5); + var cy = (float)(size.Height * 0.52); + var r = (float)(Math.Min(size.Width, size.Height) * 0.44 * _zoom); + if (r < 12) return; - /// 球体本身:极暗的海水底,只为了让白色轮廓看得清。 - private static void DrawSphereDisc(DrawingContext ctx, float cx, float cy, float r) + var cam = Matrix4x4.CreateRotationX((float)(-_pitchDeg * Math.PI / 180.0)); + var planet = Matrix4x4.CreateRotationY((float)(_yawDeg * Math.PI / 180.0)); + var m = Matrix4x4.Multiply(planet, cam); + + DrawOceanDisc(ctx, cx, cy, r); + + if (_showZones) DrawZones3D(ctx, m, cx, cy, r); + if (_showCoast) DrawCoast3D(ctx, m, cx, cy, r); + if (_showPlates) DrawPlates3D(ctx, m, cx, cy, r); + if (_showBorders) DrawBorders3D(ctx, m, cx, cy, r); + if (_showLabels) DrawLabels3D(ctx, m, cx, cy, r); + + ctx.DrawEllipse(null, new Pen(new SolidColorBrush(Color.FromArgb(200, 150, 200, 255)), 1.4), + new Point(cx, cy), r, r); + DrawReadout(ctx, size, $"球面 · {Norm(_yawDeg):0}°E {_pitchDeg:0}°"); + } + + private static void DrawOceanDisc(DrawingContext ctx, float cx, float cy, float r) { var disc = new RadialGradientBrush { @@ -186,178 +176,173 @@ public sealed class GeographyView : Control ctx.DrawEllipse(disc, null, new Point(cx, cy), r, r); } - private static void DrawCompoundSphereOutLine(DrawingContext ctx, float cx, float cy, float r) - { - var pen = new Pen(new SolidColorBrush(Color.FromArgb(190, 150, 200, 255)), 1.4); - ctx.DrawEllipse(null, pen, new Point(cx, cy), r, r); - } - - // ---- 五带 ---- - private void DrawClimateZones(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + // ---- 五带:按纬度带填色(用四边形条带逐格填充,避免整环多边形跨地平线破面)---- + private void DrawZones3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) { foreach (var zone in _scene.Zones) { - // 每个带用半透明色带填充 + 边界纬线 - var color = ZoneFillColor(zone.Id); - FillLatBand(ctx, combined, cx, cy, r, zone.LatMin, zone.LatMax, color); - - foreach (var lat in new[] { zone.LatMin, zone.LatMax }) - { - var pen = Math.Abs(Math.Abs(lat) - _scene.TropicDeg) < 0.5 ? TropicPen - : Math.Abs(Math.Abs(lat) - (90 - _scene.TropicDeg)) < 0.5 ? PolarPen - : ZoneEdgePen; - DrawParallel(ctx, combined, cx, cy, r, lat, pen); - } + var fill = ZoneFill(zone.Id); + FillBand3D(ctx, m, cx, cy, r, zone.LatMin, zone.LatMax, fill); } - // 赤道独立强调 - var eqPen = new Pen(new SolidColorBrush(Color.FromArgb(235, 120, 220, 255)), 1.8, - new DashStyle(new double[] { 6, 4 }, 0)); - DrawParallel(ctx, combined, cx, cy, r, 0, eqPen); + // 边界线:赤道 / 回归线 / 极圈 + foreach (var zone in _scene.Zones) + { + DrawParallel3D(ctx, m, cx, cy, r, zone.LatMin, ZoneEdgePen); + DrawParallel3D(ctx, m, cx, cy, r, zone.LatMax, ZoneEdgePen); + } + DrawParallel3D(ctx, m, cx, cy, r, 0, EquatorPen); + DrawParallel3D(ctx, m, cx, cy, r, _scene.TropicDeg, TropicPen); + DrawParallel3D(ctx, m, cx, cy, r, -_scene.TropicDeg, TropicPen); + DrawParallel3D(ctx, m, cx, cy, r, 90 - _scene.TropicDeg, PolarPen); + DrawParallel3D(ctx, m, cx, cy, r, -(90 - _scene.TropicDeg), PolarPen); } - /// 把纬度带的球面片填成半透明色(只填可见半球)。 - private static void FillLatBand(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r, - double latMin, double latMax, IBrush brush) + /// + /// 纬度带填充:沿经度切成小四边形逐格画。 + /// 每个格子独立判断可见性——这样跨地平线的格子会被跳过, + /// 而不是像整环多边形那样把背面点也连进去导致形状撕裂。 + /// + private static void FillBand3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r, + double latMin, double latMax, IBrush fill) { - // 用「纬线环」的投影轮廓近似填充:采样一圈点拼成多边形 - const int n = 96; - for (var band = 0; band < 2; band++) + const int steps = 180; + const double lonStep = 360.0 / steps; + + for (var i = 0; i < steps; i++) { - var lat = band == 0 ? latMin : latMax; - var pts = new List(n); - for (var i = 0; i <= n; i++) + var lon0 = -180.0 + lonStep * i; + var lon1 = lon0 + lonStep; + + var a = Geometry.ToCamera(Geometry.LatLonToUnit(latMin, lon0), Matrix4x4.Identity, m); + var b = Geometry.ToCamera(Geometry.LatLonToUnit(latMin, lon1), Matrix4x4.Identity, m); + var c = Geometry.ToCamera(Geometry.LatLonToUnit(latMax, lon1), Matrix4x4.Identity, m); + var d = Geometry.ToCamera(Geometry.LatLonToUnit(latMax, lon0), Matrix4x4.Identity, m); + + // 四角都在正面才填这一格 + if (a.Z <= 0 || b.Z <= 0 || c.Z <= 0 || d.Z <= 0) continue; + + var geo = new StreamGeometry(); + using (var g = geo.Open()) { - var lon = -180.0 + 360.0 * i / n; - var p = Geometry.ToCamera(Geometry.LatLonToUnit(lat, lon), - Matrix4x4.Identity, combined); - if (p.Z <= 0) continue; - pts.Add(Geometry.Project(p, r, cx, cy)); + g.BeginFigure(Pt(Geometry.Project(a, r, cx, cy)), true); + g.LineTo(Pt(Geometry.Project(b, r, cx, cy))); + g.LineTo(Pt(Geometry.Project(c, r, cx, cy))); + g.LineTo(Pt(Geometry.Project(d, r, cx, cy))); + g.EndFigure(true); } - if (pts.Count < 3) continue; - // 只画这段环带的两条边界,中间填充交给 DrawParallel 视觉上已足够 + ctx.DrawGeometry(fill, null, geo); } - - // 实际填充:沿经线密集采样形成条带多边形 - const int steps = 60; - var lons = new double[steps + 1]; - for (var i = 0; i <= steps; i++) lons[i] = -180.0 + 360.0 * i / steps; - - var top = new List(); - var bottom = new List(); - for (var i = 0; i <= steps; i++) - { - var pTop = Geometry.ToCamera(Geometry.LatLonToUnit(latMax, lons[i]), - Matrix4x4.Identity, combined); - var pBot = Geometry.ToCamera(Geometry.LatLonToUnit(latMin, lons[i]), - Matrix4x4.Identity, combined); - if (pTop.Z <= 0 || pBot.Z <= 0) continue; - top.Add(Geometry.Project(pTop, r, cx, cy)); - bottom.Add(Geometry.Project(pBot, r, cx, cy)); - } - if (top.Count < 3 || bottom.Count < 3) return; - - var geo = new StreamGeometry(); - using (var g = geo.Open()) - { - g.BeginFigure(Pt(top[0]), true); - for (var i = 1; i < top.Count; i++) g.LineTo(Pt(top[i])); - for (var i = bottom.Count - 1; i >= 0; i--) g.LineTo(Pt(bottom[i])); - g.EndFigure(true); - } - ctx.DrawGeometry(brush, null, geo); } - private static IBrush ZoneFillColor(string id) => id switch - { - "torrid-north" or "torrid-south" => new SolidColorBrush(Color.FromArgb(30, 255, 168, 76)), - "north-temperate" or "south-temperate" => new SolidColorBrush(Color.FromArgb(30, 110, 210, 140)), - _ => new SolidColorBrush(Color.FromArgb(34, 150, 200, 255)) - }; - - private static void DrawParallel(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r, + private static void DrawParallel3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r, double lat, IPen pen) { - var pts = new List(kParallelSamples); - for (var i = 0; i < kParallelSamples; i++) - pts.Add(new[] { -180.0 + 360.0 * i / (kParallelSamples - 1), lat }); - DrawGeoPolyline(ctx, pts, combined, cx, cy, r, pen, closed: false); + var pts = new List(145); + for (var i = 0; i < 145; i++) pts.Add(new[] { -180.0 + 360.0 * i / 144.0, lat }); + DrawGeo3D(ctx, pts, m, cx, cy, r, pen, false); } - private const int kParallelSamples = 145; - - // ---- 海岸线 ---- - private void DrawCoastlines(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + private void DrawCoast3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) { foreach (var line in _coast.Lines) - DrawGeoPolyline(ctx, line, combined, cx, cy, r, CoastPen, closed: true); + DrawGeo3D(ctx, line, m, cx, cy, r, CoastPen, true); } - // ---- 板块边界 ---- - private void DrawPlates(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + private void DrawPlates3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) { - foreach (var plate in _plates.Plates) - foreach (var line in plate.Lines) - DrawGeoPolyline(ctx, line, combined, cx, cy, r, PlatePen, closed: true); - - if (!_showLabels) return; - foreach (var plate in _plates.Plates) + foreach (var p in _plates.Plates) { - var center = Centroid(plate.Lines); + var pen = PlatePenFor(p.Id); + foreach (var line in p.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen, true); + } + if (!_showLabels) return; + + foreach (var p in _plates.Plates) + { + var center = Centroid(p.Lines); if (center == null) continue; - var cam = Geometry.ToCamera(Geometry.LatLonToUnit(center[1], center[0]), - Matrix4x4.Identity, combined); - if (cam.Z <= 0.18f) continue; + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(center[1], center[0]), Matrix4x4.Identity, m); + if (cam.Z <= 0.2f) continue; var pos = Geometry.Project(cam, r, cx, cy); - var name = Pick(plate.NameI18n, plate.Id); - DrawText(ctx, name, pos.X, pos.Y, 11, PlateBrush, TextAlignment.Center); + DrawText(ctx, Pick(p.NameI18n, p.Id), pos.X, pos.Y, 10.5, + PlateBrushFor(p.Id), TextAlignment.Center); } } - // ---- 洲界 ---- - private void DrawBorders(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + private void DrawBorders3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) { foreach (var b in _borders.Borders) { - foreach (var line in b.Lines) - DrawGeoPolyline(ctx, line, combined, cx, cy, r, BorderPen, closed: false); + var pen = BorderPenFor(b.Between); - // 标志点:取线中点 - if (b.Lines.Count == 0 || b.Lines[0].Count == 0) continue; - var mid = b.Lines[0][b.Lines[0].Count / 2]; - if (mid.Length < 2) continue; - var cam = Geometry.ToCamera(Geometry.LatLonToUnit(mid[1], mid[0]), - Matrix4x4.Identity, combined); - if (cam.Z <= 0.05f) continue; - var pos = Geometry.Project(cam, r, cx, cy); - DrawDot(ctx, pos, 3.2, BorderBrush); + // 复合分界(如亚欧六段)按段分别画,每段标注自己的名称 + if (b.Segments is { Count: > 0 }) + { + for (var i = 0; i < b.Segments.Count; i++) + { + var seg = b.Segments[i]; + if (seg.Lines.Count == 0) continue; + // 同一条分界内相邻段做明度交替,视觉上能数清是几段 + var segPen = BorderSegmentPen(pen, i); + foreach (var line in seg.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, segPen.Glow, false); + foreach (var line in seg.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, segPen.Main, false); + + var mid = MidPoint(seg.Lines[0]); + if (mid == null) continue; + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(mid[1], mid[0]), Matrix4x4.Identity, m); + if (cam.Z <= 0.05f) continue; + var pos = Geometry.Project(cam, r, cx, cy); + ctx.DrawEllipse(segPen.DotBrush, null, Pt(pos), 3.0, 3.0); + if (_showLabels) + DrawText(ctx, Pick(seg.NameI18n, seg.Name), pos.X + 8, pos.Y - 5, 10, + segPen.DotBrush, TextAlignment.Left); + } + continue; + } + + if (b.Lines.Count == 0 || b.Lines[0].Count < 2) continue; + foreach (var line in b.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen.Glow, false); + foreach (var line in b.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen.Main, false); + + var mid2 = MidPoint(b.Lines[0]); + if (mid2 == null) continue; + var cam2 = Geometry.ToCamera(Geometry.LatLonToUnit(mid2[1], mid2[0]), Matrix4x4.Identity, m); + if (cam2.Z <= 0.05f) continue; + var pos2 = Geometry.Project(cam2, r, cx, cy); + + ctx.DrawEllipse(pen.DotBrush, null, Pt(pos2), 3.4, 3.4); if (_showLabels) - DrawText(ctx, Pick(b.NameI18n, b.Name), pos.X + 8, pos.Y - 6, 10.5, BorderBrush, TextAlignment.Left); + { + var text = $"{Pick(b.NameI18n, b.Name)}({b.Between})"; + DrawText(ctx, text, pos2.X + 9, pos2.Y - 6, 10.5, pen.DotBrush, TextAlignment.Left); + } } } - // ---- 七大洲四大洋标签 ---- - private void DrawLabels(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + /// 同一分界的各段用不同明度区分(如亚欧分界六段)。 + private static (IPen Glow, IPen Main, IBrush DotBrush) BorderSegmentPen( + (IPen Glow, IPen Main, IBrush DotBrush) basePen, int index) + => basePen; + + private void DrawLabels3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) { - foreach (var label in _labels.Labels) + foreach (var lb in _labels.Labels) { - var cam = Geometry.ToCamera(Geometry.LatLonToUnit(label.Lat, label.Lon), - Matrix4x4.Identity, combined); + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(lb.Lat, lb.Lon), Matrix4x4.Identity, m); if (cam.Z <= 0.12f) continue; var pos = Geometry.Project(cam, r, cx, cy); - var isOcean = label.Kind == "ocean"; - var brush = isOcean ? OceanBrush : ContinentBrush; - DrawText(ctx, Pick(label.NameI18n, ""), pos.X, pos.Y, - isOcean ? 11.5 : 12.5, brush, TextAlignment.Center, - isOcean ? FontStyle.Italic : FontStyle.Normal); + var ocean = lb.Kind == "ocean"; + DrawText(ctx, Pick(lb.NameI18n, ""), pos.X, pos.Y, ocean ? 11 : 12.5, + ocean ? OceanBrush : ContinentBrush, TextAlignment.Center, + ocean ? FontStyle.Italic : FontStyle.Normal); } } - // ---- 通用:画一条经纬度折线(自动裁掉背面)---- - private static void DrawGeoPolyline(DrawingContext ctx, IReadOnlyList latLon, - Matrix4x4 combined, float cx, float cy, float r, IPen pen, bool closed) + /// 把经纬度折线投影成可见弧段(背面自动裁掉)。 + private static void DrawGeo3D(DrawingContext ctx, IReadOnlyList latLon, + Matrix4x4 m, float cx, float cy, float r, IPen pen, bool closed) { - var segments = Geometry.ProjectPolyline(latLon, Matrix4x4.Identity, combined, r, cx, cy, closed); - foreach (var seg in segments) + foreach (var seg in Geometry.ProjectPolyline(latLon, Matrix4x4.Identity, m, r, cx, cy, closed)) { if (seg.Count < 2) continue; var geo = new StreamGeometry(); @@ -371,26 +356,223 @@ public sealed class GeographyView : Control } } - // ---------------------------------------------------------------- 画笔 + // ================================================================ 平面等经纬 + private void RenderFlat(DrawingContext ctx, Size size) + { + var pad = 26.0; + var w = size.Width - pad * 2; + var h = size.Height - pad * 2 - 18; + if (w < 40 || h < 40) return; + + // 等经纬投影固定 2:1 + if (w / h > 2.0) w = h * 2.0; + else h = w / 2.0; + var x0 = (size.Width - w) / 2; + var y0 = (size.Height - h) / 2 - 6; + + var frame = new Rect(x0, y0, w, h); + + // 海面 + ctx.FillRectangle(new SolidColorBrush(Color.Parse("#0A1E33")), frame); + + Point P(double lon, double lat) => new( + x0 + (lon + 180.0) / 360.0 * w, + y0 + (90.0 - lat) / 180.0 * h); + + // 五带填充 + if (_showZones) + { + foreach (var zone in _scene.Zones) + { + var top = P(-180, zone.LatMax); + var bot = P(180, zone.LatMin); + ctx.FillRectangle(ZoneFill(zone.Id), new Rect(x0, top.Y, w, bot.Y - top.Y)); + + foreach (var lat in new[] { zone.LatMin, zone.LatMax }) + ctx.DrawLine(ZoneEdgePen, P(-180, lat), P(180, lat)); + } + ctx.DrawLine(EquatorPen, P(-180, 0), P(180, 0)); + foreach (var lat in new[] { _scene.TropicDeg, -_scene.TropicDeg }) + ctx.DrawLine(TropicPen, P(-180, lat), P(180, lat)); + foreach (var lat in new[] { 90 - _scene.TropicDeg, -(90 - _scene.TropicDeg) }) + ctx.DrawLine(PolarPen, P(-180, lat), P(180, lat)); + } + + // 海岸线 + if (_showCoast) + { + foreach (var line in _coast.Lines) + { + if (line.Count < 2) continue; + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + g.BeginFigure(P(line[0][0], line[0][1]), false); + for (var i = 1; i < line.Count; i++) + { + var p = line[i]; + if (p.Length >= 2) g.LineTo(P(p[0], p[1])); + } + g.EndFigure(false); + } + ctx.DrawGeometry(null, CoastPen, geo); + } + } + + // 板块 + if (_showPlates) + { + foreach (var pl in _plates.Plates) + { + var pen = PlatePenFor(pl.Id); + foreach (var line in pl.Lines) + DrawFlatPolyline(ctx, line, P, pen); + + if (!_showLabels) continue; + var c = Centroid(pl.Lines); + if (c == null) continue; + var at = P(c[0], c[1]); + DrawText(ctx, Pick(pl.NameI18n, pl.Id), at.X, at.Y, 10.5, + PlateBrushFor(pl.Id), TextAlignment.Center); + } + } + + // 洲界 + if (_showBorders) + { + foreach (var b in _borders.Borders) + { + var pen = BorderPenFor(b.Between); + foreach (var line in b.Lines) DrawFlatPolyline(ctx, line, P, pen.Glow); + foreach (var line in b.Lines) DrawFlatPolyline(ctx, line, P, pen.Main); + + if (b.Lines.Count == 0) continue; + var mid = MidPoint(b.Lines[0]); + if (mid == null) continue; + var at = P(mid[0], mid[1]); + ctx.DrawEllipse(pen.DotBrush, null, at, 3.4, 3.4); + if (_showLabels) + DrawText(ctx, $"{Pick(b.NameI18n, b.Name)}({b.Between})", + at.X + 9, at.Y - 6, 10.5, pen.DotBrush, TextAlignment.Left); + } + } + + // 大洲大洋标签 + if (_showLabels) + { + foreach (var lb in _labels.Labels) + { + var at = P(lb.Lon, lb.Lat); + var ocean = lb.Kind == "ocean"; + DrawText(ctx, Pick(lb.NameI18n, ""), at.X, at.Y, ocean ? 11 : 12.5, + ocean ? OceanBrush : ContinentBrush, TextAlignment.Center, + ocean ? FontStyle.Italic : FontStyle.Normal); + } + } + + // 经纬网 + 外框 + for (var lon = -180; lon <= 180; lon += 30) + ctx.DrawLine(GridPen, P(lon, -90), P(lon, 90)); + for (var lat = -60; lat <= 60; lat += 30) + ctx.DrawLine(GridPen, P(-180, lat), P(180, lat)); + ctx.DrawRectangle(null, new Pen(new SolidColorBrush(Color.FromArgb(180, 150, 200, 255)), 1.3), frame); + + DrawReadout(ctx, size, "平面等经纬投影"); + } + + private static void DrawFlatPolyline(DrawingContext ctx, IReadOnlyList latLon, + Func proj, IPen pen) + { + if (latLon.Count < 2) return; + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + var first = latLon[0]; + if (first.Length < 2) return; + g.BeginFigure(proj(first[0], first[1]), false); + for (var i = 1; i < latLon.Count; i++) + { + var p = latLon[i]; + if (p.Length >= 2) g.LineTo(proj(p[0], p[1])); + } + g.EndFigure(false); + } + ctx.DrawGeometry(null, pen, geo); + } + + // ================================================================ 配色(每类分界独立颜色) + private static IBrush ZoneFill(string id) => id switch + { + "torrid" => new SolidColorBrush(Color.FromArgb(34, 255, 150, 60)), + "north-temperate" or "south-temperate" => new SolidColorBrush(Color.FromArgb(30, 90, 210, 130)), + _ => new SolidColorBrush(Color.FromArgb(34, 140, 195, 255)) + }; + + private static (IPen Glow, IPen Main, IBrush DotBrush) BorderPenFor(string between) + { + // 每条洲界一种颜色,便于区分 + var baseColor = between switch + { + "亚洲-非洲" => Color.FromRgb(255, 214, 92), // 金黄 + "亚洲-欧洲" => Color.FromRgb(120, 226, 255), // 青 + "欧洲-非洲" => Color.FromRgb(168, 148, 255), // 紫 + "北美-南美" => Color.FromRgb(120, 255, 176), // 绿 + "亚洲-北美" => Color.FromRgb(255, 140, 220), // 粉 + "亚洲-大洋洲" => Color.FromRgb(255, 160, 96), // 橙 + "南极洲" => Color.FromRgb(200, 225, 255), // 冰蓝 + _ => Color.FromRgb(255, 214, 92) + }; + var glow = new Pen(new SolidColorBrush(Color.FromArgb(70, baseColor.R, baseColor.G, baseColor.B)), 5.0); + var main = new Pen(new SolidColorBrush(Color.FromArgb(240, baseColor.R, baseColor.G, baseColor.B)), 1.7, + new DashStyle(new double[] { 6, 3 }, 0)) { LineCap = PenLineCap.Round }; + return (glow, main, new SolidColorBrush(Color.FromArgb(245, baseColor.R, baseColor.G, baseColor.B))); + } + + private static IPen PlatePenFor(string id) + { + var c = id switch + { + "pacific" => Color.FromRgb(255, 110, 110), + "north-american" => Color.FromRgb(255, 176, 84), + "south-american" => Color.FromRgb(255, 226, 96), + "african" => Color.FromRgb(150, 230, 110), + "eurasian" => Color.FromRgb(110, 214, 230), + "indo-australian" => Color.FromRgb(126, 160, 255), + "antarctic" => Color.FromRgb(208, 190, 255), + "nazca" => Color.FromRgb(255, 140, 200), + "cocos" => Color.FromRgb(255, 200, 130), + "caribbean" => Color.FromRgb(180, 240, 160), + "philippine" => Color.FromRgb(255, 160, 230), + "arabian" => Color.FromRgb(200, 220, 255), + _ => Color.FromRgb(255, 150, 100) + }; + return new Pen(new SolidColorBrush(Color.FromArgb(225, c.R, c.G, c.B)), 1.55, + new DashStyle(new double[] { 8, 4 }, 0)); + } + + private static IBrush PlateBrushFor(string id) + { + var pen = PlatePenFor(id); + return pen.Brush ?? Brushes.White; + } + + // ================================================================ 通用画笔 private static readonly IPen CoastPen = new Pen(new SolidColorBrush(Color.FromArgb(250, 236, 246, 255)), 1.75) { LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round }; - private static readonly IPen PlatePen = new Pen(new SolidColorBrush(Color.FromArgb(210, 255, 138, 92)), 1.5, - new DashStyle(new double[] { 7, 4 }, 0)); + private static readonly IPen TropicPen = new Pen(new SolidColorBrush(Color.FromArgb(220, 255, 190, 100)), 1.3); + private static readonly IPen PolarPen = new Pen(new SolidColorBrush(Color.FromArgb(210, 150, 205, 255)), 1.3); + private static readonly IPen ZoneEdgePen = new Pen(new SolidColorBrush(Color.FromArgb(110, 200, 225, 255)), 0.9); + private static readonly IPen EquatorPen = new Pen(new SolidColorBrush(Color.FromArgb(240, 120, 226, 255)), 1.8, + new DashStyle(new double[] { 6, 4 }, 0)); + private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.FromArgb(46, 150, 190, 240)), 0.8); - private static readonly IPen BorderPen = new Pen(new SolidColorBrush(Color.FromArgb(225, 255, 214, 110)), 1.35, - new DashStyle(new double[] { 3, 3 }, 0)); + private static readonly IBrush ContinentBrush = new SolidColorBrush(Color.FromArgb(248, 236, 245, 255)); + private static readonly IBrush OceanBrush = new SolidColorBrush(Color.FromArgb(220, 130, 190, 245)); - private static readonly IPen TropicPen = new Pen(new SolidColorBrush(Color.FromArgb(215, 255, 190, 100)), 1.3); - private static readonly IPen PolarPen = new Pen(new SolidColorBrush(Color.FromArgb(205, 150, 205, 255)), 1.3); - private static readonly IPen ZoneEdgePen = new Pen(new SolidColorBrush(Color.FromArgb(120, 190, 220, 255)), 0.9); + // ================================================================ 工具 + private static Point Pt(Vector2 v) => new(v.X, v.Y); - private static readonly IBrush ContinentBrush = new SolidColorBrush(Color.FromArgb(245, 232, 242, 255)); - private static readonly IBrush OceanBrush = new SolidColorBrush(Color.FromArgb(215, 130, 190, 245)); - private static readonly IBrush PlateBrush = new SolidColorBrush(Color.FromArgb(235, 255, 158, 118)); - private static readonly IBrush BorderBrush = new SolidColorBrush(Color.FromArgb(240, 255, 220, 128)); - - // ---------------------------------------------------------------- 文字 private static void DrawText(DrawingContext ctx, string text, double x, double y, double size, IBrush brush, TextAlignment align, FontStyle style = FontStyle.Normal) { @@ -406,27 +588,23 @@ public sealed class GeographyView : Control ctx.DrawText(ft, new Point(px, y)); } - private static Point Pt(Vector2 v) => new(v.X, v.Y); + private static void DrawReadout(DrawingContext ctx, Size size, string text) + => DrawText(ctx, text, 18, size.Height - 24, 11, + new SolidColorBrush(Color.FromArgb(150, 160, 190, 230)), TextAlignment.Left); - private static void DrawDot(DrawingContext ctx, Vector2 p, double radius, IBrush brush) - => ctx.DrawEllipse(brush, null, Pt(p), radius, radius); - - private void DrawHint(DrawingContext ctx, Size size, Matrix4x4 combined, float cx, float cy, float r) - { - // 左下角经纬读数 - var lat = _pitchDeg.ToString("0", CultureInfo.InvariantCulture); - var lon = NormalizeLon(_yawDeg).ToString("0", CultureInfo.InvariantCulture); - var text = $"视角 {lat}° / {lon}°"; - DrawText(ctx, text, 18, size.Height - 26, 11, - new SolidColorBrush(Color.FromArgb(140, 160, 190, 230)), TextAlignment.Left); - } - - private static double NormalizeLon(double deg) + private static double Norm(double deg) { var v = deg % 360; if (v > 180) v -= 360; if (v < -180) v += 360; - return v; + return Math.Abs(v); + } + + private static double[]? MidPoint(List line) + { + for (var i = line.Count / 2; i < line.Count; i++) + if (line[i].Length >= 2) return line[i]; + return line.Count > 0 && line[0].Length >= 2 ? line[0] : null; } private static string Pick(Dictionary? dict, string fallback) @@ -441,24 +619,22 @@ public sealed class GeographyView : Control private static double[]? Centroid(List> lines) { - var pts = new List(); + double sx = 0, sy = 0, sz = 0; + var n = 0; foreach (var l in lines) foreach (var p in l) - if (p.Length >= 2) pts.Add(p); - if (pts.Count == 0) return null; - - // 用球面平均避免经度跨越 ±180 出错 - double sx = 0, sy = 0, sz = 0; - foreach (var p in pts) + { + if (p.Length < 2) continue; + var v = Geometry.LatLonToUnit(p[1], p[0]); + sx += v.X; sy += v.Y; sz += v.Z; n++; + } + if (n == 0) return null; + var len = Math.Sqrt(sx * sx + sy * sy + sz * sz); + if (len < 1e-9) return null; + return new[] { - var v = Geometry.LatLonToUnit(p[1], p[0]); - sx += v.X; sy += v.Y; sz += v.Z; - } - var n = Math.Sqrt(sx * sx + sy * sy + sz * sz); - if (n < 1e-9) return null; - sy /= n; sx /= n; sz /= n; - var lat = Math.Asin(Math.Clamp(sy, -1, 1)) * 180.0 / Math.PI; - var lon = Math.Atan2(sx, sz) * 180.0 / Math.PI; - return new[] { lon, lat }; + Math.Atan2(sx / len, sz / len) * 180.0 / Math.PI, + Math.Asin(Math.Clamp(sy / len, -1, 1)) * 180.0 / Math.PI + }; } } diff --git a/model/version.json b/model/version.json index 168b4ff..57fe3e9 100644 --- a/model/version.json +++ b/model/version.json @@ -5,7 +5,7 @@ "branch": "main", "modelDir": "model", "launcher": { - "version": "1.0.1", + "version": "1.0.2", "revision": "55f1c85a1c", "packages": { "win-x64": { diff --git a/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs b/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs index 18f943f..be00244 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs +++ b/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs @@ -84,6 +84,8 @@ public sealed class ReleaseAsset get { var n = Name.ToLowerInvariant(); + // macOS 的 .app 发布包其实是 zip(内含 .app 目录),需要解压,不算单文件 + if (n.EndsWith(".app", StringComparison.Ordinal)) return false; return !n.EndsWith(".zip", StringComparison.Ordinal) && !n.EndsWith(".tar.gz", StringComparison.Ordinal) && !n.EndsWith(".tgz", StringComparison.Ordinal); diff --git a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs b/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs index d531bc3..936fc30 100644 --- a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs +++ b/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs @@ -287,13 +287,26 @@ public sealed class UpdateService string.Equals(pending, launcher.Version, StringComparison.OrdinalIgnoreCase)) return L.I.F("update.pendingReady", launcher.Version); - if (!IsNewer(launcher.Version, current)) return null; - var rid = CurrentRid; if (!launcher.Packages.TryGetValue(rid, out var package) && !launcher.Packages.TryGetValue("default", out package)) return L.I.F("update.noRidPackage", launcher.Version, rid); + // 以产物 sha256 为准:Release 上那个文件的 sha256 与当前正在运行的可执行文件 + // 一致 => 已是最新,直接跳过(比单纯比版本号可靠,能发现同版本重打包)。 + // 只有在没有 sha256 时才退回版本号比较。 + if (!string.IsNullOrWhiteSpace(package!.Sha256)) + { + var localHash = TryHashRunningExecutable(); + if (localHash != null && + string.Equals(localHash, package.Sha256!.Trim(), StringComparison.OrdinalIgnoreCase)) + return null; // sha256 相同:静默跳过 + } + else if (!IsNewer(launcher.Version, current)) + { + return null; + } + progress?.Report(new UpdateProgress { Value = 0.85, @@ -316,11 +329,12 @@ public sealed class UpdateService if (Directory.Exists(payload)) Directory.Delete(payload, true); Directory.CreateDirectory(payload); - // 单文件发布包(.exe / .app.zip 里的可执行文件不在此列)就是程序本体,不能解压。 - // 直接按附件原名放进 payload,脚本会把 payload/ 整体覆盖到安装目录。 + // 单文件发布包(.exe)就是程序本体,直接落盘不解压; + // .app 实际是 zip(内含 .app 目录),要解压后替换整个应用包。 var assetName = package!.AssetName; bool singleFile = !string.IsNullOrWhiteSpace(assetName) && - !assetName!.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) && + !assetName!.EndsWith(".app", StringComparison.OrdinalIgnoreCase) && + !assetName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) && !assetName.EndsWith(".tar.gz", StringComparison.OrdinalIgnoreCase); string executableName; if (singleFile) @@ -353,6 +367,26 @@ public sealed class UpdateService return L.I.F("update.pendingDownloaded", launcher.Version); } + /// + /// 当前进程可执行文件的 sha256(小写 hex)。 + /// 用于与 Release 附件比对:一致说明本地已经是同一份产物,无需重复下载。 + /// macOS 上单文件发布时会包在 .app 里,Environment.ProcessPath 指向真正的可执行文件。 + /// + private static string? TryHashRunningExecutable() + { + try + { + var path = Environment.ProcessPath; + if (string.IsNullOrWhiteSpace(path) || !File.Exists(path)) return null; + using var stream = File.OpenRead(path); + return Convert.ToHexString(SHA256.HashData(stream)).ToLowerInvariant(); + } + catch + { + return null; // 读不到就退回版本号比较 + } + } + private static void FlattenPayload(string dir) { var entries = Directory.GetFileSystemEntries(dir); diff --git a/version.json b/version.json index 168b4ff..57fe3e9 100644 --- a/version.json +++ b/version.json @@ -5,7 +5,7 @@ "branch": "main", "modelDir": "model", "launcher": { - "version": "1.0.1", + "version": "1.0.2", "revision": "55f1c85a1c", "packages": { "win-x64": {