react-native-beidou 1.0.3 → 1.0.4

package/android/src/main/java/com/cmcc_rn_module/BeiDouBluetoothModule.java

@@ -8,8 +8,11 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.nfc.Tag;
 import android.os.Build;
 import android.util.Log;
+import android.location.Location;
+import android.location.LocationManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -19,6 +22,7 @@ import androidx.core.content.ContextCompat;
 import com.beidou.bluetooth.BluetoothSDK;
 import com.beidou.bluetooth.callback.BluetoothConnectionCallback;
 import com.beidou.bluetooth.callback.BluetoothDataCallback;
+import com.beidou.bluetooth.callback.BluetoothPushCallback;
 import com.beidou.bluetooth.model.BlueDeviceInfoEntity;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
@@ -49,17 +53,17 @@ import android.content.ServiceConnection;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.IBinder;
-import android.os.RemoteException;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableNativeArray;
 
 public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     private ReactContext reactContext;
-    
+
     // 北斗AIDL服务相关字段
     private IBeidouMsgAidlInterface beidouService;
     private boolean isBeidouServiceBound = false;
+
     @NonNull
     @Override
     public String getName() {
@@ -69,41 +73,106 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     public BeiDouBluetoothModule(@Nullable ReactApplicationContext reactContext) {
         super(reactContext);
         this.reactContext = reactContext;
+        BluetoothSDK.getInstance(reactContext).setPushCallback(new BluetoothPushCallback() {
+            @Override
+            public void onDevicePush(String deviceNo, String data, int cmd) {
+                Log.d("BeiDouBluetoothModule","收到设备推送消息: "+data);
+                // 处理接收到的数据
+                WritableMap writableMap = new WritableNativeMap();
+                writableMap.putInt("type", 0);
+                writableMap.putString("message", data);
+                reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                        .emit("listenBluetoolth", writableMap);
+            }
+        });
     }
 
+    // 消息数据库管理器实例
+    private ChatDBManager chatDBManager;
+
+    // 获取数据库管理器实例
+    private ChatDBManager getChatDBManager() {
+        if (chatDBManager == null) {
+            chatDBManager = new ChatDBManager(reactContext);
+        }
+        return chatDBManager;
+    }
+
+    // 插入北斗蓝牙短信
     @ReactMethod
-    private void getAllConversations(Callback callback){
-        WritableMap map = new WritableNativeMap();
-        callback.invoke("[]");
+    public void insertMsg(String phone, String content, Double timestamp, Boolean isSend) {
+        try {
+            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));
+        } catch (Exception e) {
+            Log.e("BeiDouBluetoothModule", "插入消息失败: " + e.getMessage());
+        }
     }
 
-    //开始扫描蓝牙设备
+    // 获取会话列表
     @ReactMethod
