Merge pull request #15 from nfu-irs-lab/develop

Develop
nfu-irs-lab · Apr 23, 2023 · 95d372e · 95d372e
2 parents 711455e + 56b9a91
commit 95d372e
Show file tree

Hide file tree

Showing 405 changed files with 2,262 additions and 9,614 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
-/Bob_python/venv/
-/Bob_python/__pycache__/
-/Bob_python/.idea/
+*.iml
+.gradle
+/local.properties
+/.idea/
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/Bob_android/.gitignore b/Bob_android/.gitignore
diff --git a/Bob_android/README.md b/Bob_android/README.md
diff --git a/Bob_android/app/src/main/java/com/example/hiwin/teacher_version_bob/Constants.java b/Bob_android/app/src/main/java/com/example/hiwin/teacher_version_bob/Constants.java
diff --git a/Bob_android/app/src/main/java/com/example/hiwin/teacher_version_bob/ObjectAdaptor.java b/Bob_android/app/src/main/java/com/example/hiwin/teacher_version_bob/ObjectAdaptor.java
diff --git a/.../java/com/example/hiwin/teacher_version_bob/activity/InteractiveObjectDetectActivity.java b/.../java/com/example/hiwin/teacher_version_bob/activity/InteractiveObjectDetectActivity.java
diff --git a/...om/example/hiwin/teacher_version_bob/communication/bluetooth/framework/ConnectStatus.java b/...om/example/hiwin/teacher_version_bob/communication/bluetooth/framework/ConnectStatus.java
diff --git a/...ample/hiwin/teacher_version_bob/communication/bluetooth/framework/SerialReadStrategy.java b/...ample/hiwin/teacher_version_bob/communication/bluetooth/framework/SerialReadStrategy.java