增加文字绘制相关的实现

尚未实际使用

app/src/main/cpp/CMakeLists.txt

@@ -61,7 +61,7 @@ find_package(ncnn REQUIRED)
 
 SET(YAMC_INC_DIR ${CMAKE_SOURCE_DIR})
 
-SET(TERM_CORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../xymp/Core)
+# SET(TERM_CORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../xymp/Core)
 #SET(TERM_CORE_ROOT D:/Workspace/xymp/Core)
 
 SET(JSONCPP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp)

app/src/main/cpp/TextPaint.cpp

@@ -0,0 +1,5 @@
+//
+// Created by Matthew on 2024/1/4.
+//
+
+#include "TextPaint.h"

app/src/main/cpp/TextPaint.h

@@ -0,0 +1,14 @@
+//
+// Created by Matthew on 2024/1/4.
+//
+
+#ifndef MICROPHOTO_TEXTPAINT_H
+#define MICROPHOTO_TEXTPAINT_H
+
+
+class TextPaint {
+
+};
+
+
+#endif //MICROPHOTO_TEXTPAINT_H

app/src/main/java/com/xypower/mpapp/MainActivity.java

@@ -1,7 +1,6 @@
 package com.xypower.mpapp;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -30,18 +29,12 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.dev.devapi.api.SysApi;
 import com.dowse.camera.client.DSCameraManager;
 import com.xypower.common.MicroPhotoContext;
-import com.xypower.common.ViewUtils;
 import com.xypower.mpapp.databinding.ActivityMainBinding;
 import com.xypower.mpapp.utils.RandomReader;
 
@@ -269,50 +262,50 @@ public class MainActivity extends AppCompatActivity {
         this.binding.takePhotoBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 1, 255, true);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 1, 255, true);
             }
         });
         this.binding.takePhotoBtn2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 2, 255, true);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 2, 255, true);
             }
         });
         this.binding.takePhotoBtn3.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 3, 255, true);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 3, 255, true);
             }
         });
         this.binding.takePhotoBtn4.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 4, 255, true);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 4, 255, true);
             }
         });
 
         this.binding.takeVideoBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 1, 255, false);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 1, 255, false);
             }
         });
         this.binding.takeVideoBtn2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 2, 255, false);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 2, 255, false);
             }
         });
         this.binding.takeVideoBtn3.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 3, 255, false);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 3, 255, false);
             }
         });
         this.binding.takeVideoBtn4.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MicroPhotoService.takePhoto(view.getContext(), 4, 255, false);
+                MicroPhotoService.takePhoto(view.getContext().getApplicationContext(), 4, 255, false);
             }
         });
 
@@ -449,6 +442,9 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+
+
+
         binding.btnSendHb.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -491,7 +487,6 @@ public class MainActivity extends AppCompatActivity {
 
     }
 
-
     public static void startMicroPhotoService(Context context, MicroPhotoContext.AppConfig curAppConfig, Messenger messenger) {
 
         if (TextUtils.isEmpty(curAppConfig.cmdid) || TextUtils.isEmpty(curAppConfig.server) || curAppConfig.port == 0) {

gradle.properties

@@ -19,7 +19,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # opencvsdk=D:/Workspace/deps/opencv-mobile-4.8.0-android
+coreroot=D:/Workspace/Github/xymp/Core
 opencvsdk=D:/Workspace/deps/opencv-v5
 asioroot=D:/Workspace/deps/asio-1.28.0
 evpproot=D:/Workspace/Github/evpp
-ncnnroot=D:/Workspace/deps/ncnn-20230517-android-vulkan
+ncnnroot=D:/Workspace/deps/ncnn-20230517-android-vulkan