整理文件位置、项目的包结构，重新命名文件，重新对接Yolo接口

src/app/src/main/AndroidManifest.xml

@@ -21,11 +21,11 @@
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"
         android:label="@string/app_name" >
         <activity
-            android:name="wificar.SettingsActivity"
+            android:name="wificar.activity.AboutActivity"
             android:screenOrientation="landscape"
             android:exported="false" />
         <activity
-            android:name="wificar.MyMainFrm"
+            android:name="wificar.activity.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape" >
             <intent-filter>
@@ -35,11 +35,11 @@
             </intent-filter>
         </activity> <!-- 这里是另外一个Activity的配置 -->
         <activity
-            android:name="wificar.MyVideo"
+            android:name="wificar.activity.ControlActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape" />
         <activity
-            android:name="wificar.BgPictureShowActivity"
+            android:name="wificar.activity.BackgroundActivity"
             android:label="拍摄的照片"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.Dialog" />

src/app/src/main/cpp/jni_interface.cpp

@@ -56,7 +56,7 @@ JNIEXPORT void JNI_OnUnload(JavaVM *vm, void *reserved) {
                                          Yolov5
  ********************************************************************************************/
 extern "C" JNIEXPORT void JNICALL
-Java_wificar_YOLOv5_init(JNIEnv *env, jclass, jobject assetManager, jboolean useGPU) {
+Java_wificar_yolo_YOLOv5_init(JNIEnv *env, jclass, jobject assetManager, jboolean useGPU) {
     if (YoloV5::detector != nullptr) {
         delete YoloV5::detector;
         YoloV5::detector = nullptr;
@@ -68,7 +68,7 @@ Java_wificar_YOLOv5_init(JNIEnv *env, jclass, jobject assetManager, jboolean use
 }
 
 extern "C" JNIEXPORT jobjectArray JNICALL
-Java_wificar_YOLOv5_detect(JNIEnv *env, jclass, jobject image, jdouble threshold, jdouble nms_threshold) {
+Java_wificar_yolo_YOLOv5_detect(JNIEnv *env, jclass, jobject image, jdouble threshold, jdouble nms_threshold) {
     auto result = YoloV5::detector->detect(env, image, threshold, nms_threshold);
 
     auto box_cls = env->FindClass("wificar/Box");
@@ -86,7 +86,7 @@ Java_wificar_YOLOv5_detect(JNIEnv *env, jclass, jobject image, jdouble threshold
 
 // ***************************************[ Yolov5 Custom Layer ]****************************************
 extern "C" JNIEXPORT void JNICALL
-Java_wificar_YOLOv5_initCustomLayer(JNIEnv *env, jclass, jobject assetManager, jboolean useGPU) {
+Java_wificar_yolo_YOLOv5_initCustomLayer(JNIEnv *env, jclass, jobject assetManager, jboolean useGPU) {
     if (YoloV5CustomLayer::detector != nullptr) {
         delete YoloV5CustomLayer::detector;
         YoloV5CustomLayer::detector = nullptr;
@@ -98,7 +98,7 @@ Java_wificar_YOLOv5_initCustomLayer(JNIEnv *env, jclass, jobject assetManager, j
 }
 
 extern "C" JNIEXPORT jobjectArray JNICALL
-Java_wificar_YOLOv5_detectCustomLayer(JNIEnv *env, jclass, jobject image, jdouble threshold, jdouble nms_threshold) {
+Java_wificar_yolo_YOLOv5_detectCustomLayer(JNIEnv *env, jclass, jobject image, jdouble threshold, jdouble nms_threshold) {
     auto result = YoloV5CustomLayer::detector->detect(env, image, threshold, nms_threshold);
 
     auto box_cls = env->FindClass("wificar/Box");
@@ -197,7 +197,7 @@ Java_wificar_NanoDet_detect(JNIEnv *env, jclass, jobject image, jdouble threshol
  ********************************************************************************************/
 
 extern "C" JNIEXPORT void JNICALL
-Java_wificar_SimplePose_init(JNIEnv *env, jclass clazz, jobject assetManager, jboolean useGPU) {
+Java_wificar_yolo_SimplePose_init(JNIEnv *env, jclass clazz, jobject assetManager, jboolean useGPU) {
     if (SimplePose::detector != nullptr) {
         delete SimplePose::detector;
         SimplePose::detector = nullptr;
@@ -209,7 +209,7 @@ Java_wificar_SimplePose_init(JNIEnv *env, jclass clazz, jobject assetManager, jb
 }
 
 extern "C" JNIEXPORT jobjectArray JNICALL
-Java_wificar_SimplePose_detect(JNIEnv *env, jclass clazz, jobject image) {
+Java_wificar_yolo_SimplePose_detect(JNIEnv *env, jclass clazz, jobject image) {
     auto result = SimplePose::detector->detect(env, image);
 
     auto box_cls = env->FindClass("wificar/KeyPoint");

src/app/src/main/java/wificar/activity/AboutActivity.java

@@ -1,17 +1,15 @@
-package wificar;
+package wificar.activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 
 import my.wificar.R;
 
-public class SettingsActivity extends AppCompatActivity {
+public class AboutActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

src/app/src/main/java/wificar/activity/BackgroundActivity.java

@@ -1,6 +1,4 @@
-package wificar;
+package wificar.activity;
-
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
 
 import android.app.Activity;
 import android.content.Context;
@@ -13,8 +11,6 @@ import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -32,7 +28,7 @@ import java.util.List;
 
 import my.wificar.R;
 
-public class BgPictureShowActivity extends Activity implements
+public class BackgroundActivity extends Activity implements
         AdapterView.OnItemSelectedListener, ViewSwitcher.ViewFactory {
     /*
      *
@@ -75,7 +71,7 @@ public class BgPictureShowActivity extends Activity implements
             g.setOnItemClickListener(new OnItemClickListener() {
                 public void onItemClick(AdapterView<?> parent,
                                         View v, int position, long id) {
-                    Toast.makeText(BgPictureShowActivity.this, "µÚ" + (position + 1) + "ÕÅͼƬ", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(BackgroundActivity.this, "µÚ" + (position + 1) + "ÕÅͼƬ", Toast.LENGTH_SHORT).show();
                 }
             });
         } catch (Exception e) {

src/app/src/main/java/wificar/activity/ControlActivity.java

@@ -1,8 +1,7 @@
-package wificar;
+package wificar.activity;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.util.Log;
@@ -29,8 +28,13 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import my.wificar.R;
+import wificar.Configuration;
+import wificar.components.MySurfaceView;
+import wificar.components.RockerView;
+import wificar.network.SocketListener;
+import wificar.network.SoundSocketListener;
 
-public class MyVideo extends Activity {
+public class ControlActivity extends Activity {
     public static String CameraIp;
     public static String CtrlIp;
     public static String CtrlPort;

src/app/src/main/java/wificar/activity/MainActivity.java

@@ -1,31 +1,21 @@
-package wificar;
+package wificar.activity;
-/*小R科技（www.xiao-r.com）旗下
+
- * 中国FPV-WIFI机器人网·机器人创意工作室（www.wifi-robots.com）对此源码拥有所有权
- * 此源码仅供用户学习之用，严禁用作商业牟利
- * 如发现侵权行为，小R科技将择机通过法律途径予以起诉！
- * */
 
 import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
 import android.os.Bundle;
 import android.view.KeyEvent;
-import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import java.util.Random;
-
 import my.wificar.R;
+import wificar.Configuration;
+import wificar.yolo.SimplePose;
+import wificar.yolo.YOLOv5;
 
-public class MyMainFrm extends Activity {
+public class MainActivity extends Activity {
     
 //    EditText CameraIP, ControlIP, Port;
     LinearLayout Button_go;
@@ -76,7 +66,7 @@ public class MyMainFrm extends Activity {
 
             intent.putExtra("Is_Scale", true);
             //设置Intent对象要启动的Activity
-            intent.setClass(MyMainFrm.this, MyVideo.class);
+            intent.setClass(MainActivity.this, ControlActivity.class);
             //通过Intent对象启动另外一个Activity
             startActivity(intent);
         });
@@ -92,7 +82,7 @@ public class MyMainFrm extends Activity {
 
             intent.putExtra("Is_Scale", true);
             //设置Intent对象要启动的Activity
-            intent.setClass(MyMainFrm.this, SettingsActivity.class);
+            intent.setClass(MainActivity.this, AboutActivity.class);
             //通过Intent对象启动另外一个Activity
             startActivity(intent);
         });

src/app/src/main/java/wificar/components/MySurfaceView.java

@@ -1,47 +1,27 @@
-package wificar;
+package wificar.components;
-/*小R科技（www.xiao-r.com）旗下
- * 中国FPV-WIFI机器人网·机器人创意工作室（www.wifi-robots.com）对此源码拥有所有权
- * 此源码仅供用户学习之用，严禁用作商业牟利
- * 如发现侵权行为，小R科技将择机通过法律途径予以起诉！
- * */
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.ImageFormat;
-import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.YuvImage;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
-import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.Size;
 import android.view.SurfaceHolder;
 import android.view.SurfaceHolder.Callback;
 import android.view.SurfaceView;
-import android.widget.ImageView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.lifecycle.LifecycleOwner;
-
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -50,13 +30,19 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.ByteBuffer;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import my.wificar.R;
+import wificar.Configuration;
+import wificar.activity.ControlActivity;
+import wificar.yolo.Box;
+import wificar.yolo.Constant;
+import wificar.yolo.KeyPoint;
+import wificar.yolo.SimplePose;
+import wificar.yolo.YOLOv5;
 import wseemann.media.FFmpegMediaMetadataRetriever;
 
 public class MySurfaceView extends SurfaceView implements Callback {
@@ -74,12 +60,12 @@ public class MySurfaceView extends SurfaceView implements Callback {
     private Bitmap mBitmap;
     private boolean isThreadRunning = true;
 
-    private MyVideo activity;
+    private ControlActivity activity;
     private MySurfaceView floatingView;
 
     public MySurfaceView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        activity = (MyVideo) context;
+        activity = (ControlActivity) context;
         Constant.context = context;
         initialize();
         p = new Paint();

src/app/src/main/java/wificar/components/RockerView.java

@@ -1,4 +1,4 @@
-package wificar;
+package wificar.components;
 
 import android.app.Activity;
 import android.content.Context;

src/app/src/main/java/wificar/network/SocketListener.java

@@ -1,4 +1,4 @@
-package wificar;
+package wificar.network;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import my.wificar.R;
+import wificar.Configuration;
 
 public class SocketListener {
     private Activity activity;

src/app/src/main/java/wificar/network/SoundSocketListener.java

@@ -1,4 +1,4 @@
-package wificar;
+package wificar.network;
 
 import android.app.Activity;
 import android.os.AsyncTask;

src/app/src/main/java/wificar/yolo/Box.java

@@ -1,4 +1,4 @@
-package wificar;
+package wificar.yolo;
 
 import android.graphics.Color;
 import android.graphics.RectF;

src/app/src/main/java/wificar/yolo/Constant.java

@@ -1,4 +1,4 @@
-package wificar;
+package wificar.yolo;
 /*小R科技（www.xiao-r.com）旗下
  * 中国FPV-WIFI机器人网·机器人创意工作室（www.wifi-robots.com）对此源码拥有所有权
  * 此源码仅供用户学习之用，严禁用作商业牟利

src/app/src/main/java/wificar/yolo/KeyPoint.java

@@ -1,4 +1,4 @@
-package wificar;
+package wificar.yolo;
 
 
 public class KeyPoint {

src/app/src/main/java/wificar/yolo/SimplePose.java

@@ -1,4 +1,4 @@
-package wificar;
+package wificar.yolo;
 
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;

src/app/src/main/java/wificar/yolo/YOLOv5.java

@@ -1,8 +1,10 @@
-package wificar;
+package wificar.yolo;
 
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 
+import wificar.yolo.Box;
+
 public class YOLOv5 {
     static {
         System.loadLibrary("yolov5");

src/app/src/main/res/layout/activity_settings.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/settings_background"
-    tools:context="wificar.SettingsActivity">
+    tools:context="wificar.activity.AboutActivity">
 
     <Button
         android:id="@+id/back"

src/app/src/main/res/layout/myvideo.xml

@@ -4,7 +4,7 @@
     android:layout_width="fill_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="fill_parent">
-    <!--    <wificar.RockerView-->
+    <!--    <wificar.components.RockerView-->
     <!--        android:layout_width="100dp"-->
     <!--        android:layout_height="100dp"-->
     <!--        android:layout_marginStart="200dp"-->
@@ -13,7 +13,7 @@
     <!--        android:layout_marginBottom="200dp"-->
     <!--        android:visibility="visible"-->
     <!--        tools:visibility="visible" />-->
-    <wificar.MySurfaceView
+    <wificar.components.MySurfaceView
         android:id="@+id/mySurfaceViewVideo"
         android:layout_width="match_parent"
         android:layout_height="match_parent"