更名为HsDebugtool 专门为生产、调试等场景使用。

diff --git a/app/build.gradle b/app/build.gradle
index 2c1a8df..2387500 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,15 +3,15 @@ plugins {
 }
 
 android {
-    namespace 'com.zhixun.blesdk.app'
+    namespace 'com.zhixun.blesdk.debug_tool'
     compileSdk 33
 
     defaultConfig {
-        applicationId "com.zhixun.blesdk.app"
+        applicationId "com.zhixun.blesdk.debug_tool"
         minSdk 24
         targetSdk 33
-        versionCode 2
-        versionName "1.2"
+        versionCode 3
+        versionName "1.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -30,7 +30,7 @@ android {
     android.applicationVariants.all{ variant ->
         variant.outputs.all{
             def createTime = new Date().format("YYYYMMddHH", TimeZone.getTimeZone("GMT+08:00"))
-            def fileName = "Hs-sdk_${defaultConfig.versionName}_${buildType.name}_${createTime}.apk"
+            def fileName = "hs_debugtool_${defaultConfig.versionName}_${buildType.name}_${createTime}.apk"
             outputFileName = fileName
         }
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b4da03..c1347ff 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,19 +29,19 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".AiLogActivity"
+            android:name="com.zhixun.blesdk.debug_tool.AiLogActivity"
             android:exported="false" />
         <activity
             android:name=".PicTestActivity"
             android:exported="false" />
         <activity
-            android:name=".DialTestActivity"
+            android:name="com.zhixun.blesdk.debug_tool.DialTestActivity"
             android:exported="false" />
         <activity
-            android:name=".TestActivity"
+            android:name="com.zhixun.blesdk.debug_tool.TestActivity"
             android:exported="false" />
         <activity
-            android:name=".MainActivity"
+            android:name="com.zhixun.blesdk.debug_tool.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/zhixun/blesdk/app/utils/test.java b/app/src/main/java/com/zhixun/blesdk/app/utils/test.java
deleted file mode 100644 (file)
index e60044f..0000000
--- a/app/src/main/java/com/zhixun/blesdk/app/utils/test.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.zhixun.blesdk.app.utils;
-
-public class test {
-
-}

diff --git a/app/src/main/java/com/zhixun/blesdk/app/AiLogActivity.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/AiLogActivity.java
similarity index 94%
rename from app/src/main/java/com/zhixun/blesdk/app/AiLogActivity.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/AiLogActivity.java
index 3091f63..f8bcd07 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/AiLogActivity.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/AiLogActivity.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app;
+package com.zhixun.blesdk.debug_tool;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -6,9 +6,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import android.os.Bundle;
 import android.view.View;
-import android.widget.ListView;
 
-import com.zhixun.blesdk.app.adapter.MsgAdapter;
+import com.zhixun.blesdk.debug_tool.R;
+import com.zhixun.blesdk.debug_tool.adapter.MsgAdapter;
 import com.zhixun.blesdk.hssdk.data.AiManage;
 
 import java.util.ArrayList;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/DialTestActivity.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/DialTestActivity.java
similarity index 93%
rename from app/src/main/java/com/zhixun/blesdk/app/DialTestActivity.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/DialTestActivity.java
index c436a20..01c06c0 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/DialTestActivity.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/DialTestActivity.java
@@ -1,32 +1,25 @@
-package com.zhixun.blesdk.app;
+package com.zhixun.blesdk.debug_tool;
 
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.documentfile.provider.DocumentFile;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.content.ActivityNotFoundException;
-import android.content.ContentUris;
-import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ListView;
 import android.widget.Toast;
 
-import com.zhixun.blesdk.app.adapter.MsgAdapter;
-import com.zhixun.blesdk.app.utils.FileHelper;
+import com.zhixun.blesdk.debug_tool.R;
+import com.zhixun.blesdk.debug_tool.adapter.MsgAdapter;
+import com.zhixun.blesdk.debug_tool.utils.FileHelper;
 import com.zhixun.blesdk.hssdk.HsAgentSdk;
 import com.zhixun.blesdk.hssdk.callback.ISendFileListener;
 import com.zhixun.blesdk.hssdk.entity.file.HsMarketDialSum;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/MainActivity.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/MainActivity.java
similarity index 97%
rename from app/src/main/java/com/zhixun/blesdk/app/MainActivity.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/MainActivity.java
index 4d91006..be296e3 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/MainActivity.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/MainActivity.java
@@ -1,11 +1,10 @@
-package com.zhixun.blesdk.app;
+package com.zhixun.blesdk.debug_tool;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
@@ -18,19 +17,17 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.gson.Gson;
-import com.zhixun.blesdk.app.adapter.DeviceAdapter;
-import com.zhixun.blesdk.app.utils.ByteTools;
-import com.zhixun.blesdk.app.utils.PermissionUtil;
+import com.zhixun.blesdk.debug_tool.R;
+import com.zhixun.blesdk.debug_tool.adapter.DeviceAdapter;
+import com.zhixun.blesdk.debug_tool.utils.PermissionUtil;
 import com.zhixun.blesdk.hssdk.HsAgentSdk;
 import com.zhixun.blesdk.hssdk.callback.BtVtransferCallback;
 import com.zhixun.blesdk.hssdk.callback.IBtScanCallback;
 import com.zhixun.blesdk.hssdk.callback.OnMsgSendCallBack;
 import com.zhixun.blesdk.hssdk.entity.E3MsgBody;
 import com.zhixun.blesdk.hssdk.entity.HsAlarmItem;
-import com.zhixun.blesdk.hssdk.entity.HsSleepItem;
 import com.zhixun.blesdk.hssdk.entity.MsgBody;
 import com.zhixun.blesdk.hssdk.entity.MsgResponse;
 import com.zhixun.blesdk.hssdk.entity.HsWearDevice;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/TestActivity.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/TestActivity.java
similarity index 95%
rename from app/src/main/java/com/zhixun/blesdk/app/TestActivity.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/TestActivity.java
index ad49ae4..dc2ad52 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/TestActivity.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/TestActivity.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app;
+package com.zhixun.blesdk.debug_tool;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -12,12 +12,12 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ListView;
 import android.widget.Toast;
 
-import com.zhixun.blesdk.app.adapter.MsgAdapter;
-import com.zhixun.blesdk.app.utils.FileHelper;
-import com.zhixun.blesdk.app.utils.FuncationChosePopupWindow;
+import com.zhixun.blesdk.debug_tool.R;
+import com.zhixun.blesdk.debug_tool.adapter.MsgAdapter;
+import com.zhixun.blesdk.debug_tool.utils.FileHelper;
+import com.zhixun.blesdk.debug_tool.utils.FuncationChosePopupWindow;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/adapter/DeviceAdapter.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/DeviceAdapter.java
similarity index 95%
rename from app/src/main/java/com/zhixun/blesdk/app/adapter/DeviceAdapter.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/DeviceAdapter.java
index 3af7ed9..0b68880 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/adapter/DeviceAdapter.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/DeviceAdapter.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app.adapter;
+package com.zhixun.blesdk.debug_tool.adapter;
 
 import android.Manifest;
 import android.content.Context;
@@ -11,7 +11,7 @@ import android.widget.TextView;
 
 import androidx.core.app.ActivityCompat;
 
-import com.zhixun.blesdk.app.R;
+import com.zhixun.blesdk.debug_tool.R;
 import com.zhixun.blesdk.hssdk.entity.HsWearDevice;
 
 import java.util.List;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/adapter/FuncationAdapter.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/FuncationAdapter.java
similarity index 94%
rename from app/src/main/java/com/zhixun/blesdk/app/adapter/FuncationAdapter.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/FuncationAdapter.java
index 566c981..6b573bb 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/adapter/FuncationAdapter.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/FuncationAdapter.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app.adapter;
+package com.zhixun.blesdk.debug_tool.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,7 +7,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.zhixun.blesdk.app.R;
+import com.zhixun.blesdk.debug_tool.R;
 
 import java.util.ArrayList;
 

diff --git a/app/src/main/java/com/zhixun/blesdk/app/adapter/MsgAdapter.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/MsgAdapter.java
similarity index 95%
rename from app/src/main/java/com/zhixun/blesdk/app/adapter/MsgAdapter.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/MsgAdapter.java
index efdbed9..83a7fe7 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/adapter/MsgAdapter.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/adapter/MsgAdapter.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app.adapter;
+package com.zhixun.blesdk.debug_tool.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -8,7 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.zhixun.blesdk.app.R;
+import com.zhixun.blesdk.debug_tool.R;
 
 import java.util.ArrayList;
 

diff --git a/app/src/main/java/com/zhixun/blesdk/app/utils/ByteTools.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/ByteTools.java
similarity index 99%
rename from app/src/main/java/com/zhixun/blesdk/app/utils/ByteTools.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/utils/ByteTools.java
index 20a6d7c..3365fe9 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/utils/ByteTools.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/ByteTools.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app.utils;
+package com.zhixun.blesdk.debug_tool.utils;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/utils/FileHelper.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/FileHelper.java
similarity index 99%
rename from app/src/main/java/com/zhixun/blesdk/app/utils/FileHelper.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/utils/FileHelper.java
index 95f90ab..3b88fc6 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/utils/FileHelper.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/FileHelper.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app.utils;
+package com.zhixun.blesdk.debug_tool.utils;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/utils/FuncationChosePopupWindow.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/FuncationChosePopupWindow.java
similarity index 99%
rename from app/src/main/java/com/zhixun/blesdk/app/utils/FuncationChosePopupWindow.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/utils/FuncationChosePopupWindow.java
index 9c57c05..6139bf3 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/utils/FuncationChosePopupWindow.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/FuncationChosePopupWindow.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app.utils;
+package com.zhixun.blesdk.debug_tool.utils;
 
 
 import android.app.Activity;
@@ -16,8 +16,8 @@ import android.widget.ListView;
 import android.widget.PopupWindow;
 
 import com.google.gson.Gson;
-import com.zhixun.blesdk.app.R;
-import com.zhixun.blesdk.app.adapter.FuncationAdapter;
+import com.zhixun.blesdk.debug_tool.R;
+import com.zhixun.blesdk.debug_tool.adapter.FuncationAdapter;
 import com.zhixun.blesdk.hssdk.HsAgentSdk;
 import com.zhixun.blesdk.hssdk.callback.IFileReceiverCallback;
 import com.zhixun.blesdk.hssdk.callback.ISendFileListener;
@@ -50,7 +50,6 @@ import com.zhixun.blesdk.hssdk.entity.HsValueItem;
 import com.zhixun.blesdk.hssdk.entity.HsWaterRemind;
 import com.zhixun.blesdk.hssdk.entity.MsgBody;
 import com.zhixun.blesdk.hssdk.entity.MsgResponse;
-import com.zhixun.blesdk.hssdk.entity.file.HsCustomDialSum;
 import com.zhixun.blesdk.hssdk.entity.file.HsMarketDialSum;
 
 import java.io.File;

diff --git a/app/src/main/java/com/zhixun/blesdk/app/utils/PermissionUtil.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/PermissionUtil.java
similarity index 97%
rename from app/src/main/java/com/zhixun/blesdk/app/utils/PermissionUtil.java
rename to app/src/main/java/com/zhixun/blesdk/debug_tool/utils/PermissionUtil.java
index cbd0fcf..c0b41d9 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/app/utils/PermissionUtil.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/PermissionUtil.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app.utils;
+package com.zhixun.blesdk.debug_tool.utils;
 
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 

diff --git a/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/test.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/test.java
new file mode 100644 (file)
index 0000000..61e4179
--- /dev/null
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/utils/test.java
@@ -0,0 +1,5 @@
+package com.zhixun.blesdk.debug_tool.utils;
+
+public class test {
+
+}

diff --git a/app/src/main/res/layout/activity_ai_log.xml b/app/src/main/res/layout/activity_ai_log.xml
index 220585f..d35282b 100644 (file)
--- a/app/src/main/res/layout/activity_ai_log.xml
+++ b/app/src/main/res/layout/activity_ai_log.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".TestActivity"
+    tools:context="com.zhixun.blesdk.debug_tool.TestActivity"
     android:orientation="vertical"
     android:id="@+id/parent">
 

diff --git a/app/src/main/res/layout/activity_dial_test.xml b/app/src/main/res/layout/activity_dial_test.xml
index 4f57181..660e7f1 100644 (file)
--- a/app/src/main/res/layout/activity_dial_test.xml
+++ b/app/src/main/res/layout/activity_dial_test.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".TestActivity"
+    tools:context="com.zhixun.blesdk.debug_tool.TestActivity"
     android:orientation="vertical"
     android:id="@+id/parent">
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dbcdc7e..7bad264 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
+    tools:context="com.zhixun.blesdk.debug_tool.MainActivity"
     android:orientation="vertical"
     android:background="#F6F6F6">
 

diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml
index 485dde9..2ff7853 100644 (file)
--- a/app/src/main/res/layout/activity_test.xml
+++ b/app/src/main/res/layout/activity_test.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".TestActivity"
+    tools:context="com.zhixun.blesdk.debug_tool.TestActivity"
     android:orientation="vertical"
     android:id="@+id/parent">
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 70525b6..9d5bd24 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">HsBleSdk</string>
+    <string name="app_name">HsDebugTool</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/test/java/com/zhixun/blesdk/app/ExampleUnitTest.java b/app/src/test/java/com/zhixun/blesdk/debug_tool/ExampleUnitTest.java
similarity index 89%
rename from app/src/test/java/com/zhixun/blesdk/app/ExampleUnitTest.java
rename to app/src/test/java/com/zhixun/blesdk/debug_tool/ExampleUnitTest.java
index 1a4ccbc..1425b47 100644 (file)
--- a/app/src/test/java/com/zhixun/blesdk/app/ExampleUnitTest.java
+++ b/app/src/test/java/com/zhixun/blesdk/debug_tool/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.zhixun.blesdk.app;
+package com.zhixun.blesdk.debug_tool;
 
 import org.junit.Test;