提交

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>

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组件

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;

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;

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;    //宏定义查询设备句柄

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;

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;

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 {
     
     // 数据库基本信息

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;
 
 /**
  * 数据统计模型类

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;
 
 /**
  * 预设方案数据模型

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;
 
 /**
  * 传感器数据模型类