From f74b84c501241a37d3a869f826fde3dda216859a Mon Sep 17 00:00:00 2001 From: TQCasey <494294315@qq.com> Date: Mon, 16 Mar 2026 14:52:56 +0800 Subject: [PATCH] fix bugs --- .gitignore | 1 + App.tsx | 36 ++++++++++++++++++++++----------- android/keys/rnpay_release.jks | Bin 0 -> 2662 bytes servers/walletman | 2 +- types.ts | 1 - 5 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 android/keys/rnpay_release.jks diff --git a/.gitignore b/.gitignore index 1578c81..c43bfc5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ android/.gradle/8.0.1/checksums/sha1-checksums.bin android/.idea/caches ios/build ios/Pods +android/app/release diff --git a/App.tsx b/App.tsx index d7a83c2..3c87ab8 100644 --- a/App.tsx +++ b/App.tsx @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import { Alert, AppState, AppStateStatus, Modal, Switch, Text, TextInput, TouchableOpacity, View } from "react-native"; +import { Alert, AppState, AppStateStatus, Modal, Text, TextInput, TouchableOpacity, View } from "react-native"; import DeviceInfo from 'react-native-device-info'; import { PhonePeBusinessBind, @@ -65,7 +65,6 @@ export default class App extends Component { showServerSettings: false, settingsHost: '', settingsPort: '', - settingsHttps: true, }; this.deviceId = DeviceInfo.getUniqueIdSync(); @@ -640,24 +639,41 @@ export default class App extends Component { const colonIdx = domain.lastIndexOf(':'); const host = colonIdx > 0 ? domain.substring(0, colonIdx) : domain; const port = colonIdx > 0 ? domain.substring(colonIdx + 1) : ''; - this.setState({ showServerSettings: true, settingsHost: host, settingsPort: port, settingsHttps: getUseHttps() }); + this.setState({ showServerSettings: true, settingsHost: host, settingsPort: port }); }; saveDomain = async () => { - const { settingsHost, settingsPort, settingsHttps } = this.state; + const { settingsHost, settingsPort } = this.state; const domain = settingsPort ? `${settingsHost}:${settingsPort}` : settingsHost; - await saveServerDomain(domain, settingsHttps); + const useHttps = settingsPort === '443'; + await saveServerDomain(domain, useHttps); this.setState({ showServerSettings: false }); Alert.alert('已保存', '重启 App 后生效'); }; renderServerSettingsModal() { - const { showServerSettings, settingsHost, settingsPort, settingsHttps } = this.state; + const { showServerSettings, settingsHost, settingsPort } = this.state; + const presets = [ + { label: 'aa.pfgame.org', host: 'aa.pfgame.org', port: '443' }, + { label: 'game.ainavx.com:16000', host: 'game.ainavx.com', port: '16000' }, + { label: '192.168.1.117:16000', host: '192.168.1.117', port: '16000' }, + ]; return ( - 服务器设置 + 服务器设置 + + {presets.map(p => ( + this.setState({ settingsHost: p.host, settingsPort: p.port })} + style={{ paddingHorizontal: 10, paddingVertical: 5, borderRadius: 6, backgroundColor: settingsHost === p.host && settingsPort === p.port ? '#3498db' : '#f0f0f0' }} + > + {p.label} + + ))} + Host { /> Port this.setState({ settingsPort: t })} placeholder="16000" keyboardType="number-pad" /> - - 使用 HTTPS / WSS - this.setState({ settingsHttps: v })} /> - this.setState({ showServerSettings: false })} style={{ paddingHorizontal: 16, paddingVertical: 8, marginRight: 10 }}> 取消 diff --git a/android/keys/rnpay_release.jks b/android/keys/rnpay_release.jks new file mode 100644 index 0000000000000000000000000000000000000000..995836f2449ed8c4e74aba712e62e1a4e300db3d GIT binary patch literal 2662 zcma)8c{mh`7M~e27)Hh#vhTZbi6K#3+tAo6gN7`Z43j+}Ow1^2wozj*JJ}7{qwM>d z%8;@zm$)V5df$6r_j`Z6_s99pIltxn`TGunz;qh~q(cyxVDwN~q7m^M3y=YrOMsq$ z3D83X0eXNSKwAEbf>eMBkdiaF;H>iKng8R0F#$oj1jv;$Pz&Mq%K>3Q*dmbstT2Qe zm=n`Mk+QxqWlX*#3x}6&tuCpyErLK&a1c-!0i$R9_eBsC0ze4RLmi1mKvz02P!9v=!1k8scH*o!;5q zNO$x*?IWeU>vMs3Z^?Sa?Q?CUDL z;1NG29!7e?@p`k9WgREMc5pute$Re#IWyI@4aQgNa{pNV#URb4!P%C@`mr5@m+;u{ zG4sxwZ#oF~J1$7CI?Gs8h;(7g>u2WdOc=wQK2<5%7ki`EVNFR%;+2-b5AV>t>ek;k zs_m4*qEErEAHU>)Uv}VTF#HdPD+%5-hr=S8?^ht^g+~079pfjhj(Jg34XuYyc)+Q)0VX&F|>t|KN!Nv%-S2y>78jz5(;V^w zOP)Q7B-dNG#W14itPh474L2oyz~&u`Q6whFKuBuBHCW)XjC^Gb9Hll_m2iY3Zv!7u z-?C_HQ!<+R`IiHVIJwjfzx@Il}z*+6-UY>m@wtH~<+w7vNU^<_( zTv}l*M~LQUrf4Wx#gV~7>q?2sgDC~=e)CAm3;pjLj4m1eGduz8JNo5PveKhnoZjo=+Pr zIHG1IV|-Yb?2ol<4tqX%ddo0ziMq(ph~+lKMbRePsFz8)IPtAgx#{rL_l7txOT#js z`tLtm9Q*ri_lzB%VQY+ERR%xpGn?Vf(kYO%%3A_n?g0$B765(EJOXYKqy4Df%2wnk!1CyRtxsCVR-KO3HqYJP}h z!vCMpHg1_`;#r3BS_?h~HKoEnM-b?8J1^z7X#_=TjCsoKNNAHUOP9oCmNr@&-d)qh zU9|!RRj(;2KChHt=c@?z`fwyWJ{9orqOnV=Hs1d0pW@ZirhKcMJeR=z$DKcI z-6^)xmm_y{F7y|OrP=6zKtaM*Xovd*KWS&oQc|67?$+~Kt}OD0(o(MP{#k06I1ID2 zV6jPw(v9W{&zH61J%YiW-{cn@D&y;sEMmTK^ERh?oIk8);hC^|dK!bSN)4tpAt9`j z*L`Bzgwu#@1w@p|JU;nzEq`22rJBX3SvMgFXQF~}(?liN|D%pCdD5U1+HSQXzY0%$ zEb;?}L#0FzljP5F#9kjK*{gsIhr+6UCi=53HB6>7{;u*@sYo%EM)#m-j}+To&f2(F z9+Fm%pDio|qL?QATCYKwM=RsL*tEy9Z(|RSj`fa7eEjGv&?365xAb&EFmtZSfq}*m zrK!bN;L?I?dcZ1VqjQJX)RM>SF@|Qc0%^Q0)GZce=yPlo~RmL zB-{h^?Q}lR?EsYko->kvHV2E2V%SS}+v!}|e%o@{&tI3i#>VgH)6lC5hnUj^m$NhgYzQN7OY|Be&E-bGNlr=>HnJi=k{C;@>E0F^`ES3ZCOuvK%AZ zahsYtzh{J1YHI#=6nf5MEiLUWxpYJ;qR3Zaog6d4EA|J*%vr7KK7WC-{GnJl!};W7 zvsV?oh3n3?Z>UbgGS~1mCSu4h5QCvS9uw>v_g!RlXZpy;xO-md2&*njlk1~gtgAvb z3$so+H!YgJGxDWP=hOf@i0D+hgZ8>-75b>D>oGs?V0(lKWinNL32MS5r<|TWysr_cc=4F1zNrMp*`?!?eg!V z^E}sQe4kteeFv2pSp^zDfo_<0h2ol$+eV40u=fUGYCJ8XKuN=<&ZtW zlj6J+F*n}@-{_JY7*|XS+=z=c-%39%!0+6K8_}5-%cL)QqvocuIyOSP3#Sj|=L|Q7 zFG1~a`Ig<&oqIy)i_tglKR{eVC?i;Y{azp-1OOJ^r?I@wfGNvpk;K-Pb!k`mM1Yy> pxV811u9-*GA3I0EoR=J;_c~q+1{uqP0(@wpB4I-twf~BUzX75jyxIT& literal 0 HcmV?d00001 diff --git a/servers/walletman b/servers/walletman index cfd46bb..8b3e2b2 160000 --- a/servers/walletman +++ b/servers/walletman @@ -1 +1 @@ -Subproject commit cfd46bb59ce1bf39ecb4de9aca79a0919c8212d5 +Subproject commit 8b3e2b27852c1216fcce99d864e20db81caf8758 diff --git a/types.ts b/types.ts index 300b922..f1afe27 100644 --- a/types.ts +++ b/types.ts @@ -31,5 +31,4 @@ export interface WalletmanAppState { showServerSettings: boolean; settingsHost: string; settingsPort: string; - settingsHttps: boolean; }