react-native-beidou 1.0.7 → 1.0.8

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

@@ -1,4 +1,4 @@
-package com.cmcc_rn_module;
+package com.fxzs.rnbeidou;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -20,7 +20,7 @@ public class ChatDBManager extends SQLiteOpenHelper {
     private static final String TAG = "ChatDBManager";
     private static final String DATABASE_NAME = "beidou_chat.db";
     private static final int DATABASE_VERSION = 1;
-    
+
     // 消息表
     private static final String TABLE_MESSAGES = "messages";
     private static final String COLUMN_ID = "id";
@@ -28,13 +28,13 @@ public class ChatDBManager extends SQLiteOpenHelper {
     private static final String COLUMN_CONTENT = "content";
     private static final String COLUMN_TIMESTAMP = "timestamp";
     private static final String COLUMN_IS_SEND = "is_send";
-    
+
     // 会话表
     private static final String TABLE_CONVERSATIONS = "conversations";
     private static final String COLUMN_LAST_MESSAGE = "last_message";
-    
+
     // 创建消息表的SQL语句
-    private static final String CREATE_MESSAGES_TABLE = 
+    private static final String CREATE_MESSAGES_TABLE =
         "CREATE TABLE " + TABLE_MESSAGES + " (" +
         COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
         COLUMN_PHONE_NUMBER + " TEXT NOT NULL, " +
@@ -42,27 +42,27 @@ public class ChatDBManager extends SQLiteOpenHelper {
         COLUMN_TIMESTAMP + " INTEGER NOT NULL, " +
         COLUMN_IS_SEND + " INTEGER NOT NULL DEFAULT 0" +
         ")";
-    
+
     // 创建会话表的SQL语句
-    private static final String CREATE_CONVERSATIONS_TABLE = 
+    private static final String CREATE_CONVERSATIONS_TABLE =
         "CREATE TABLE " + TABLE_CONVERSATIONS + " (" +
         COLUMN_PHONE_NUMBER + " TEXT PRIMARY KEY, " +
         COLUMN_LAST_MESSAGE + " TEXT NOT NULL, " +
         COLUMN_TIMESTAMP + " INTEGER NOT NULL, " +
         COLUMN_IS_SEND + " INTEGER NOT NULL DEFAULT 0" +
         ")";
-    
+
     public ChatDBManager(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
-    
+
     @Override
     public void onCreate(SQLiteDatabase db) {
         db.execSQL(CREATE_MESSAGES_TABLE);
         db.execSQL(CREATE_CONVERSATIONS_TABLE);
         Log.d(TAG, "数据库创建成功");
     }
-    
+
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         db.execSQL("DROP TABLE IF EXISTS " + TABLE_MESSAGES);
@@ -70,7 +70,7 @@ public class ChatDBManager extends SQLiteOpenHelper {
         onCreate(db);
         Log.d(TAG, "数据库升级完成");
     }
-    
+
     /**
      * 插入消息
      * @param content 消息内容
@@ -84,16 +84,16 @@ public class ChatDBManager extends SQLiteOpenHelper {
         try {
             db = this.getWritableDatabase();
             db.beginTransaction();
-            
+
             // 插入消息记录
             ContentValues messageValues = new ContentValues();
             messageValues.put(COLUMN_PHONE_NUMBER, phoneNumber);
             messageValues.put(COLUMN_CONTENT, content);
             messageValues.put(COLUMN_TIMESTAMP, timestamp);
             messageValues.put(COLUMN_IS_SEND, isSend ? 1 : 0);
-            
+
             long messageResult = db.insert(TABLE_MESSAGES, null, messageValues);
-            
+
             if (messageResult != -1) {
                 // 更新对话表（原子操作：如果不存在则插入，存在则更新）
                 ContentValues conversationValues = new ContentValues();
@@ -101,13 +101,13 @@ public class ChatDBManager extends SQLiteOpenHelper {
                 conversationValues.put(COLUMN_LAST_MESSAGE, content);
                 conversationValues.put(COLUMN_TIMESTAMP, timestamp);
                 conversationValues.put(COLUMN_IS_SEND, isSend ? 1 : 0);
-                
-                long conversationResult = db.insertWithOnConflict(TABLE_CONVERSATIONS, null, 
+
+                long conversationResult = db.insertWithOnConflict(TABLE_CONVERSATIONS, null,
                         conversationValues, SQLiteDatabase.CONFLICT_REPLACE);
-                
+
                 if (conversationResult != -1) {
                     db.setTransactionSuccessful();
-                    Log.d(TAG, String.format("插入消息成功 - 手机号: %s, 内容: %s, 是否发送: %b", 
+                    Log.d(TAG, String.format("插入消息成功 - 手机号: %s, 内容: %s, 是否发送: %b",
                             phoneNumber, content, isSend));
                     return true;
                 } else {
@@ -134,7 +134,7 @@ public class ChatDBManager extends SQLiteOpenHelper {
             }
         }
     }
-    
+
     /**
      * 获取所有会话列表
      * @return 会话列表
@@ -143,14 +143,14 @@ public class ChatDBManager extends SQLiteOpenHelper {
         List<Map<String, Object>> conversations = new ArrayList<>();
         SQLiteDatabase db = null;
         Cursor cursor = null;
-        
+
         try {
             db = this.getReadableDatabase();
-            
+
             // 直接从会话表查询，按时间戳倒序排列
             String query = "SELECT * FROM " + TABLE_CONVERSATIONS + " ORDER BY " + COLUMN_TIMESTAMP + " DESC";
             cursor = db.rawQuery(query, null);
-            
+
             if (cursor != null && cursor.moveToFirst()) {
                 do {
                     Map<String, Object> conversation = new HashMap<>();
@@ -161,9 +161,9 @@ public class ChatDBManager extends SQLiteOpenHelper {
                     conversations.add(conversation);
                 } while (cursor.moveToNext());
             }
-            
+
             Log.d(TAG, "获取会话列表成功，共 " + conversations.size() + " 个会话");
-            
+
         } catch (Exception e) {
             Log.e(TAG, "获取会话列表失败: " + e.getMessage(), e);
         } finally {
@@ -174,10 +174,10 @@ public class ChatDBManager extends SQLiteOpenHelper {
                 db.close();
             }
         }
-        
+
         return conversations;
     }
-    
+
     /**
      * 获取指定手机号的消息列表
      * @param phoneNumber 手机号
@@ -189,17 +189,17 @@ public class ChatDBManager extends SQLiteOpenHelper {
         List<Map<String, Object>> messages = new ArrayList<>();
         SQLiteDatabase db = null;
         Cursor cursor = null;
-        
+
         try {
             db = this.getReadableDatabase();
-            
+
             // 注意：iOS版本中查询的表是 uploadForm，但这里应该查询 messages 表
             // 修正查询语句，使用正确的表名和字段名
-            String query = String.format("SELECT * FROM %s WHERE %s = ? ORDER BY %s DESC LIMIT %d OFFSET %d", 
+            String query = String.format("SELECT * FROM %s WHERE %s = ? ORDER BY %s DESC LIMIT %d OFFSET %d",
                     TABLE_MESSAGES, COLUMN_PHONE_NUMBER, COLUMN_TIMESTAMP, pageSize, page * pageSize);
-            
+
             cursor = db.rawQuery(query, new String[]{phoneNumber});
-            
+
             if (cursor != null && cursor.moveToFirst()) {
                 do {
                     Map<String, Object> message = new HashMap<>();
@@ -209,10 +209,10 @@ public class ChatDBManager extends SQLiteOpenHelper {
                     messages.add(message);
                 } while (cursor.moveToNext());
             }
-            
-            Log.d(TAG, String.format("获取消息详情成功 - 手机号: %s, 页码: %d, 页大小: %d, 消息数: %d", 
+
+            Log.d(TAG, String.format("获取消息详情成功 - 手机号: %s, 页码: %d, 页大小: %d, 消息数: %d",
                     phoneNumber, page, pageSize, messages.size()));
-            
+
         } catch (Exception e) {
             Log.e(TAG, "获取消息详情失败: " + e.getMessage(), e);
         } finally {
@@ -223,10 +223,10 @@ public class ChatDBManager extends SQLiteOpenHelper {
                 db.close();
             }
         }
-        
+
         return messages;
     }
-    
+
     /**
      * 删除指定手机号的所有消息
      * @param phoneNumber 手机号
@@ -237,16 +237,16 @@ public class ChatDBManager extends SQLiteOpenHelper {
         try {
             db = this.getWritableDatabase();
             db.beginTransaction();
-            
+
             // 删除消息记录
             int deletedMessages = db.delete(TABLE_MESSAGES, COLUMN_PHONE_NUMBER + " = ?", new String[]{phoneNumber});
-            
+
             // 删除会话记录
             int deletedConversations = db.delete(TABLE_CONVERSATIONS, COLUMN_PHONE_NUMBER + " = ?", new String[]{phoneNumber});
-            
+
             db.setTransactionSuccessful();
-            
-            Log.d(TAG, String.format("删除消息 - 手机号: %s, 删除消息数: %d, 删除会话数: %d", 
+
+            Log.d(TAG, String.format("删除消息 - 手机号: %s, 删除消息数: %d, 删除会话数: %d",
                     phoneNumber, deletedMessages, deletedConversations));
             return deletedMessages > 0;
         } catch (Exception e) {
@@ -265,7 +265,7 @@ public class ChatDBManager extends SQLiteOpenHelper {
             }
         }
     }
-    
+
     /**
      * 清空所有消息
      * @return 清空成功返回true
@@ -275,15 +275,15 @@ public class ChatDBManager extends SQLiteOpenHelper {
         try {
             db = this.getWritableDatabase();
             db.beginTransaction();
-            
+
             // 清空消息表
             int deletedMessages = db.delete(TABLE_MESSAGES, null, null);
-            
+
             // 清空会话表
             int deletedConversations = db.delete(TABLE_CONVERSATIONS, null, null);
-            
+
             db.setTransactionSuccessful();
-            
+
             Log.d(TAG, String.format("清空所有消息，删除消息数: %d, 删除会话数: %d", deletedMessages, deletedConversations));
             return true;
         } catch (Exception e) {

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

@@ -1,4 +1,4 @@
-package com.cmcc_rn_module;
+package com.fxzs.rnbeidou;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -34,7 +34,7 @@ public class JsonUtil {
                 Object firstItem = list.get(0);
                 if (firstItem != null) {
                     String className = firstItem.getClass().getSimpleName();
-                    if (className.contains("BlueDeviceInfo") || className.contains("DeviceInfo") || 
+                    if (className.contains("BlueDeviceInfo") || className.contains("DeviceInfo") ||
                         className.contains("BlueDeviceInfoEntity")) {
                         return convertBlueDeviceInfoListToJson(list);
                     }
@@ -50,7 +50,7 @@ public class JsonUtil {
         // 特殊处理：如果是BlueDeviceInfo相关的对象，尝试转换为Map
         if (object != null) {
             String className = object.getClass().getSimpleName();
-            if (className.contains("BlueDeviceInfo") || className.contains("DeviceInfo") || 
+            if (className.contains("BlueDeviceInfo") || className.contains("DeviceInfo") ||
                 className.contains("BlueDeviceInfoEntity")) {
                 Map<String, Object> deviceMap = convertBlueDeviceInfoToMap(object);
                 return new JSONObject(deviceMap).toString();
@@ -236,4 +236,4 @@ public class JsonUtil {
         // 可以使用反射或第三方库如BeanUtils
         throw new UnsupportedOperationException("Map转Bean需要根据项目实际情况实现");
     }
-}
+}