添加日志上传button

diff --git a/.idea/.name b/.idea/.name
new file mode 100644 (file)
index 0000000..c47d2e5
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+HsBleSdk
\ No newline at end of file

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644 (file)
index 0000000..cbd68d1
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project version="4">\r
+  <component name="deploymentTargetSelector">\r
+    <selectionStates>\r
+      <SelectionState runConfigName="app">\r
+        <option name="selectionMode" value="DROPDOWN" />\r
+        <DropdownSelection timestamp="2024-10-05T08:58:28.647280Z">\r
+          <Target type="DEFAULT_BOOT">\r
+            <handle>\r
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=FMR0223B14006338" />\r
+            </handle>\r
+          </Target>\r
+        </DropdownSelection>\r
+        <DialogSelection />\r
+      </SelectionState>\r
+    </selectionStates>\r
+  </component>\r
+</project>
\ No newline at end of file

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b35a162..5ef5cbd 100644 (file)
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -15,6 +13,7 @@
             <option value="$PROJECT_DIR$/hssdk" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644 (file)
index 0000000..48052b2
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project version="4">\r
+  <component name="ProjectMigrations">\r
+    <option name="MigrateToGradleLocalJavaHome">\r
+      <set>\r
+        <option value="$PROJECT_DIR$" />\r
+      </set>\r
+    </option>\r
+  </component>\r
+</project>
\ No newline at end of file

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644 (file)
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file

diff --git a/app/src/main/java/com/zhixun/blesdk/debug_tool/MainActivity.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/MainActivity.java
index 7ab4a27..4222353 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/debug_tool/MainActivity.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/MainActivity.java
@@ -25,6 +25,7 @@ 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.IFileReceiverCallback;
 import com.zhixun.blesdk.hssdk.callback.OnMsgSendCallBack;
 import com.zhixun.blesdk.hssdk.entity.E3MsgBody;
 import com.zhixun.blesdk.hssdk.entity.HsAlarmItem;
@@ -187,8 +188,6 @@ public class MainActivity extends AppCompatActivity {
                         deviceAdapter.setList(bluetoothDevices);
                     }
                 });
-
-
             }
 
             @Override

diff --git a/app/src/main/java/com/zhixun/blesdk/debug_tool/OtaActivity.java b/app/src/main/java/com/zhixun/blesdk/debug_tool/OtaActivity.java
index 7631f11..7683b44 100644 (file)
--- a/app/src/main/java/com/zhixun/blesdk/debug_tool/OtaActivity.java
+++ b/app/src/main/java/com/zhixun/blesdk/debug_tool/OtaActivity.java
@@ -18,6 +18,7 @@ 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 com.zhixun.blesdk.hssdk.HsAgentSdk;
+import com.zhixun.blesdk.hssdk.callback.IFileReceiverCallback;
 import com.zhixun.blesdk.hssdk.callback.ISendFileListener;
 import com.zhixun.blesdk.hssdk.entity.OTAInfo;
 
@@ -34,6 +35,7 @@ public class OtaActivity extends AppCompatActivity {
     private MsgAdapter msgAdapter;
     private ArrayList<String> msg;
     private Button btn_ota_chose;
+    private Button btn_getLog;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -42,6 +44,7 @@ public class OtaActivity extends AppCompatActivity {
         LinearLayoutManager layoutManager2 = new LinearLayoutManager(this);
         msg_list.setLayoutManager(layoutManager2);
         btn_ota_chose = findViewById(R.id.btn_chose_ota);
+        btn_getLog = findViewById(R.id.btn_getlog);
         msg = new ArrayList<>();
         msgAdapter = new MsgAdapter(this,msg);
         msg_list.setAdapter(msgAdapter);
@@ -51,6 +54,13 @@ public class OtaActivity extends AppCompatActivity {
                 pickFile();
             }
         });
+
+        btn_getLog.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getLog();
+            }
+        });
     }
     private int REQUEST_CODE_FILE_PICKER = 1001;
     // 启动文件选择器
@@ -150,4 +160,30 @@ public class OtaActivity extends AppCompatActivity {
     public void back(View view){
         finish();
     }
+
+    private void getLog()
+    {
+        HsAgentSdk.getInstance().getAPI().getDeviceLog(new IFileReceiverCallback() {
+            @Override
+            public void onProgressChange(String progress) {
+                OtaActivity.this.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        print_msg_to_end_of_view("文件接收进度: "+progress);
+                    }
+                });
+            }
+
+            @Override
+            public void onFileSendStateChange(int state, String msg) {
+
+                OtaActivity.this.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        print_msg_to_end_of_view("表盘发送状态: "+state+"--"+msg);
+                    }
+                });
+            }
+        });
+    }
 }
\ No newline at end of file

diff --git a/app/src/main/res/layout/activity_ota.xml b/app/src/main/res/layout/activity_ota.xml
index af2d4bf..1c97655 100644 (file)
--- a/app/src/main/res/layout/activity_ota.xml
+++ b/app/src/main/res/layout/activity_ota.xml
@@ -31,4 +31,11 @@
         android:layout_marginTop="10dp"
         android:text="OTA文件选择"/>
 
+    <Button
+        android:id="@+id/btn_getlog"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="下载日志" />
+
 </LinearLayout>
\ No newline at end of file