zhunk hace 1 año
padre
commit
3862a14bde

+ 14 - 14
q6_felgo_iot/CMakeLists.txt.user

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

+ 1 - 1
q6_felgo_iot/qml/Main.qml

@@ -51,7 +51,6 @@ App {
     onLogoutClicked: {
       //                                                                                                                                                                                       loginpage.pushed()
       logic.logout()
-
       // jump to main page after logout
       navigation.currentIndex = 0
       //navigation.currentNavigationItem.navigationStack.popAllExceptFirst()
@@ -156,6 +155,7 @@ App {
               logic.logout()
               // jump to main page after logout
               navigation.currentIndex = 0
+              serial.setLightness(-255)
               //navigation.currentNavigationItem.navigationStack.popAllExceptFirst()
             }
           }

+ 15 - 2
q6_felgo_iot/qml/model/NumberPad.qml

@@ -5,9 +5,12 @@ import QtQuick.Layouts
 import Felgo 4.0
 
 Item {
+    id: numberPadRoot
     property alias txtPassword: passwd_tf
     property alias mlogin: btn_login
 
+    signal buttonClicked()
+
     width: parent.width*0.3
     height: parent.height*0.7
 
@@ -31,13 +34,20 @@ Item {
             cursorDelegate: Rectangle {
                 visible: false
             }
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    console.log("TextField clicked!")
+                    numberPadRoot.buttonClicked()
+                }
+            }
         }
 
         Grid {
             id: grid
             columns: 3
-            columnSpacing: -10
-            rowSpacing: -5
+            // columnSpacing: -10
+            // rowSpacing: -5
             //spacing: 5
 
             Repeater {
@@ -54,6 +64,7 @@ Item {
                     onClicked: {
                         console.log("text:",text)
                         passwd_tf.text += text
+                        numberPadRoot.buttonClicked()
                     }
                 }
 
@@ -69,6 +80,7 @@ Item {
                 borderColor: app.cardColor
                 onClicked: {
                     passwd_tf.text = ""
+                    numberPadRoot.buttonClicked()
                 }
             }
 
@@ -83,6 +95,7 @@ Item {
                 borderColor: "green"
                 onClicked: {
                     console.log("解锁")
+                    numberPadRoot.buttonClicked()
                 }
             }
         }

+ 20 - 60
q6_felgo_iot/qml/pages/LoginPage.qml

@@ -13,6 +13,13 @@ AppPage {
     backgroundColor:  "#f5f5f5"
     useSafeArea: false // do not consider safe area insets of screen
 
+
+    // 添加一个函数来处理亮度设置和重置计时
+    function resetScreenTimeout() {
+        serial.setLightness(128)
+        logintimeout = 300
+    }
+
     onVisibleChanged: {
         if(loginPage.visible==true){
             numberpad.txtPassword.clear()
@@ -21,18 +28,6 @@ AppPage {
 
 
 
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            console.log("AppPage clicked!")
-            // 在这里添加处理点击事件的逻辑
-            //设置屏幕亮度为?
-            serial.setLightness(128)
-            logintimeout = 300
-        }
-    }
-
-
     // login form background
     Rectangle {
         id: loginForm
@@ -42,6 +37,15 @@ AppPage {
         height: parent.height   //content.height + dp(16)
         radius: dp(4)
 
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                console.log("AppPage clicked!")
+                // 在这里添加处理点击事件的逻辑
+                resetScreenTimeout()
+            }
+        }
+
         Column{
             anchors.fill: loginForm
             AppText {
@@ -52,13 +56,6 @@ AppPage {
                 fontSize: 30
             }
 
-            // Rectangle {
-            //     anchors.top: apptext_title.bottom
-            //     width: parent.width
-            //     height: 0.5
-            //     color: app.fontColor
-            // }
-
             AppText{
                 id: text_logintime
                 anchors.topMargin: 5
@@ -82,49 +79,12 @@ AppPage {
             mlogin.onClicked: {
                 loginPage.forceActiveFocus() // move focus away from text fields
                 logic.login(txtPassword.text)
-                logintimeout = 300
+                resetScreenTimeout()
+            }
+            onButtonClicked: {
+                resetScreenTimeout()
             }
-            // MouseArea {
-            //     anchors.fill: parent
-            //     onClicked: {
-            //         console.log("AppPage clicked!")
-            //         // 在这里添加处理点击事件的逻辑
-            //         //设置屏幕亮度为?
-            //         serial.setLightness(128)
-            //         logintimeout = 300
-            //     }
-            // }
         }
-//        AppImage {
-//            anchors.fill: parent
-//            fillMode: Image.PreserveAspectFit
-//            source: "../../assets/screen.jpg"
-//        }
-
-//        CustomItem {
-//            property real t: 1
-//            anchors.fill: parent
-//            center: Qt.point(-0.748, 0.1);
-//            iterationLimit: 3 * (zoom + 30)
-//            zoom: t * t / 10
-//            NumberAnimation on t {
-//                from: 1
-//                to: 60
-//                duration: 60*1000;
-//                running: true
-//                loops: Animation.Infinite
-//            }
-//        }
-
-//        Rectangle {
-//            id: labelFrame
-//            anchors.margins: -10
-//            radius: 10
-//            color: "white"
-//            border.color: "black"
-//            opacity: 0.8
-//            anchors.fill: description
-//        }
     }
 
 

+ 12 - 12
q6_felgo_iot/qml/pages/ProfilePage.qml

@@ -3,8 +3,8 @@ import QtMultimedia
 import QtQuick
 import QtQuick.Controls
 
-// import EasyModel 1.0
-// import com.example.database 1.0
+import EasyModel 1.0
+import com.example.database 1.0
 
 import "../controls"
 import "../common"
@@ -66,17 +66,17 @@ AppPage {
             property int datacount: 1
 
 
-            // DatabaseInterface
-            // {
-            //     id: db_cfg
-            // }
+            DatabaseInterface
+            {
+                id: db_cfg
+            }
 
-            // EasyTableModel{
-            //     id: table_model
-            //     horHeader: table_mqtt_Value
-            //     //initData:  []//myClass.getdata_JsonArray()
-            //     //initData: []
-            // }
+            EasyTableModel{
+                id: table_model
+                horHeader: table_mqtt_Value
+                //initData:  []//myClass.getdata_JsonArray()
+                //initData: []
+            }
             //表格内容(不包含表头)
             TableView{
                 id: table_view