-    public void startScanForService(){
+    public void getAllConversations(Promise promise) {
+        try {
+            List<Map<String, Object>> conversations = getChatDBManager().getAllConversations();
+            String jsonString = JsonUtil.objectToJson(conversations);
+            promise.resolve(jsonString);
+        } catch (Exception e) {
+            Log.e("BeiDouBluetoothModule", "获取会话列表失败: " + e.getMessage());
+            promise.reject("json_error", "序列化失败", e);
+        }
+    }
+
+    // 获取会话详情
+    @ReactMethod
+    public void getMessagesForPhone(String phone, Integer page, Integer pageSize, Callback callback) {
+        try {
+            int pageNum = page != null ? page : 0;
+            int size = pageSize != null ? pageSize : 20;
+
+            List<Map<String, Object>> messages = getChatDBManager().getMessagesForPhone(phone, pageNum, size);
+            String jsonString = JsonUtil.objectToJson(messages);
+            Log.d("BeiDouBluetoothModule", "获取消息详情: " + jsonString);
+            callback.invoke(jsonString);
+        } catch (Exception e) {
+            Log.e("BeiDouBluetoothModule", "获取消息详情失败: " + e.getMessage());
+            callback.invoke("[]");
+        }
+    }
+
+    // 开始扫描蓝牙设备
+    @ReactMethod
+    public void startScanForService() {
         BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
         Log.d("BluetoothSDK", "MyModule-> 开始扫描");
         instance.startScan();
     }
-    //停止扫描蓝牙设备
+
+    // 停止扫描蓝牙设备
     @ReactMethod
-    public void stopScanning(){
+    public void stopScanning() {
         BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
         instance.stopScan();
     }
-    //获取扫描结果
+
+    // 获取扫描结果
     @ReactMethod
     public void getDiscoveredDevices(Promise promise) throws JSONException {
         BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
         Map<String, BlueDeviceInfoEntity> deviceInfoMap = instance.getScannedDevices();
-        String s = JsonUtil.objectToJson(deviceInfoMap.values());
-        Log.d("BluetoothSDK","获取设备列表："+s);
+
+        // 将 BlueDeviceInfoEntity 对象转换为 List 以便序列化
+        List<BlueDeviceInfoEntity> deviceList = new ArrayList<>(deviceInfoMap.values());
+        String s = JsonUtil.objectToJson(deviceList);
+        Log.d("BluetoothSDK", "获取设备列表：" + s);
         promise.resolve(s);
     }
 
-    //根据 deviceNo 连接蓝牙设备
+    // 根据 deviceNo 连接蓝牙设备
     @ReactMethod
-    public void connectToDeviceFromCloudDeviceNO(String deviceNO,Double a, Promise promise){
-        if (StringUtils.isEmpty(deviceNO)){
+    public void connectToDeviceFromCloudDeviceNO(String deviceNO, Double a, Promise promise) {
+        if (StringUtils.isEmpty(deviceNO)) {
             Log.e("BluetoothSDK", "connectToDeviceFromCloudDeviceNO: deviceNo isEmpty");
             promise.resolve("fail");
             return;
@@ -142,24 +211,24 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
      */
     @ReactMethod
     public void getAndroidNetWorkInfo(Callback callback) {
-        // -1  是未知网络     0 是无网络    1 是移动蜂窝网络    2 是WIFI
+        // -1 是未知网络 0 是无网络 1 是移动蜂窝网络 2 是WIFI
         Number net = 0;
         ConnectivityManager connMgr = (ConnectivityManager) reactContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-        //无线WIFI网络
+        // 无线WIFI网络
         NetworkInfo WifiNetWorkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-        boolean Wificonnected = WifiNetWorkInfo.isConnected(); //判断是否连接WiFi
+        boolean Wificonnected = WifiNetWorkInfo.isConnected(); // 判断是否连接WiFi
         System.out.println("获取本机token：：：：：：：：：：：：：：Wificonnected" + Wificonnected);
-        //移动网络
+        // 移动网络
         NetworkInfo MobilenetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-        boolean Mobileconnected = MobilenetworkInfo.isConnected();//判断是否连接移动网络
+        boolean Mobileconnected = MobilenetworkInfo.isConnected();// 判断是否连接移动网络
         System.out.println("获取本机token：：：：：：：：：：：：：：Mobileconnected" + Mobileconnected);
 
-        //未知网络
+        // 未知网络
         // NetworkInfo[] networkInfos= connMgr.getAllNetworkInfo();
         // for(NetworkInfo info:networkInfos){
-        //   if(info.isAvailable()){
-        //     net = -1;
-        //   }
+        // if(info.isAvailable()){
+        // net = -1;
+        // }
         // }
         if (Mobileconnected || Wificonnected) {
             net = -1;
@@ -186,10 +255,13 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
         String ret = "";
         System.out.println("获取Android版本1111：：：：：：：：：：：：：：Build.VERSION.SDK_INT" + Build.VERSION.SDK_INT);
         System.out.println("获取Android版本1：：：：：：：：：：：：：：Build.VERSION.SDK_INT" + Build.VERSION.SDK_INT);
-        // 从Android 12（API 31）开始，蓝牙权限有所变化，新增了 BLUETOOTH_SCAN 和 BLUETOOTH_CONNECT 权限。你需要在 AndroidManifest.xml 中声明这些权限，并在代码中动态请求。
+        // 从Android 12（API 31）开始，蓝牙权限有所变化，新增了 BLUETOOTH_SCAN 和 BLUETOOTH_CONNECT 权限。你需要在
+        // AndroidManifest.xml 中声明这些权限，并在代码中动态请求。
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            if (ContextCompat.checkSelfPermission(Objects.requireNonNull(reactContext.getCurrentActivity()), Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED ||
-                    ContextCompat.checkSelfPermission(reactContext.getCurrentActivity(), Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+            if (ContextCompat.checkSelfPermission(Objects.requireNonNull(reactContext.getCurrentActivity()),
+                    Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED ||
+                    ContextCompat.checkSelfPermission(reactContext.getCurrentActivity(),
+                            Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
                 // 请求权限
                 ret = "NO31";
             } else {
@@ -198,9 +270,13 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             }
         } else { // 从Android 6.0（API 23）开始，部分权限需要在运行时动态申请。蓝牙权限和位置权限通常需要动态申请。
             // 检查蓝牙权限
-            if (ContextCompat.checkSelfPermission(Objects.requireNonNull(reactContext.getCurrentActivity()), Manifest.permission.BLUETOOTH) != PackageManager.PERMISSION_GRANTED ||
-                    ContextCompat.checkSelfPermission(reactContext.getCurrentActivity(), Manifest.permission.BLUETOOTH_ADMIN) != PackageManager.PERMISSION_GRANTED ||
-                    ContextCompat.checkSelfPermission(reactContext.getCurrentActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            if (ContextCompat.checkSelfPermission(Objects.requireNonNull(reactContext.getCurrentActivity()),
+                    Manifest.permission.BLUETOOTH) != PackageManager.PERMISSION_GRANTED ||
+                    ContextCompat.checkSelfPermission(reactContext.getCurrentActivity(),
+                            Manifest.permission.BLUETOOTH_ADMIN) != PackageManager.PERMISSION_GRANTED
+                    ||
+                    ContextCompat.checkSelfPermission(reactContext.getCurrentActivity(),
+                            Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 // 请求权限
                 ret = "NO23";
             } else {
@@ -219,13 +295,15 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
         String ret = "";
         System.out.println("获取Android版本2：：：：：：：：：：：：：：Build.VERSION.SDK_INT" + Build.VERSION.SDK_INT);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            if (ActivityCompat.shouldShowRequestPermissionRationale(this.reactContext.getCurrentActivity(), Manifest.permission.BLUETOOTH_SCAN)) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this.reactContext.getCurrentActivity(),
+                    Manifest.permission.BLUETOOTH_SCAN)) {
                 ret = "OK"; // 设置里面禁止了之后此处会弹窗
             } else {
                 ret = "NO";
             }
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            if (ActivityCompat.shouldShowRequestPermissionRationale(this.reactContext.getCurrentActivity(), Manifest.permission.ACCESS_FINE_LOCATION)) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this.reactContext.getCurrentActivity(),
+                    Manifest.permission.ACCESS_FINE_LOCATION)) {
                 ret = "OK"; // 设置里面禁止了之后此处会弹窗
             } else {
                 ret = "NO";
@@ -255,8 +333,8 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
                 // 蓝牙未启用，可以请求用户启用蓝牙
                 ret = "NO"; // 设备没有开启蓝牙
                 // 你可以使用以下代码启动蓝牙启用请求
-//                Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-//                startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
+                // Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+                // startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
             } else {
                 ret = "OK"; // 设备已经开启蓝牙
             }
@@ -267,40 +345,35 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
-    public String  generateRandom16BytesString() {
+    public String generateRandom16BytesString() {
         byte[] bytes = ByteUtil.generateRandomHexBytes(32);
         Log.d("BluetoothSDK", "获取随机字节数组:" + Arrays.toString(bytes));
-//        String b = java.util.Base64.getEncoder().encodeToString(bytes);
+        // String b = java.util.Base64.getEncoder().encodeToString(bytes);
         String b = "2PJFUoUNB502/KJdVQg5Kg==";
-        Log.d("BluetoothSDK", "随机字节数组加密 Base64字符串:" +  b);
+        Log.d("BluetoothSDK", "随机字节数组加密 Base64字符串:" + b);
         return b;
     }
 
-    //    @ReactMethod
-//    public void writeData(String randomString,String deviceNo, Integer command,Integer attrType, Callback writeCallback){
-//        BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
-//        Log.d(BluetoothSDK.TAG, "收到写入请求" + command +"   "+attrType+"   "+randomString);
-//        Callback callback = args -> {
-//            writeCallback.invoke(args);
-//        };
-//        instance.writeData(randomString, deviceNo, command, attrType,true,callback);
-//    }
+    // @ReactMethod
+    // public void writeData(String randomString,String deviceNo, Integer
+    // command,Integer attrType, Callback writeCallback){
+    // BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
+    // Log.d(BluetoothSDK.TAG, "收到写入请求" + command +" "+attrType+" "+randomString);
+    // Callback callback = args -> {
+    // writeCallback.invoke(args);
+    // };
+    // instance.writeData(randomString, deviceNo, command, attrType,true,callback);
+    // }
     @ReactMethod
-    public void writeData(String randomString,String deviceNo, Integer command,Integer attrType,boolean encrypt, Callback writeCallback){
+    public void writeData(String randomString, String deviceNo, Integer command, Integer attrType,
+                          Callback writeCallback) {
         BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
-        Log.d("BluetoothSDK", "收到写入请求" + command +"   "+attrType+"   "+randomString);
+        Log.d("BluetoothSDK", "收到写入请求" + command + "   " + attrType + "   " + randomString);
         BluetoothDataCallback dataCallback = new BluetoothDataCallback() {
             @Override
             public void onDataWriteSuccess(String deviceNo, byte[] data) {
-                byte[] cipher = Arrays.copyOfRange(data, 4, data.length);
-                String message = Base64.getEncoder().encodeToString(cipher);
-
-                WritableMap writableMap = new WritableNativeMap();
-                writableMap.putInt("type", 0);
-                writableMap.putString("message", message);
                 writeCallback.invoke(1);
-                reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                        .emit("listenBluetoolth",writableMap);
+
             }
 
             @Override
@@ -311,6 +384,14 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             @Override
             public void onDataReceived(String deviceNo, byte[] data, int dataType) {
                 // 处理接收到的数据
+//                byte[] cipher = Arrays.copyOfRange(data, 4, data.length);
+                String message = Base64.getEncoder().encodeToString(data);
+
+                WritableMap writableMap = new WritableNativeMap();
+                writableMap.putInt("type", 0);
+                writableMap.putString("message", message);
+                reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                        .emit("listenBluetoolth", writableMap);
             }
 
             @Override
@@ -324,29 +405,109 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             }
         };
         instance.setDataCallback(dataCallback);
-        instance.writeData(randomString, deviceNo, command, attrType, encrypt);
+        instance.writeData(randomString, deviceNo, command, attrType);
     }
 
+    // 存储BLE密钥的字段
+    private String bleKeyHex = "";
+
     @ReactMethod
-    public void writeInfo(String randomString,String deviceNo, Integer command,Integer attrType,Integer  value, Callback writeCallback){
-//        BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
-//        Log.d("BluetoothSDK", "收到写入请求" + command +"   "+attrType+"   "+randomString);
-//        Callback callback = args -> {
-//            writeCallback.invoke(args);
-//        };
-//        instance.writeData(randomString, deviceNo, command, attrType,encrypt,callback);
+    public void writeInfo(@Nullable String base64Payload, String deviceNO, Integer command, Integer opCode,
+                          Integer attrType, Boolean encrypted, Promise promise) {
+        try {
+            BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
+
+            // 解码base64载荷
+            byte[] decodedData = null;
+            if (base64Payload != null && base64Payload.length() > 0) {
+                try {
+                    decodedData = Base64.getDecoder().decode(base64Payload);
+                    Log.d("BluetoothSDK", "解码成功，数据长度: " + decodedData.length);
+                } catch (Exception e) {
+                    Log.e("BluetoothSDK", "解码base64String失败: " + e.getMessage());
+                    promise.reject("DECODE_ERROR", "解码base64String失败", e);
+                    return;
+                }
+            } else {
+                decodedData = new byte[0];
+            }
+
+            // 转换参数类型
+            int commandValue = command & 0xFF;
+            int opCodeValue = opCode & 0xFF;
+            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",
+                    deviceNO, commandValue, opCodeValue, attrTypeValue, isEncrypted));
+
+            // 设置数据回调
+            BluetoothDataCallback dataCallback = new BluetoothDataCallback() {
+                @Override
+                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);
+                }
+
+                @Override
+                public void onDataWriteFailed(String deviceNo, byte[] data, int errorCode, String errorMessage) {
+                    Log.e("BluetoothSDK", "writeInfo写入失败: " + errorMessage);
+                    promise.reject(String.valueOf(errorCode), "写入失败: " + errorMessage);
+                }
+
+                @Override
+                public void onDataReceived(String deviceNo, byte[] data, int dataType) {
+                    // 处理接收到的数据
+                    Log.d("BluetoothSDK", "writeInfo收到数据，长度: " + data.length);
+                    String base64String = Base64.getEncoder().encodeToString(data);
+
+                    WritableMap resDict = new WritableNativeMap();
+                    resDict.putInt("type", 1);
+                    resDict.putString("data", base64String);
+                    promise.resolve(resDict);
+                }
+
+                @Override
+                public void onDataReadSuccess(String deviceNo, byte[] data) {
+                    // 不需要处理
+                }
+
+                @Override
+                public void onDataReadFailed(String deviceNo, int errorCode, String errorMessage) {
+                    // 不需要处理
+                }
+            };
+
+            instance.setDataCallback(dataCallback);
+
+            // 调用SDK写入数据
+            String dataString = Base64.getEncoder().encodeToString(decodedData);
+            instance.writeData(dataString, deviceNO, commandValue, attrTypeValue,opCodeValue, isEncrypted);
+
+        } catch (Exception e) {
+            Log.e("BluetoothSDK", "writeInfo异常: " + e.getMessage());
+            promise.reject("WRITE_ERROR", "写入数据异常: " + e.getMessage(), e);
+        }
     }
+
     @ReactMethod
-    public void writeValueInfo(String randomString,String deviceNo, Integer command,Integer attrType,Integer  value, Callback writeCallback){
-//        BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
-//        Log.d(BluetoothSDK.TAG, "收到写入请求" + command +"   "+attrType+"   "+randomString);
-//        Callback callback = args -> {
-//            writeCallback.invoke(args);
-//        };
-//        instance.writeData(randomString, deviceNo, command, attrType,encrypt,callback);
+    public void writeValueInfo(String randomString, String deviceNo, Integer command, Integer attrType, Integer value,
+                               Callback writeCallback) {
+        // BluetoothSDK instance = BluetoothSDK.getInstance(reactContext);
+        // Log.d(BluetoothSDK.TAG, "收到写入请求" + command +" "+attrType+" "+randomString);
+        // Callback callback = args -> {
+        // writeCallback.invoke(args);
+        // };
+        // instance.writeData(randomString, deviceNo, command,
+        // attrType,encrypt,callback);
     }
+
     @ReactMethod
-    public void disConnectWithDeviceUUID(String deviceNo,Promise promise) {
+    public void disConnectWithDeviceUUID(String deviceNo, Promise promise) {
         BluetoothConnectionCallback disConnectCallback = new BluetoothConnectionCallback() {
             @Override
             public void onConnected(String deviceNo) {
@@ -371,8 +532,10 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
         BluetoothSDK.getInstance(reactContext).disconnectDevice(deviceNo, disConnectCallback);
     }
 
+
+
     @ReactMethod
-    public void fetchCurrentWifiName(Callback callback){
+    public void fetchCurrentWifiName(Callback callback) {
         String wifiName = "未连接";
 
         try {
@@ -384,8 +547,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             // 检查ACCESS_FINE_LOCATION权限（Android 10+需要）
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 if (ContextCompat.checkSelfPermission(reactContext,
-                        Manifest.permission.ACCESS_FINE_LOCATION)
-                        != PackageManager.PERMISSION_GRANTED) {
+                        Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                     Log.w("WifiInfo", "缺少ACCESS_FINE_LOCATION权限，无法获取WiFi名称");
                     callback.invoke("权限不足");
                     return;
@@ -460,11 +622,11 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
     private void bindBeidouService(String packageName, String actionName) {
         if (!isBeidouServiceBound && reactContext != null) {
             Intent intent = new Intent();
-            intent.setAction(actionName);
-            intent.setPackage(packageName);
+            // 使用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 + ", Action: " + actionName);
+                Log.d("BeiDouService", "绑定北斗服务结果: " + result + ", 包名: " + packageName + ", 类名: " + actionName);
             } catch (Exception e) {
                 Log.e("BeiDouService", "绑定北斗服务失败: " + e.getMessage());
             }
@@ -538,11 +700,11 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
             return;
         }
-        
+
         try {
             boolean result = beidouService.BDAuthenticate();
             promise.resolve(result);
-        } catch (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "北斗鉴权失败: " + e.getMessage());
         }
     }
@@ -553,7 +715,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
             return;
         }
-        
+
         try {
             BDStatusResponse response = beidouService.getBDMsgStatus();
             WritableMap map = new WritableNativeMap();
@@ -561,7 +723,7 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             map.putString("statusMsg", response.statusMsg);
             map.putInt("msgQuotaRemain", response.msgQuotaRemain);
             promise.resolve(map);
-        } catch (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "获取北斗状态失败: " + e.getMessage());
         }
     }
@@ -572,11 +734,11 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
             return;
         }
-        
+
         try {
             int result = beidouService.checkValidatedKey();
             promise.resolve(result);
-        } catch (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "检查北斗密钥失败: " + e.getMessage());
         }
     }
@@ -587,40 +749,42 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             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 (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "通用报文加密失败: " + e.getMessage());
         }
     }
 
     @ReactMethod
-    public void positionBDMsgEncrypt(ReadableArray receiveList, String inputMsg, double longitude, double latitude, Promise promise) {
+    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);
-            
+            BDMsgEncryptResponse response = beidouService.positionBDMsgEncrypt(receiveStringList, inputMsg, longitude,
+                    latitude);
+
             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 (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "位置报文加密失败: " + e.getMessage());
         }
     }
@@ -631,17 +795,17 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
             return;
         }
-        
+
         try {
             BDMsgEncryptResponse response = beidouService.BDMailboxQueryEncrypt();
-            
+
             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 (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "信箱查询加密失败: " + e.getMessage());
         }
     }
@@ -652,18 +816,18 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
             return;
         }
-        
+
         try {
             byte[] msgBytes = readableArrayToByteArray(msg);
             BDMsgDecryptResponse response = beidouService.BDMsgDecrypt(msgBytes, len);
-            
+
             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 (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "报文解密失败: " + e.getMessage());
         }
     }
@@ -674,19 +838,97 @@ public class BeiDouBluetoothModule extends ReactContextBaseJavaModule {
             promise.reject("SERVICE_NOT_BOUND", "北斗服务未绑定，请先调用bindBeidouServiceMethod");
             return;
         }
-        
+
         try {
             BDMsgEphemerisFileDLResponse response = beidouService.DLEphemerisFile(type, version);
-            
+
             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 (RemoteException e) {
+        } catch (Exception e) {
             promise.reject("REMOTE_ERROR", "下载星历文件失败: " + e.getMessage());
         }
     }
 
+    // 设置BLE密钥
+    @ReactMethod
+    public void setBLEKey(String bleKey, Promise promise) {
+        try {
+            this.bleKeyHex = bleKey;
+            BluetoothSDK.getInstance(reactContext).setBleKey(bleKey); // 32位hex
+            Log.d("BeiDouBluetoothModule", "设置BLE密钥成功: " + bleKey);
+            promise.resolve(1); // 返回成功标志
+        } catch (Exception e) {
+            Log.e("BeiDouBluetoothModule", "设置BLE密钥失败: " + e.getMessage());
+            promise.reject("SET_KEY_ERROR", "设置BLE密钥失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 获取GPS经纬度（优先返回最近一次的已知位置）
+     * - 需要定位运行时权限（ACCESS_FINE_LOCATION 或 ACCESS_COARSE_LOCATION）
+     * - 返回：{ latitude, longitude, provider, accuracy, timestamp }，若无可用位置则返回 null
+     */
+    @ReactMethod
+    public void getGpsLocation(Promise promise) {
+        try {
+            if (reactContext == null) {
+                promise.reject("CONTEXT_NULL", "React上下文不可用");
+                return;
+            }
+
+            boolean fineGranted = ContextCompat.checkSelfPermission(reactContext,
+                    Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+            boolean coarseGranted = ContextCompat.checkSelfPermission(reactContext,
+                    Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+            if (!fineGranted && !coarseGranted) {
+                promise.reject("PERMISSION_DENIED", "缺少定位权限");
+                return;
+            }
+
+            LocationManager locationManager = (LocationManager) reactContext.getSystemService(Context.LOCATION_SERVICE);
+            if (locationManager == null) {
+                promise.reject("LOCATION_SERVICE_UNAVAILABLE", "无法获取定位服务");
+                return;
+            }
+
+            Location gpsLocation = null;
+            Location networkLocation = null;
+            try {
+                gpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+            } catch (Exception ignored) { }
+            try {
+                networkLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+            } catch (Exception ignored) { }
+
+            Location bestLocation = null;
+            if (gpsLocation != null && networkLocation != null) {
+                bestLocation = gpsLocation.getTime() >= networkLocation.getTime() ? gpsLocation : networkLocation;
+            } else if (gpsLocation != null) {
+                bestLocation = gpsLocation;
+            } else if (networkLocation != null) {
+                bestLocation = networkLocation;
+            }
+
+            if (bestLocation == null) {
+                // 没有可用的最近位置，返回null
+                promise.resolve(null);
+                return;
+            }
+
+            WritableMap map = new WritableNativeMap();
+            map.putDouble("latitude", bestLocation.getLatitude());
+            map.putDouble("longitude", bestLocation.getLongitude());
+            map.putString("provider", bestLocation.getProvider());
+            map.putDouble("accuracy", bestLocation.hasAccuracy() ? bestLocation.getAccuracy() : -1.0);
+            map.putDouble("timestamp", (double) bestLocation.getTime());
+            promise.resolve(map);
+        } catch (Exception e) {
+            Log.e("BeiDouBluetoothModule", "获取GPS位置失败: " + e.getMessage());
+            promise.reject("LOCATION_ERROR", "获取GPS位置失败: " + e.getMessage(), e);
+        }
+    }
 }