App: Enable keyboard action for Android platform

Author: KangLin

.github/workflows/android.yml

@@ -48,7 +48,7 @@ jobs:
       ANDROID_PLATFORM: android-34
       ANDROID_NATIVE_API_LEVEL: 34
       ANDROID_ABI: ${{matrix.ANDROID_ABI}}
-      qt_modules: 'qtimageformats qtmultimedia qtscxml qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtspeech qtvirtualkeyboard'
+      qt_modules: 'qtimageformats qtmultimedia qtscxml qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtspeech' # qtvirtualkeyboard'
 
     # Map the job outputs to step outputs
     outputs:

App/Client/Resource/Translations/RabbitRemoteControlApp_zh_CN.ts

@@ -833,8 +833,8 @@ File: %1</source>
     </message>
     <message>
         <location filename="../../mainwindow.ui" line="541"/>
-        <source>Virtual Keyboard</source>
-        <translation>虚拟键盘</translation>
+        <source>Keyboard</source>
+        <translation>键盘</translation>
     </message>
     <message>
         <location filename="../../mainwindow.ui" line="384"/>

App/Client/Resource/Translations/RabbitRemoteControlApp_zh_TW.ts

@@ -833,8 +833,8 @@ File: %1</source>
     </message>
     <message>
         <location filename="../../mainwindow.ui" line="541"/>
-        <source>Virtual Keyboard</source>
-        <translation>虛擬鍵盤</translation>
+        <source>Keyboard</source>
+        <translation>鍵盤</translation>
     </message>
     <message>
         <location filename="../../mainwindow.ui" line="384"/>

App/Client/mainwindow.cpp

@@ -19,6 +19,7 @@
 #include <QLoggingCategory>
 #include <QThread>
 #include <QInputMethod>
+#include <QGuiApplication>
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
@@ -76,12 +77,11 @@ MainWindow::MainWindow(QWidget *parent)
     ui->setupUi(this);
     ui->menubar->show();
 
-    ui->actionVirtual_Keyboard->setVisible(false);
-#if HAVE_VirtualKeyboard
-    QByteArray imModule = qgetenv("QT_IM_MODULE");
-    bool bVisible = (imModule == "qtvirtualkeyboard" && nullptr != qApp->inputMethod());
-    ui->actionVirtual_Keyboard->setEnabled(bVisible);
-    ui->actionVirtual_Keyboard->setVisible(bVisible);
+    ui->actionKeyboard->setVisible(false);
+#if ANDROID
+    bool bVisible = (nullptr != QGuiApplication::inputMethod());
+    ui->actionKeyboard->setVisible(bVisible);
+    ui->actionKeyboard->setEnabled(bVisible);
 #endif
 
     check = connect(&m_Manager, &CManager::sigNewOperate,
@@ -1573,11 +1573,25 @@ void MainWindow::on_actionStatus_bar_S_toggled(bool checked)
     m_Parameter.SetStatusBar(checked);
 }
 
-void MainWindow::on_actionVirtual_Keyboard_triggered()
+void MainWindow::on_actionKeyboard_triggered()
 {
-    auto inputMethod = qApp->inputMethod();
+    auto inputMethod = QGuiApplication::inputMethod();
     if(inputMethod) {
-        inputMethod->setVisible(ui->actionVirtual_Keyboard->isChecked());
+        bool bVisible = ui->actionKeyboard->isChecked();
+        ui->actionKeyboard->setChecked(bVisible);
+        if(bVisible) {
+            QObject *focusObject = QGuiApplication::focusObject();
+            if(m_pView && m_pView->GetCurrentView())
+                focusObject = m_pView->GetCurrentView();
+            if (focusObject) {
+                // 可选：强制焦点对象发送输入法请求
+                QInputMethodEvent event;
+                QCoreApplication::sendEvent(focusObject, &event);
+            }
+            inputMethod->show();
+        }
+        else
+            inputMethod->hide();
     }
 }
 

App/Client/mainwindow.h

@@ -177,7 +177,7 @@ private Q_SLOTS:
     void on_actionMain_menu_bar_M_toggled(bool checked);
     void on_actionToolBar_T_toggled(bool checked);
     void on_actionStatus_bar_S_toggled(bool checked);
-    void on_actionVirtual_Keyboard_triggered();
+    void on_actionKeyboard_triggered();
 
     ///////// Full screen /////////
 private:

App/Client/mainwindow.ui

@@ -92,7 +92,7 @@
     <addaction name="menuType"/>
     <addaction name="menuLayout"/>
     <addaction name="actionTabBar_B"/>
-    <addaction name="actionVirtual_Keyboard"/>
+    <addaction name="actionKeyboard"/>
     <addaction name="actionToolBar_T"/>
     <addaction name="actionStatus_bar_S"/>
     <addaction name="actionMain_menu_bar_M"/>
@@ -530,15 +530,21 @@
     <string>Minimalism</string>
    </property>
   </action>
-  <action name="actionVirtual_Keyboard">
+  <action name="actionKeyboard">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Virtual Keyboard</string>
+    <string>Keyboard</string>
+   </property>
+   <property name="statusTip">
+    <string>Show keyboard</string>
+   </property>
+   <property name="whatsThis">
+    <string>Show keyboard</string>
    </property>
   </action>
  </widget>