From 5bf2ad06456d3139cba27238d1041bd02046a618 Mon Sep 17 00:00:00 2001
From: g_miss_n <g_miss_n@email>
Date: Sun, 13 Jul 2025 09:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/main/AndroidManifest.xml                 | 12 ++++++------
 .../{ => Activities}/ChartAnalysisActivity.java      |  5 ++++-
 .../{ => Activities}/DeviceListActivity.java         |  2 +-
 .../{ => Activities}/HistoryActivity.java            |  6 +++++-
 .../{ => Activities}/MainActivity.java               |  5 ++++-
 .../{ => Activities}/PresetManagerActivity.java      |  5 ++++-
 .../{ => Activities}/SettingsActivity.java           |  2 +-
 .../{ => Database}/DatabaseHelper.java               |  6 +++++-
 .../Bluetooh_736_2/{ => Models}/DataStatistics.java  |  2 +-
 .../Bluetooh_736_2/{ => Models}/PresetScheme.java    |  2 +-
 .../test/Bluetooh_736_2/{ => Models}/SensorData.java |  2 +-
 11 files changed, 33 insertions(+), 16 deletions(-)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Activities}/ChartAnalysisActivity.java (99%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Activities}/DeviceListActivity.java (99%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Activities}/HistoryActivity.java (98%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Activities}/MainActivity.java (99%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Activities}/PresetManagerActivity.java (99%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Activities}/SettingsActivity.java (99%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Database}/DatabaseHelper.java (99%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Models}/DataStatistics.java (98%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Models}/PresetScheme.java (99%)
 rename Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/{ => Models}/SensorData.java (98%)

diff --git a/Battlefield detection system_app/app/src/main/AndroidManifest.xml b/Battlefield detection system_app/app/src/main/AndroidManifest.xml
index 8e9b8f7..b5c5d39 100644
--- a/Battlefield detection system_app/app/src/main/AndroidManifest.xml	
+++ b/Battlefield detection system_app/app/src/main/AndroidManifest.xml	
@@ -24,7 +24,7 @@
     <!-- 应用配置 -->
     <application android:icon="@mipmap/ic_launcher" android:label="@string/app_name">
         <!-- 主活动 -->
-        <activity android:name="com.test.Bluetooh_736_2.MainActivity"
+        <activity android:name="com.test.Bluetooh_736_2.Activities.MainActivity"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -32,24 +32,24 @@
             </intent-filter>
         </activity>
         <!-- 设备列表活动 -->
-        <activity android:name="com.test.Bluetooh_736_2.DeviceListActivity"
+        <activity android:name="com.test.Bluetooh_736_2.Activities.DeviceListActivity"
                   android:label="选取连接设备"
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboardHidden" />
         <!-- 历史数据活动 -->
-        <activity android:name="com.test.Bluetooh_736_2.HistoryActivity"
+        <activity android:name="com.test.Bluetooh_736_2.Activities.HistoryActivity"
                   android:label="历史数据记录"
                   android:configChanges="orientation|keyboardHidden" />
         <!-- 系统设置活动 -->
-        <activity android:name="com.test.Bluetooh_736_2.SettingsActivity"
+        <activity android:name="com.test.Bluetooh_736_2.Activities.SettingsActivity"
                   android:label="系统设置"
                   android:configChanges="orientation|keyboardHidden" />
         <!-- 预设方案管理活动 -->
-        <activity android:name="com.test.Bluetooh_736_2.PresetManagerActivity"
+        <activity android:name="com.test.Bluetooh_736_2.Activities.PresetManagerActivity"
                   android:label="预设方案管理"
                   android:configChanges="orientation|keyboardHidden" />
         <!-- 图表分析活动 -->
-        <activity android:name="com.test.Bluetooh_736_2.ChartAnalysisActivity"
+        <activity android:name="com.test.Bluetooh_736_2.Activities.ChartAnalysisActivity"
                   android:label="数据图表分析"
                   android:configChanges="orientation|keyboardHidden" />
     </application>
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/ChartAnalysisActivity.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/ChartAnalysisActivity.java
similarity index 99%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/ChartAnalysisActivity.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/ChartAnalysisActivity.java
index 6d6282e..0af1db4 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/ChartAnalysisActivity.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/ChartAnalysisActivity.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Activities;
 
 import android.app.Activity;
 import android.graphics.Color;
