react-native-beidou 1.0.7 → 1.1.1

package/android/src/main/java/com/{cmcc_rn_module → fxzs.rnbeidou}/BeiDouBluetoothModule.java

@@ -1,4 +1,4 @@
-package com.cmcc_rn_module;
+package com.fxzs.rnbeidou;
 
 import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
@@ -13,6 +13,9 @@ import android.os.Build;
 import android.util.Log;
 import android.location.Location;
 import android.location.LocationManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -31,7 +34,10 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import org.json.JSONException;
@@ -40,29 +46,15 @@ import java.util.Arrays;
 import java.util.Base64;
 import java.util.Map;
 import java.util.Objects;
-import java.util.List;
 import java.util.ArrayList;
-
-// 北斗AIDL服务相关导入
-import com.satnav.beidouservice.IBeidouMsgAidlInterface;
-import com.satnav.beidouservice.BDStatusResponse;
-import com.satnav.beidouservice.BDMsgEncryptResponse;
-import com.satnav.beidouservice.BDMsgDecryptResponse;
-import com.satnav.beidouservice.BDMsgEphemerisFileDLResponse;
-import android.content.ServiceConnection;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.os.IBinder;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableNativeArray;
+import java.util.List;
 
 public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     private ReactContext reactContext;
+    private LogManager logger;
 
-    // 北斗AIDL服务相关字段
-    private IBeidouMsgAidlInterface beidouService;
-    private boolean isBeidouServiceBound = false;
+    // 北斗AIDL服务辅助类
+    private final BeidouAidlHelper beidouAidlHelper;
 
     @NonNull
     @Override
