zhunk 1 ano atrás
pai
commit
7359584419

+ 13 - 13
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.1, 2025-11-03T09:05:20. -->
+<!-- Written by QtCreator 14.0.1, 2025-11-07T12:03:04. -->
 <qtcreator>
 <qtcreator>
  <data>
  <data>
   <variable>EnvironmentId</variable>
   <variable>EnvironmentId</variable>
@@ -102,24 +102,24 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_BUILD_TYPE:STRING=Release
--DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+    <value type="QString" key="CMake.Initial.Parameters">-DANDROID_ABI:STRING=arm64-v8a
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DANDROID_NATIVE_API_LEVEL:STRING=23
--DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DANDROID_ABI:STRING=arm64-v8a
--DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
 -DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
 -DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
 -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
 -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DANDROID_NATIVE_API_LEVEL:STRING=23
 -DANDROID_NDK:PATH=F:/Android_Env/android-ndk-r23c
 -DANDROID_NDK:PATH=F:/Android_Env/android-ndk-r23c
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android-ndk-r23c/build/cmake/android.toolchain.cmake
+-DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
 -DCMAKE_GENERATOR:STRING=Ninja
 -DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DANDROID_STL:STRING=c++_shared
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake</value>
+-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DANDROID_STL:STRING=c++_shared</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\QT_WorkSpace\qt6_iot_all\build-q6_felgo_iot-Qt_6_4_1_android_arm64_v8a_Clang_arm64_v8a-Release</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\QT_WorkSpace\qt6_iot_all\build-q6_felgo_iot-Qt_6_4_1_android_arm64_v8a_Clang_arm64_v8a-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">

+ 10 - 0
q6_felgo_iot/Readme.md

@@ -1,3 +1,13 @@
+
+## 20251104
+    #define APP_VERSION "1.3.18"
+    更新说明:
+        修复mqtt不停上报最新数据问题;
+## 20251103
+    #define APP_VERSION "1.3.17"
+    更新说明:
+        修复读取/设置主板参数/数据后  mqtt不上报最新数据问题;
+
 #### 20251101
 #### 20251101
     #define APP_VERSION "1.3.16"
     #define APP_VERSION "1.3.16"
     更新说明:
     更新说明:

+ 0 - 1
q6_felgo_iot/android/src/com/yfkj/cb/Q6iot/Backlight.java

@@ -12,7 +12,6 @@ import android.provider.Settings;
 
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.ContextCompat;
-
 /**
 /**
  * 背光亮度设置
  * 背光亮度设置
  * AndroidManifest.xml 需要声明权限 <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
  * AndroidManifest.xml 需要声明权限 <uses-permission android:name="android.permission.WRITE_SETTINGS"/>

+ 35 - 0
q6_felgo_iot/android/src/com/yfkj/cb/Q6iot/GetUsbPermission.java

@@ -16,12 +16,14 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.io.DataOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.IOException;
+import android.os.PowerManager;
 
 
 public class GetUsbPermission extends QtNative
 public class GetUsbPermission extends QtNative
 {
 {
 
 
     protected static UsbManager usbManager;
     protected static UsbManager usbManager;
     private static UsbDevice camdev = null;
     private static UsbDevice camdev = null;
+    private static PowerManager.WakeLock wakeLock = null;
 
 
 //    public GetPermission()
 //    public GetPermission()
 //    {
 //    {
@@ -109,5 +111,38 @@ public class GetUsbPermission extends QtNative
         }
         }
 
 
     }
     }
+    /**
+     * 执行shell命令(需要root权限)
+     */
+    public static void executeShellCommand(String command) {
+        try {
+            Process process = Runtime.getRuntime().exec("su");
+            DataOutputStream os = new DataOutputStream(process.getOutputStream());
+            os.writeBytes(command + "\n");
+            os.writeBytes("exit\n");
+            os.flush();
+            process.waitFor();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 关闭屏幕(需要root)
+     */
+    public static void turnScreenOff() {
+        executeShellCommand("input keyevent KEYCODE_POWER");
+        // 或者使用数字代码
+        // executeShellCommand("input keyevent 26");
+    }
+
+    /**
+     * 打开屏幕(需要root)
+     */
+    public static void turnScreenOn() {
+        executeShellCommand("input keyevent KEYCODE_POWER");
+        // 或者使用唤醒命令
+        // executeShellCommand("input keyevent KEYCODE_WAKEUP");
+    }
 
 
 }
 }

+ 1 - 1
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
 
-#define APP_VERSION "1.3.16"
+#define APP_VERSION "1.3.18"
 
 
 using namespace std;
 using namespace std;
 
 

+ 8 - 0
q6_felgo_iot/header/mserial.h

@@ -73,7 +73,15 @@ public:
         if (qtContext.isValid()) {
         if (qtContext.isValid()) {
             QJniObject jClass("com/yfkj/cb/Q6iot/Backlight");
             QJniObject jClass("com/yfkj/cb/Q6iot/Backlight");
             jClass.callMethod<void>("setScreenLight","(Landroid/content/Context;I)V",qtContext.object(),val);
             jClass.callMethod<void>("setScreenLight","(Landroid/content/Context;I)V",qtContext.object(),val);
+            //jClass.callStaticMethod<void>("turnScreenOff", "()V");
         }
         }