@@ -30,6 +30,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import com.test.Bluetooh_736_2.Database.DatabaseHelper;
+import com.test.Bluetooh_736_2.Models.SensorData;
+
 public class ChartAnalysisActivity extends Activity {
     
     // UI组件
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DeviceListActivity.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/DeviceListActivity.java
similarity index 99%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DeviceListActivity.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/DeviceListActivity.java
index 3a711fe..e0d3191 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DeviceListActivity.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/DeviceListActivity.java	
@@ -15,7 +15,7 @@
  */
 
 // 导入必要的包
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Activities;
 
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/HistoryActivity.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/HistoryActivity.java
similarity index 98%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/HistoryActivity.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/HistoryActivity.java
index 60943ac..226f830 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/HistoryActivity.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/HistoryActivity.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Activities;
 
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -28,6 +28,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import com.test.Bluetooh_736_2.Database.DatabaseHelper;
+import com.test.Bluetooh_736_2.Models.SensorData;
+import com.test.Bluetooh_736_2.Models.DataStatistics;
+
 public class HistoryActivity extends Activity {
     
     private DatabaseHelper databaseHelper;
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/MainActivity.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/MainActivity.java
similarity index 99%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/MainActivity.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/MainActivity.java
index b413e96..f2c7dbd 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/MainActivity.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/MainActivity.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Activities;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,6 +41,9 @@ import android.widget.Toast;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.test.Bluetooh_736_2.Database.DatabaseHelper;
+import com.test.Bluetooh_736_2.Models.PresetScheme;
+
 public class MainActivity extends Activity  {
 
 	private final static int REQUEST_CONNECT_DEVICE = 1;    //宏定义查询设备句柄
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/PresetManagerActivity.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/PresetManagerActivity.java
similarity index 99%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/PresetManagerActivity.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/PresetManagerActivity.java
index b6d6ddc..dc7112d 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/PresetManagerActivity.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/PresetManagerActivity.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -21,6 +21,9 @@ import android.widget.Toast;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.test.Bluetooh_736_2.Database.DatabaseHelper;
+import com.test.Bluetooh_736_2.Models.PresetScheme;
+
 public class PresetManagerActivity extends Activity {
     
     private ListView listPresets;
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/SettingsActivity.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/SettingsActivity.java
similarity index 99%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/SettingsActivity.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/SettingsActivity.java
index 833aa57..6d8b55d 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/SettingsActivity.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Activities/SettingsActivity.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Activities;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DatabaseHelper.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Database/DatabaseHelper.java
similarity index 99%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DatabaseHelper.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Database/DatabaseHelper.java
index 7055af5..5077cac 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DatabaseHelper.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Database/DatabaseHelper.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Database;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -12,6 +12,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import com.test.Bluetooh_736_2.Models.SensorData;
+import com.test.Bluetooh_736_2.Models.DataStatistics;
+import com.test.Bluetooh_736_2.Models.PresetScheme;
+
 public class DatabaseHelper extends SQLiteOpenHelper {
     
     // 数据库基本信息
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DataStatistics.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/DataStatistics.java
similarity index 98%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DataStatistics.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/DataStatistics.java
index cff1749..aefcdcd 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/DataStatistics.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/DataStatistics.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Models;
 
 /**
  * 数据统计模型类
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/PresetScheme.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/PresetScheme.java
similarity index 99%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/PresetScheme.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/PresetScheme.java
index 89432b1..c6b0512 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/PresetScheme.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/PresetScheme.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Models;
 
 /**
  * 预设方案数据模型
diff --git a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/SensorData.java b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/SensorData.java
similarity index 98%
rename from Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/SensorData.java
rename to Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/SensorData.java
index c97f2b0..9a227c9 100644
--- a/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/SensorData.java	
+++ b/Battlefield detection system_app/app/src/main/java/com/test/Bluetooh_736_2/Models/SensorData.java	
@@ -1,4 +1,4 @@
-package com.test.Bluetooh_736_2;
+package com.test.Bluetooh_736_2.Models;
 
 /**
  * 传感器数据模型类