From e468832f4115530aa5db1c639718d55809d8e7b4 Mon Sep 17 00:00:00 2001 From: BlueMatthew Date: Fri, 5 Jan 2024 10:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E5=AD=97=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 尚未实际使用 --- app/src/main/cpp/CMakeLists.txt | 2 +- app/src/main/cpp/TextPaint.cpp | 5 ++++ app/src/main/cpp/TextPaint.h | 14 ++++++++++ .../java/com/xypower/mpapp/MainActivity.java | 27 ++++++++----------- gradle.properties | 3 ++- 5 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 app/src/main/cpp/TextPaint.cpp create mode 100644 app/src/main/cpp/TextPaint.h diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 6da32f1d..b94daaf7 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/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) diff --git a/app/src/main/cpp/TextPaint.cpp b/app/src/main/cpp/TextPaint.cpp new file mode 100644 index 00000000..c3541dd9 --- /dev/null +++ b/app/src/main/cpp/TextPaint.cpp @@ -0,0 +1,5 @@ +// +// Created by Matthew on 2024/1/4. +// + +#include "TextPaint.h" diff --git a/app/src/main/cpp/TextPaint.h b/app/src/main/cpp/TextPaint.h new file mode 100644 index 00000000..ba921442 --- /dev/null +++ b/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 diff --git a/app/src/main/java/com/xypower/mpapp/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java index 734a1e53..2b169230 100644 --- a/app/src/main/java/com/xypower/mpapp/MainActivity.java +++ b/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) { diff --git a/gradle.properties b/gradle.properties index 62bc21e1..29932da0 100644 --- a/gradle.properties +++ b/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 \ No newline at end of file +ncnnroot=D:/Workspace/deps/ncnn-20230517-android-vulkan