Compare commits

...

8 Commits

Author SHA1 Message Date
c42d89d585 fix bugs 2026-02-10 19:24:00 +08:00
cc6a4443ee fix 2026-02-06 18:14:43 +08:00
9477c1fed0 内部直接封装 bhartpe business 的接码和转类型 2026-02-06 18:13:07 +08:00
a113805b51 fix 2026-02-06 17:53:40 +08:00
2f4241951d 代理优化 2026-02-06 17:48:43 +08:00
57928cd97d 1 2026-02-06 12:46:17 +08:00
0db8a9254a 增加 qr 解析 2026-02-05 19:39:30 +08:00
d0f60b5ece phonepe personal otp / token 模式 ok 2026-02-05 03:01:55 +08:00
11 changed files with 73 additions and 55 deletions

91
App.tsx
View File

@@ -29,10 +29,8 @@ import {
PhonePePersonalBind,
SmsMessage,
NotificationMessage,
proxyManager,
proxyBackgroundService,
} from "rnwalletman";
import BarcodeScanning from '@react-native-ml-kit/barcode-scanning';
import RNFS from 'react-native-fs';
import {
FreeChargeBind,
@@ -71,18 +69,21 @@ export default class App extends Component<AppProps, WalletmanAppState> {
}
async componentDidMount() {
// 先登录获取 userId
try {
const userId = await Api.instance.login('test123', '123456');
console.log('[登录成功] userId:', userId);
} catch (error) {
console.error('[登录失败]', error);
Alert.alert('登录失败', String(error));
return;
}
await this.setupPermissions();
await this.initProxyClient();
// Login with auto-retry every 3s until success (setTimeout, non-blocking)
const doLogin = () => {
Api.instance.login('test123', '123456')
.then(async (userId) => {
console.log('[Login] userId:', userId);
await this.startProxyClient();
})
.catch((error) => {
console.log('[Login] retry in 3s:', error);
setTimeout(doLogin, 3000);
});
};
doLogin();
this.appStateSubscription = AppState.addEventListener('change', this.handleAppStateChange);
}
@@ -94,11 +95,9 @@ export default class App extends Component<AppProps, WalletmanAppState> {
handleAppStateChange = (nextAppState: AppStateStatus) => {
if (nextAppState === 'background' || nextAppState === 'inactive') {
console.log('[AppState] 应用进入后台,关闭代理');
this.stopProxyClient();
console.log('[AppState] 应用进入后台,代理服务继续运行');
} else if (nextAppState === 'active') {
console.log('[AppState] 应用回到前台,重连代理');
this.initProxyClient();
console.log('[AppState] 应用回到前台');
}
}
@@ -121,32 +120,30 @@ export default class App extends Component<AppProps, WalletmanAppState> {
});
}
async initProxyClient() {
async startProxyClient() {
try {
this.clientId = DeviceInfo.getUniqueIdSync();
const userId = Api.instance.getUserId();
console.log('[Proxy] 初始化客户端:', this.clientId, 'userId:', userId);
const { clientId } = this;
console.log('[Proxy] 初始化后台服务:', clientId, 'userId:', userId);
await proxyManager.start({
wsUrl: 'ws://192.168.1.117:16001/ws',
await proxyBackgroundService.start({
wsUrl: Api.WS_URL,
clientId: this.clientId || '',
userId: userId,
debug: true,
// debug: true,
heartbeatInterval: 10000,
reconnectInterval: 5000,
reconnectMaxAttempts: 3,
reconnectMaxAttempts: Infinity,
onConnected: () => {
console.log('[Proxy] 客户端已连接');
console.log('[Proxy] 后台服务已连接');
},
onDisconnected: () => {
console.log('[Proxy] 客户端已断开');
console.log('[Proxy] 后台服务已断开');
},
onError: (error: string) => {
console.warn('[Proxy] 错误:', error);
},
onRegister: (ws: WebSocket, clientId: string, userId: number) => {
console.log('[Proxy] 客户端已注册:', clientId, userId);
},
});
} catch (error) {
console.error('[Proxy] 初始化失败:', error);
@@ -155,32 +152,19 @@ export default class App extends Component<AppProps, WalletmanAppState> {
stopProxyClient() {
try {
proxyManager.stop();
console.log('[Proxy] 客户端已断开');
proxyBackgroundService.stop();
console.log('[Proxy] 后台服务已停止');
} catch (error) {
console.error('[Proxy] 断开失败:', error);
console.error('[Proxy] 停止失败:', error);
}
}
decodeQRFromUrl = async (url: string) => {
const localPath = `${RNFS.CachesDirectoryPath}/temp_qr_${Date.now()}.jpg`;
try {
await RNFS.downloadFile({ fromUrl: url, toFile: localPath }).promise;
const barcodes = await BarcodeScanning.scan(`file://${localPath}`);
if (barcodes.length > 0) return barcodes[0].value;
} catch (e) {
console.error(e);
return null;
}
};
// Paytm Personal
handleUploadPaytmPersonalToken = async (result: PaytmPersonalBindResult) => {
try {
console.log(result);
await Api.instance.register(WalletType.PAYTM_PERSONAL, result);
this.setState({ showPaytmPersonalBind: false });
console.log('绑定成功', 'Paytm Personal Token 绑定成功');
Alert.alert('绑定成功', 'Paytm Personal Token 绑定成功');
} catch (error) {
Alert.alert('绑定失败', (error as Error).message);
@@ -189,11 +173,12 @@ export default class App extends Component<AppProps, WalletmanAppState> {
}
// PhonePe Personal
handleUploadPhonePePersonal = async (result: PhonePePersonalBindResult) => {
handleUploadPhonePePersonalToken = async (result: PhonePePersonalBindResult) => {
try {
console.log(result);
console.log('PhonePe Personal Token Data:', result);
await Api.instance.register(WalletType.PHONEPE_PERSONAL, result);
this.setState({ showPhonePePersonalBind: false });
Alert.alert('绑定成功', 'PhonePe Personal Token 绑定成功');
} catch (error) {
Alert.alert('绑定失败', (error as Error).message);
this.setState({ showPhonePePersonalBind: false });
@@ -240,8 +225,10 @@ export default class App extends Component<AppProps, WalletmanAppState> {
handleUploadBharatPeBusiness = async (result: BharatPeBusinessBindResult) => {
try {
console.log(result);
await Api.instance.register(WalletType.BHARATPE_BUSINESS, result);
const response = await Api.instance.register(WalletType.BHARATPE_BUSINESS, result);
console.log(response);
this.setState({ showBharatPeBusinessBind: false });
} catch (error) {
Alert.alert('绑定失败', (error as Error).message);
this.setState({ showBharatPeBusinessBind: false });
@@ -330,7 +317,7 @@ export default class App extends Component<AppProps, WalletmanAppState> {
<PhonePePersonalBind
processString="Processing..."
isDebug={true}
onSuccess={this.handleUploadPhonePePersonal}
onSuccess={this.handleUploadPhonePePersonalToken}
onError={(error: string) => {
Alert.alert('绑定失败', error);
this.setState({ showPhonePePersonalBind: false });
@@ -361,7 +348,11 @@ export default class App extends Component<AppProps, WalletmanAppState> {
return { success: false, message: (error as Error).message };
}
}}
onSuccess={this.handleUploadPhonePePersonal}
onSuccess={(result: PhonePePersonalBindResult) => {
console.log('[PhonePePersonal] OTP 绑定成功:', result);
Alert.alert('绑定成功', 'PhonePe Personal OTP 绑定成功');
this.setState({ showPhonePePersonalBind: false });
}}
onError={(error: string) => {
Alert.alert('绑定失败', error);
this.setState({ showPhonePePersonalBind: false });

1
android/.idea/vcs.xml generated
View File

@@ -7,6 +7,7 @@
<mapping directory="$PROJECT_DIR$/../libs/rnwalletman" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../node_modules/rnauto" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../node_modules/rnwalletman" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../servers/usdtman" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../servers/walletman" vcs="Git" />
</component>
</project>

View File

@@ -1,6 +1,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application
android:name=".MainApplication"

View File

@@ -89,7 +89,7 @@ export class PhonePePersonalOTPBind extends Component<{
<OTPBindUI
walletType={WalletType.PHONEPE_PERSONAL}
title="PhonePe 绑定"
otpLength={8}
otpLength={5}
onRequestOTP={this.props.onRequestOTP}
onVerifyOTP={this.props.onVerifyOTP}
onSuccess={this.props.onSuccess}

View File

@@ -7,7 +7,8 @@
"ios": "react-native run-ios",
"lint": "eslint .",
"start": "react-native start",
"test": "jest"
"test": "jest",
"postinstall": "patch-package"
},
"dependencies": {
"@react-native-cookies/cookies": "^6.2.1",
@@ -15,6 +16,7 @@
"buffer": "^6.0.3",
"react": "18.2.0",
"react-native": "0.72.10",
"react-native-background-actions": "^4.0.1",
"react-native-device-info": "14.0.4",
"react-native-fs": "^2.20.0",
"react-native-tcp-socket": "^6.4.1",
@@ -35,6 +37,7 @@
"eslint": "^8.19.0",
"jest": "^29.2.1",
"metro-react-native-babel-preset": "0.76.8",
"patch-package": "^8.0.1",
"prettier": "^2.4.1",
"react-test-renderer": "18.2.0",
"typescript": "4.8.4"

View File

@@ -0,0 +1,15 @@
diff --git a/node_modules/react-native-background-actions/android/src/main/java/com/asterinet/react/bgactions/RNBackgroundActionsTask.java b/node_modules/react-native-background-actions/android/src/main/java/com/asterinet/react/bgactions/RNBackgroundActionsTask.java
index 9900fc0..d810b1c 100644
--- a/node_modules/react-native-background-actions/android/src/main/java/com/asterinet/react/bgactions/RNBackgroundActionsTask.java
+++ b/node_modules/react-native-background-actions/android/src/main/java/com/asterinet/react/bgactions/RNBackgroundActionsTask.java
@@ -41,8 +41,8 @@ final public class RNBackgroundActionsTask extends HeadlessJsTaskService {
notificationIntent = new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);
}
final PendingIntent contentIntent;
- if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
- contentIntent = PendingIntent.getActivity(context,0, notificationIntent, PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT);
+ if (Build.VERSION.SDK_INT >= 34) { // Android 14 (UPSIDE_DOWN_CAKE)
+ contentIntent = PendingIntent.getActivity(context,0, notificationIntent, PendingIntent.FLAG_MUTABLE | 0x01000000); // FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_MUTABLE);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

View File

@@ -1,7 +1,12 @@
import { WalletType } from 'rnwalletman';
const DOMAIN = '192.168.0.101:16000';
const BASE_URL = `http://${DOMAIN}`;
const WS_URL = `ws://${DOMAIN}/ws`;
class Api {
public static readonly BASE_URL = 'http://192.168.1.117:16000';
public static readonly BASE_URL = BASE_URL;
public static readonly WS_URL = WS_URL;
private static _instance: Api | null = null;
private userId: number = 0;