+    #if 0
+        if(val==-255){
+            QJniObject::callStaticMethod<void>("GetUsbPermission",
+                                               "turnScreenOff",
+                                               "()V");
+        }
+    #endif
     }
     }
     Q_INVOKABLE QString getId(){
     Q_INVOKABLE QString getId(){
         return param::imei;
         return param::imei;

+ 19 - 15
q6_felgo_iot/src/main.cpp

@@ -261,16 +261,17 @@ int main(int argc, char *argv[])
 
 
     sendBroadcastFromQt("sleep");
     sendBroadcastFromQt("sleep");
     //启动铃声
     //启动铃声
+    if(0)
     {
     {
-    QMediaPlayer* m_ediaPlayer;
-    QAudioOutput* m_audioOutput;
-    m_ediaPlayer = new QMediaPlayer;
-    m_audioOutput = new QAudioOutput;
-    m_ediaPlayer->setAudioOutput(m_audioOutput);
-    QUrl url = QUrl::fromLocalFile("assets:/assets/mp3/pwron.mp3");
-    m_ediaPlayer->setSource(url.toLocalFile());
-    m_audioOutput->setVolume(100);
-    m_ediaPlayer->play();
+        QMediaPlayer* m_ediaPlayer;
+        QAudioOutput* m_audioOutput;
+        m_ediaPlayer = new QMediaPlayer;
+        m_audioOutput = new QAudioOutput;
+        m_ediaPlayer->setAudioOutput(m_audioOutput);
+        QUrl url = QUrl::fromLocalFile("assets:/assets/mp3/pwron.mp3");
+        m_ediaPlayer->setSource(url.toLocalFile());
+        m_audioOutput->setVolume(100);
+        m_ediaPlayer->play();
     }
     }
 
 
     QGuiApplication app(argc, argv);
     QGuiApplication app(argc, argv);
@@ -314,21 +315,24 @@ int main(int argc, char *argv[])
     if(!sqlConfig->isTableExist(param::table_mqtt)){
     if(!sqlConfig->isTableExist(param::table_mqtt)){
         sqlConfig->CreateTable(param::table_mqtt);
         sqlConfig->CreateTable(param::table_mqtt);
         //插入数据
         //插入数据
-        config_class.mqtt_db = {1,"bzy","8.136.98.49",61883,"yfkj6021","user","f335bf402c655ee5fd2b5300905124e","",0,60,"/yfkj/bzyH/s2c/","/yfkj/bzyH/c2s/","/yfkj/bzyH/offline/",10};
-        config_class.mqtt_db.imei = param::imei;
+        config_class.mqtt_db = {1,"bzy","8.136.98.49",61883,"","user","f335bf402c655ee5fd2b5300905124e","",0,60,"/yfkj/bzyH/s2c/","/yfkj/bzyH/c2s/","/yfkj/bzyH/offline/",10};
         sqlConfig->InsertData(config_class,param::table_mqtt);
         sqlConfig->InsertData(config_class,param::table_mqtt);
         //查询全部数据
         //查询全部数据
         sqlConfig->QueryAllData(param::table_mqtt);
         sqlConfig->QueryAllData(param::table_mqtt);
     }else{
     }else{
         sqlConfig->QueryAllData(param::table_mqtt);
         sqlConfig->QueryAllData(param::table_mqtt);
-        if(param::imei.isEmpty()){
-            sendBroadcastFromQt("imei");
-        }
+
+    }
+    if(param::imei.isEmpty()){
+        sendBroadcastFromQt("imei");
+        QTimer::singleShot(1000, [&]() {
+            sqlConfig->UpdateData(param::table_mqtt,"imei",param::imei);
+        });
     }
     }
     if(!sqlConfig->isTableExist(param::table_mqtt_other))
     if(!sqlConfig->isTableExist(param::table_mqtt_other))
     {
     {
         sqlConfig->CreateTable(param::table_mqtt_other);
         sqlConfig->CreateTable(param::table_mqtt_other);
-        config_class.mqtt_db = {1,"bzy","0.0.0.0",1883,"yfkj6021","uid","pwd","clientid",0,60,"/yfkj/bzy/s2c/","/yfkj/bzy/c2s/","/yfkj/bzy/offline/",10};
+        config_class.mqtt_db = {1,"bzy","0.0.0.0",1883,"","uid","pwd","clientid",0,60,"/yfkj/bzy/s2c/","/yfkj/bzy/c2s/","/yfkj/bzy/offline/",10};
         sqlConfig->InsertData(config_class,param::table_mqtt_other);
         sqlConfig->InsertData(config_class,param::table_mqtt_other);
         //查询全部数据
         //查询全部数据
         sqlConfig->QueryAllData(param::table_mqtt_other);
         sqlConfig->QueryAllData(param::table_mqtt_other);

+ 2 - 0
q6_felgo_iot/src/mserial.cpp

@@ -419,6 +419,8 @@ void
 SerialThread::mqtttoserial(const QByteArray &data)
 SerialThread::mqtttoserial(const QByteArray &data)
 {
 {
     sendData(data);
     sendData(data);
+    if(data.contains("paramconf"))
+        data_upload = true;
 }
 }