@@ -73,10 +65,21 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     public BeiDouBluetoothModule(@Nullable ReactApplicationContext reactContext) {
         super(reactContext);
         this.reactContext = reactContext;
+        this.beidouAidlHelper = new BeidouAidlHelper(reactContext);
+
+        // 初始化日志管理器
+        this.logger = LogManager.getInstance();
+        // 默认配置：根据ApplicationInfo.FLAG_DEBUGGABLE判断是否为Debug模式
+        boolean isDebug = reactContext != null &&
+                (reactContext.getApplicationInfo().flags & android.content.pm.ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+        logger.initialize(reactContext, isDebug, true, null);
+
+        logger.i("BeiDouBluetoothModule", "BeiDouBluetoothModule initialized - Debug: " + isDebug);
+
         BluetoothSDK.getInstance(reactContext).setPushCallback(new BluetoothPushCallback() {
             @Override
             public void onDevicePush(String deviceNo, String data, int cmd) {
-                Log.d("BeiDouBluetoothModule","收到设备推送消息: "+data);
+                logger.d("BeiDouBluetoothModule", "收到设备推送消息: " + data);
                 // 处理接收到的数据
                 WritableMap writableMap = new WritableNativeMap();
                 writableMap.putInt("type", 0);
@@ -105,9 +108,9 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             long timeInterval = timestamp.longValue();
             boolean send = isSend != null ? isSend : false;
             getChatDBManager().insertMessage(content, phone, send, timeInterval);
-            Log.d("BeiDouBluetoothModule", String.format("插入消息成功 - 手机号: %s, 是否发送: %b", phone, send));
+            logger.d("BeiDouBluetoothModule", String.format("插入消息成功 - 手机号: %s, 是否发送: %b", phone, send));
         } catch (Exception e) {
-            Log.e("BeiDouBluetoothModule", "插入消息失败: " + e.getMessage());
+            logger.e("BeiDouBluetoothModule", "插入消息失败: " + e.getMessage(), e);
         }
     }
 
@@ -174,28 +177,28 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     public void connectToDeviceFromCloudDeviceNO(String deviceNO, Double a, Promise promise) {
         if (StringUtils.isEmpty(deviceNO)) {
             Log.e("BluetoothSDK", "connectToDeviceFromCloudDeviceNO: deviceNo isEmpty");
-            promise.resolve("fail");
+            promise.resolve("0");
             return;
         }
         BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
         BluetoothConnectionCallback connectionCallback = new BluetoothConnectionCallback() {
             @Override
             public void onConnected(String deviceNo) {
-                Log.d("BluetoothSDK", "蓝牙连接状态返回给 RN: ok");
-                promise.resolve("ok");
+                Log.d("BluetoothSDK", "蓝牙连接状态返回给 RN: 1");
+                promise.resolve("1");
             }
 
             @Override
             public void onConnectionFailed(String deviceNo, int errorCode, String errorMessage) {
-                Log.d("BluetoothSDK", "蓝牙连接状态返回给 RN: fail");
-                promise.resolve("fail");
+                Log.d("BluetoothSDK", "蓝牙连接状态返回给 RN: 0");
+                promise.resolve("0");
             }
 
             @Override
             public void onDisconnected(String deviceNo) {
                 // 连接过程中意外断开
-                Log.d("BluetoothSDK", "蓝牙连接状态返回给 RN: fail");
-                promise.resolve("fail");
+                Log.d("BluetoothSDK", "蓝牙连接状态返回给 RN: 0");
+                promise.resolve("0");
             }
 
             @Override
@@ -366,7 +369,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     // }
     @ReactMethod
     public void writeData(String randomString, String deviceNo, Integer command, Integer attrType,
-                          Callback writeCallback) {
+            Callback writeCallback) {
         BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
         Log.d("BluetoothSDK", "收到写入请求" + command + "   " + attrType + "   " + randomString);
         BluetoothDataCallback dataCallback = new BluetoothDataCallback() {
@@ -384,7 +387,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             @Override
             public void onDataReceived(String deviceNo, byte[] data, int dataType) {
                 // 处理接收到的数据
-//                byte[] cipher = Arrays.copyOfRange(data, 4, data.length);
+                // byte[] cipher = Arrays.copyOfRange(data, 4, data.length);
                 String message = Base64.getEncoder().encodeToString(data);
 
                 WritableMap writableMap = new WritableNativeMap();
@@ -413,7 +416,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void writeInfo(@Nullable String base64Payload, String deviceNO, Integer command, Integer opCode,
-                          Integer attrType, Boolean encrypted, Promise promise) {
+            Integer attrType, Boolean encrypted, Promise promise) {
         try {
             BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
 
@@ -438,7 +441,8 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             int attrTypeValue = attrType & 0xFFFF;
             boolean isEncrypted = encrypted != null ? encrypted : false;
 
-            Log.d("BluetoothSDK", String.format("writeInfo - deviceNO: %s, command: 0x%02X, opCode: 0x%02X, attrType: 0x%04X, encrypted: %b",
+            Log.d("BluetoothSDK", String.format(
+                    "writeInfo - deviceNO: %s, command: 0x%02X, opCode: 0x%02X, attrType: 0x%04X, encrypted: %b",
                     deviceNO, commandValue, opCodeValue, attrTypeValue, isEncrypted));
 
             // 设置数据回调
@@ -447,10 +451,10 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
                 public void onDataWriteSuccess(String deviceNo, byte[] data) {
                     Log.d("BluetoothSDK", "writeInfo写入成功");
                     // 返回成功结果
-//                    WritableMap resDict = new WritableNativeMap();
-//                    resDict.putInt("type", 1);
-//                    resDict.putString("data", "");
-//                    promise.resolve(resDict);
+                    // WritableMap resDict = new WritableNativeMap();
+                    // resDict.putInt("type", 1);
+                    // resDict.putString("data", "");
+                    // promise.resolve(resDict);
                 }
 
                 @Override
@@ -486,7 +490,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
 
             // 调用SDK写入数据
             String dataString = Base64.getEncoder().encodeToString(decodedData);
-            instance.writeData(dataString, deviceNO, commandValue, attrTypeValue,opCodeValue, isEncrypted);
+            instance.writeData(dataString, deviceNO, commandValue, attrTypeValue, opCodeValue, isEncrypted);
 
         } catch (Exception e) {
             Log.e("BluetoothSDK", "writeInfo异常: " + e.getMessage());
@@ -496,7 +500,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void writeValueInfo(String randomString, String deviceNo, Integer command, Integer attrType, Integer value,
-                               Callback writeCallback) {
+            Callback writeCallback) {
         // BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
         // Log.d(BluetoothSDK.TAG, "收到写入请求" + command +" "+attrType+" "+randomString);
         // Callback callback = args -> {
@@ -532,8 +536,6 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
         BluetoothSDK.getInstance(reactContext).disconnectDevice(deviceNo, disConnectCallback);
     }
 
-
-
     @ReactMethod
     public void fetchCurrentWifiName(Callback callback) {
         String wifiName = "未连接";
@@ -601,256 +603,242 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
         callback.invoke(wifiName);
     }
 
-    // ================== 北斗AIDL服务相关方法 ==================
+    /**
+     * 获取当前设备的SIM卡信息列表
+     */
+    @ReactMethod
+    public void getSimCardList(Promise promise) {
+        try {
+            if (reactContext == null) {
+                promise.reject("CONTEXT_NULL", "React上下文不可用");
+                return;
+            }
 
-    private final ServiceConnection beidouServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            beidouService = IBeidouMsgAidlInterface.Stub.asInterface(service);
-            isBeidouServiceBound = true;
-            Log.d("BeiDouService", "北斗服务连接成功");
-        }
+            boolean hasReadPhoneStatePermission = ContextCompat.checkSelfPermission(reactContext,
+                    Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED;
 
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            beidouService = null;
-            isBeidouServiceBound = false;
-            Log.d("BeiDouService", "北斗服务连接断开");
-        }
-    };
+            if (!hasReadPhoneStatePermission) {
+                promise.reject("PERMISSION_DENIED", "缺少READ_PHONE_STATE权限");
+                return;
+            }
 
-    private void bindBeidouService(String packageName, String actionName) {
-        if (!isBeidouServiceBound && reactContext != null) {
-            Intent intent = new Intent();
-            // 使用ComponentName方式，actionName作为className
-            intent.setComponent(new android.content.ComponentName(packageName, actionName));
-            try {
-                boolean result = reactContext.bindService(intent, beidouServiceConnection, Context.BIND_AUTO_CREATE);
-                Log.d("BeiDouService", "绑定北斗服务结果: " + result + ", 包名: " + packageName + ", 类名: " + actionName);
-            } catch (Exception e) {
-                Log.e("BeiDouService", "绑定北斗服务失败: " + e.getMessage());
+            boolean hasReadPhoneNumbersPermission = true;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                hasReadPhoneNumbersPermission = ContextCompat.checkSelfPermission(reactContext,
+                        Manifest.permission.READ_PHONE_NUMBERS) == PackageManager.PERMISSION_GRANTED;
             }
-        }
-    }
 
-    private void unbindBeidouService() {
-        if (isBeidouServiceBound && reactContext != null) {
-            try {
-                reactContext.unbindService(beidouServiceConnection);
-                isBeidouServiceBound = false;
-                Log.d("BeiDouService", "解绑北斗服务成功");
-            } catch (Exception e) {
-                Log.e("BeiDouService", "解绑北斗服务失败: " + e.getMessage());
+            WritableArray result = new WritableNativeArray();
+            Context context = reactContext;
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                SubscriptionManager subscriptionManager = (SubscriptionManager) context
+                        .getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+
+                if (subscriptionManager != null) {
+                    List<SubscriptionInfo> subscriptionInfoList;
+                    try {
+                        subscriptionInfoList = subscriptionManager.getActiveSubscriptionInfoList();
+                    } catch (SecurityException permissionException) {
+                        promise.reject("PERMISSION_DENIED", "访问SubscriptionManager失败: " + permissionException.getMessage(),
+                                permissionException);
+                        return;
+                    }
+
+                    if (subscriptionInfoList != null) {
+                        for (SubscriptionInfo info : subscriptionInfoList) {
+                            WritableMap map = new WritableNativeMap();
+                            CharSequence carrierName = info.getCarrierName();
+                            CharSequence displayName = info.getDisplayName();
+
+                            map.putInt("subscriptionId", info.getSubscriptionId());
+                            map.putInt("simSlotIndex", info.getSimSlotIndex());
+                            map.putString("carrierName", carrierName != null ? carrierName.toString() : null);
+                            map.putString("displayName", displayName != null ? displayName.toString() : null);
+                            map.putString("countryIso", info.getCountryIso());
+                            map.putInt("mcc", info.getMcc());
+                            map.putInt("mnc", info.getMnc());
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                                map.putBoolean("isEmbedded", info.isEmbedded());
+                                map.putBoolean("isOpportunistic", info.isOpportunistic());
+                            } else {
+                                map.putBoolean("isEmbedded", false);
+                                map.putBoolean("isOpportunistic", false);
+                            }
+
+                            if (hasReadPhoneNumbersPermission) {
+                                String phoneNumber;
+                                try {
+                                    phoneNumber = info.getNumber();
+                                } catch (SecurityException numberException) {
+                                    phoneNumber = null;
+                                }
+                                map.putString("number", phoneNumber);
+                            } else {
+                                map.putNull("number");
+                            }
+
+                            result.pushMap(map);
+                        }
+                    }
+                }
             }
-        }
-    }
 
-    // 将byte数组转换为WritableArray
-    private WritableArray byteArrayToWritableArray(byte[] byteArray) {
-        WritableArray array = new WritableNativeArray();
-        if (byteArray != null) {
-            for (byte b : byteArray) {
-                array.pushInt(b & 0xFF); // 将byte转换为无符号int
+            // 如果未获取到任何SIM卡信息，尝试使用TelephonyManager做兼容
+            if (result.size() == 0) {
+                TelephonyManager telephonyManager = (TelephonyManager) context
+                        .getSystemService(Context.TELEPHONY_SERVICE);
+
+                if (telephonyManager != null) {
+                    WritableMap map = new WritableNativeMap();
+                    map.putInt("subscriptionId", -1);
+                    map.putInt("simSlotIndex", 0);
+                    map.putString("carrierName", telephonyManager.getSimOperatorName());
+                    map.putString("displayName", telephonyManager.getSimOperatorName());
+                    map.putString("countryIso", telephonyManager.getSimCountryIso());
+
+                    String operator = telephonyManager.getSimOperator();
+                    if (operator != null && operator.length() >= 5) {
+                        try {
+                            int mcc = Integer.parseInt(operator.substring(0, 3));
+                            int mnc = Integer.parseInt(operator.substring(3));
+                            map.putInt("mcc", mcc);
+                            map.putInt("mnc", mnc);
+                        } catch (NumberFormatException ignored) {
+                            map.putInt("mcc", -1);
+                            map.putInt("mnc", -1);
+                        }
+                    } else {
+                        map.putInt("mcc", -1);
+                        map.putInt("mnc", -1);
+                    }
+
+                    map.putBoolean("isEmbedded", false);
+                    map.putBoolean("isOpportunistic", false);
+
+                    if (hasReadPhoneNumbersPermission) {
+                        String phoneNumber;
+                        try {
+                            phoneNumber = telephonyManager.getLine1Number();
+                        } catch (SecurityException numberException) {
+                            phoneNumber = null;
+                        }
+                        map.putString("number", phoneNumber);
+                    } else {
+                        map.putNull("number");
+                    }
+
+                    result.pushMap(map);
+                }
             }
-        }
-        return array;
-    }
 
-    // 将ReadableArray转换为List<String>
-    private List<String> readableArrayToStringList(ReadableArray readableArray) {
-        List<String> list = new ArrayList<>();
-        for (int i = 0; i < readableArray.size(); i++) {
-            list.add(readableArray.getString(i));
+            promise.resolve(result);
+        } catch (SecurityException permissionException) {
+            promise.reject("PERMISSION_DENIED", "获取SIM卡信息权限被拒绝: " + permissionException.getMessage(),
+                    permissionException);
+        } catch (Exception e) {
+            logger.e("BeiDouBluetoothModule", "获取SIM卡信息失败: " + e.getMessage(), e);
+            promise.reject("SIM_INFO_ERROR", "获取SIM卡信息失败: " + e.getMessage(), e);
         }
-        return list;
     }
 
-    // 将ReadableArray转换为byte数组
-    private byte[] readableArrayToByteArray(ReadableArray readableArray) {
-        byte[] bytes = new byte[readableArray.size()];
-        for (int i = 0; i < readableArray.size(); i++) {
-            bytes[i] = (byte) readableArray.getInt(i);
-        }
-        return bytes;
-    }
+    // ================== 北斗AIDL服务相关方法 ==================
 
     @ReactMethod
     public void bindBeidouServiceMethod(String packageName, String actionName, Promise promise) {
-        try {
-            bindBeidouService(packageName, actionName);
-            promise.resolve(true);
-        } catch (Exception e) {
-            promise.reject("BIND_ERROR", "绑定北斗服务失败: " + e.getMessage());
-        }
+        beidouAidlHelper.bindService(packageName, actionName, promise);
     }
 
     @ReactMethod
     public void unbindBeidouServiceMethod(Promise promise) {
-        try {
-            unbindBeidouService();
-            promise.resolve(true);
-        } catch (Exception e) {
-            promise.reject("UNBIND_ERROR", "解绑北斗服务失败: " + e.getMessage());
-        }
+        beidouAidlHelper.unbindService(promise);
     }
 
     @ReactMethod
-    public void BDAuthenticate(Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
-
-        try {
-            boolean result = beidouService.BDAuthenticate();
-            promise.resolve(result);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "北斗鉴权失败: " + e.getMessage());
-        }
+    public void BDAuthenticate(int slotId, Promise promise) {
+        beidouAidlHelper.authenticate(slotId, promise);
     }
 
     @ReactMethod
-    public void getBDMsgStatus(Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
-
-        try {
-            BDStatusResponse response = beidouService.getBDMsgStatus();
-            WritableMap map = new WritableNativeMap();
-            map.putInt("code", response.code);
-            map.putString("statusMsg", response.statusMsg);
-            map.putInt("msgQuotaRemain", response.msgQuotaRemain);
-            promise.resolve(map);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "获取北斗状态失败: " + e.getMessage());
-        }
+    public void getBDMsgStatus(int slotId, Promise promise) {
+        beidouAidlHelper.getStatus(slotId, promise);
     }
 
     @ReactMethod
-    public void checkValidatedKey(Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
-
-        try {
-            int result = beidouService.checkValidatedKey();
-            promise.resolve(result);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "检查北斗密钥失败: " + e.getMessage());
-        }
+    public void checkValidatedKey(int slotId, Promise promise) {
+        beidouAidlHelper.checkValidatedKey(slotId, promise);
     }
 
     @ReactMethod
-    public void commonBDMsgEncrypt(ReadableArray receiveList, String inputMsg, Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
-
-        try {
-            List<String> receiveStringList = readableArrayToStringList(receiveList);
-            BDMsgEncryptResponse response = beidouService.commonBDMsgEncrypt(receiveStringList, inputMsg);
-
-            WritableMap map = new WritableNativeMap();
-            map.putInt("code", response.code);
-            map.putString("statusMsg", response.statusMsg);
-            map.putArray("data", byteArrayToWritableArray(response.data));
-            map.putString("sendMobile", response.sendMobile);
-            promise.resolve(map);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "通用报文加密失败: " + e.getMessage());
-        }
+    public void commonBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String inputMsg,
+            Promise promise) {
+        beidouAidlHelper.commonBDMsgEncrypt(slotId, speedType, receiveList, inputMsg, promise);
     }
 
     @ReactMethod
-    public void positionBDMsgEncrypt(ReadableArray receiveList, String inputMsg, double longitude, double latitude,
-                                     Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
-
-        try {
-            List<String> receiveStringList = readableArrayToStringList(receiveList);
-            BDMsgEncryptResponse response = beidouService.positionBDMsgEncrypt(receiveStringList, inputMsg, longitude,
-                    latitude);
+    public void positionBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String inputMsg,
+            double longitude, double latitude, Promise promise) {
+        beidouAidlHelper.positionBDMsgEncrypt(slotId, speedType, receiveList, inputMsg, longitude, latitude, promise);
+    }
 
-            WritableMap map = new WritableNativeMap();
-            map.putInt("code", response.code);
-            map.putString("statusMsg", response.statusMsg);
-            map.putArray("data", byteArrayToWritableArray(response.data));
-            map.putString("sendMobile", response.sendMobile);
-            promise.resolve(map);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "位置报文加密失败: " + e.getMessage());
-        }
+    @ReactMethod
+    public void commonEmergencyBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String inputMsg,
+            Promise promise) {
+        beidouAidlHelper.commonEmergencyBDMsgEncrypt(slotId, speedType, receiveList, inputMsg, promise);
     }
 
     @ReactMethod
-    public void BDMailboxQueryEncrypt(Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
+    public void positionEmergencyBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String inputMsg,
+            double longitude, double latitude, Promise promise) {
+        beidouAidlHelper.positionEmergencyBDMsgEncrypt(slotId, speedType, receiveList, inputMsg, longitude, latitude, promise);
+    }
 
-        try {
-            BDMsgEncryptResponse response = beidouService.BDMailboxQueryEncrypt();
+    @ReactMethod
+    public void commonRichMediaBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String msgType,
+            @Nullable ReadableArray inputRichMediaData, Promise promise) {
+        beidouAidlHelper.commonRichMediaBDMsgEncrypt(slotId, speedType, receiveList, msgType, inputRichMediaData, promise);
+    }
 
-            WritableMap map = new WritableNativeMap();
-            map.putInt("code", response.code);
-            map.putString("statusMsg", response.statusMsg);
-            map.putArray("data", byteArrayToWritableArray(response.data));
-            map.putString("sendMobile", response.sendMobile);
-            promise.resolve(map);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "信箱查询加密失败: " + e.getMessage());
-        }
+    @ReactMethod
+    public void positionRichMediaBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String msgType,
+            @Nullable ReadableArray inputRichMediaData, double longitude, double latitude, Promise promise) {
+        beidouAidlHelper.positionRichMediaBDMsgEncrypt(slotId, speedType, receiveList, msgType, inputRichMediaData, longitude,
+                latitude, promise);
     }
 
     @ReactMethod
-    public void BDMsgDecrypt(ReadableArray msg, int len, Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
+    public void commonRichMediaAndTextBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String text,
+            String msgType, @Nullable ReadableArray inputRichMediaData, Promise promise) {
+        beidouAidlHelper.commonRichMediaAndTextBDMsgEncrypt(slotId, speedType, receiveList, text, msgType, inputRichMediaData,
+                promise);
+    }
 
-        try {
-            byte[] msgBytes = readableArrayToByteArray(msg);
-            BDMsgDecryptResponse response = beidouService.BDMsgDecrypt(msgBytes, len);
+    @ReactMethod
+    public void positionRichMediaAndTextBDMsgEncrypt(int slotId, String speedType, @Nullable ReadableArray receiveList, String text,
+            String msgType, @Nullable ReadableArray inputRichMediaData, double longitude, double latitude, Promise promise) {
+        beidouAidlHelper.positionRichMediaAndTextBDMsgEncrypt(slotId, speedType, receiveList, text, msgType, inputRichMediaData,
+                longitude, latitude, promise);
+    }
 
-            WritableMap map = new WritableNativeMap();
-            map.putInt("statusMsg", response.statusMsg);
-            map.putInt("isRemainMsg", response.isRemainMsg);
-            map.putString("rcvMobile", response.rcvMobile);
-            map.putString("data", response.data);
-            promise.resolve(map);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "报文解密失败: " + e.getMessage());
-        }
+    @ReactMethod
+    public void BDMailboxQueryEncrypt(int slotId, Promise promise) {
+        beidouAidlHelper.mailboxQueryEncrypt(slotId, promise);
     }
 
     @ReactMethod
-    public void DLEphemerisFile(String type, String version, Promise promise) {
-        if (!isBeidouServiceBound || beidouService == null) {
-            promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
-            return;
-        }
+    public void EmergencyBDMailboxQueryEncrypt(int slotId, String replyMobile, Promise promise) {
+        beidouAidlHelper.emergencyMailboxQueryEncrypt(slotId, replyMobile, promise);
+    }
 
-        try {
-            BDMsgEphemerisFileDLResponse response = beidouService.DLEphemerisFile(type, version);
+    @ReactMethod
+    public void BDMsgDecrypt(int slotId, @Nullable ReadableArray msg, int len, Promise promise) {
+        beidouAidlHelper.decryptMessage(slotId, msg, len, promise);
+    }
 
-            WritableMap map = new WritableNativeMap();
-            map.putInt("code", response.code);
-            map.putString("statusMsg", response.statusMsg);
-            map.putArray("ephemerisZipFile", byteArrayToWritableArray(response.ephemerisZipFile));
-            map.putString("version", response.version);
-            promise.resolve(map);
-        } catch (Exception e) {
-            promise.reject("REMOTE_ERROR", "下载星历文件失败: " + e.getMessage());
-        }
+    @ReactMethod
+    public void DLEphemerisFile(int slotId, String type, String version, Promise promise) {
+        beidouAidlHelper.downloadEphemerisFile(slotId, type, version, promise);
     }
 
     // 设置BLE密钥
@@ -899,10 +887,12 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             Location networkLocation = null;
             try {
                 gpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-            } catch (Exception ignored) { }
+            } catch (Exception ignored) {
+            }
             try {
                 networkLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-            } catch (Exception ignored) { }
+            } catch (Exception ignored) {
+            }
 
             Location bestLocation = null;
             if (gpsLocation != null && networkLocation != null) {
@@ -927,8 +917,112 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             map.putDouble("timestamp", (double) bestLocation.getTime());
             promise.resolve(map);
         } catch (Exception e) {
-            Log.e("BeiDouBluetoothModule", "获取GPS位置失败: " + e.getMessage());
+            logger.e("BeiDouBluetoothModule", "获取GPS位置失败: " + e.getMessage(), e);
             promise.reject("LOCATION_ERROR", "获取GPS位置失败: " + e.getMessage(), e);
         }
     }
+
+    // ================== 日志管理相关方法 ==================
+
+    /**
+     * 配置日志管理器
+     *
+     * @param enableFileLog    是否启用文件日志
+     * @param enableConsoleLog 是否启用控制台日志
+     * @param maxFileSize      最大文件大小(MB)
+     * @param maxFileCount     最大文件数量
+     * @param encryptionKey    加密密钥（可选）
+     */
+    @ReactMethod
+    public void configureLogger(boolean enableFileLog, boolean enableConsoleLog,
+            double maxFileSize, int maxFileCount,
+            @Nullable String encryptionKey, Promise promise) {
+        try {
+            // 重新初始化日志管理器
+            boolean isDebug = reactContext != null &&
+                    (reactContext.getApplicationInfo().flags & android.content.pm.ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+
+            logger.initialize(reactContext, isDebug, enableFileLog, encryptionKey);
+            logger.setLogConfig(enableFileLog, enableConsoleLog,
+                    (long) (maxFileSize * 1024 * 1024), maxFileCount);
+
+            logger.i("BeiDouBluetoothModule", "Logger configured - FileLog: " + enableFileLog +
+                    ", ConsoleLog: " + enableConsoleLog +
+                    ", MaxFileSize: " + maxFileSize + "MB" +
+                    ", MaxFileCount: " + maxFileCount +
+                    ", Encryption: " + (encryptionKey != null));
+
+            promise.resolve(true);
+        } catch (Exception e) {
+            logger.e("BeiDouBluetoothModule", "配置日志管理器失败: " + e.getMessage(), e);
+            promise.reject("CONFIG_ERROR", "配置日志管理器失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 获取日志统计信息
+     */
+    @ReactMethod
+    public void getLogStats(Promise promise) {
+        try {
+            String stats = logger.getLogStats();
+            promise.resolve(stats);
+        } catch (Exception e) {
+            logger.e("BeiDouBluetoothModule", "获取日志统计失败: " + e.getMessage(), e);
+            promise.reject("STATS_ERROR", "获取日志统计失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 清空所有日志文件
+     */
+    @ReactMethod
+    public void clearAllLogs(Promise promise) {
+        try {
+            logger.clearAllLogs();
+            logger.i("BeiDouBluetoothModule", "所有日志文件已清空");
+            promise.resolve(true);
+        } catch (Exception e) {
+            logger.e("BeiDouBluetoothModule", "清空日志失败: " + e.getMessage(), e);
+            promise.reject("CLEAR_ERROR", "清空日志失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 手动记录日志
+     */
+    @ReactMethod
+    public void writeLog(String level, String tag, String message, Promise promise) {
+        try {
+            switch (level.toUpperCase()) {
+                case "VERBOSE":
+                case "V":
+                    logger.v(tag, message);
+                    break;
+                case "DEBUG":
+                case "D":
+                    logger.d(tag, message);
+                    break;
+                case "INFO":
+                case "I":
+                    logger.i(tag, message);
+                    break;
+                case "WARN":
+                case "W":
+                    logger.w(tag, message);
+                    break;
+                case "ERROR":
+                case "E":
+                    logger.e(tag, message);
+                    break;
+                default:
+                    logger.i(tag, message);
+                    break;
+            }
+            promise.resolve(true);
+        } catch (Exception e) {
+            logger.e("BeiDouBluetoothModule", "写入日志失败: " + e.getMessage(), e);
+            promise.reject("LOG_ERROR", "写入日志失败: " + e.getMessage(), e);
+        }
+    }
 }