From c09a7140b26d6746e06b2950550a5fe9b274c6e8 Mon Sep 17 00:00:00 2001
From: yujiaxinwt <1157613664@qq.com>
Date: Fri, 5 Jan 2024 09:23:50 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=B3=95=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E5=AE=9E=E7=8E=B0=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/src/AppController.js         | 15 +++++++++++++++
 sdk/src/KeyboardInput.js         | 13 ++++++++++---
 sdk/src/config/protocolConfig.js |  5 ++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 4e9085d..478655b 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -353,6 +353,9 @@ class AppController {
         if (this.player) {
             this.keyboardInput = new KeyboardInput(this.options.containerId, this.send);
             this.keyboardInput.init();
+            if (!this.options.isMobile) {
+                this.keyboardInput.listenPaste();
+             }
             this.touchHandler = new TouchHandler({
                 player: this.player,
                 isMobile: this.options.isMobile,
@@ -782,6 +785,18 @@ class AppController {
         } else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.HIDE_KEYBOARD_EVENT) {
             this.keyboardInput.stop();
             this.touchHandler.updateKeyBoardMode('KEYBOARD_MAP');
+        } else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_TO_SDK) {
+            const len = (highBytesSize << 8) + lowByteSize;
+            const input = len > 0 ? this.util.decodeUTF8(pkg, PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH,
+                PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH + len) : '';
+            // 将信息给端侧的剪贴板
+            navigator.clipboard.writeText(input)
+            .then(() => {
+                console.log("Copy success");
+            })
+            .catch((error) => {
+                console.error("Copy failed", error);
+            });
         }
     }
 
diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index 59541b6..39b8a4f 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -79,7 +79,7 @@ export default class KeyboardInput {
     }
 
     onInput() {
-        this.handleInputMsg(this.input.value, 'KEYBOARD_INPUT');
+        this.handleInputMsg(this.input.value, 'KEYBOARD_INPUT', PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.TEXT_UPDATE);
     }
 
     onKeyup(event) {
@@ -88,7 +88,7 @@ export default class KeyboardInput {
         }
     }
 
-    handleInputMsg(input, msgType) {
+    handleInputMsg(input, msgType, textType) {
         const PACKAGE_HEADER_LENGTH = 8;
         const INPUT_HEADER_LENGTH = 3;
         const msgData = this.util.encodeUTF8(input);
@@ -101,7 +101,7 @@ export default class KeyboardInput {
         cmdBuf[5] = (INPUT_HEADER_LENGTH + msgData.length) >> 16;
         cmdBuf[6] = (INPUT_HEADER_LENGTH + msgData.length) >> 8;
         cmdBuf[7] = (INPUT_HEADER_LENGTH + msgData.length);
-        cmdBuf[8] = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.TEXT_UPDATE;
+        cmdBuf[8] = textType;
         cmdBuf[9] = msgData.length >> 8;
         cmdBuf[10] = msgData.length;
 
@@ -115,4 +115,11 @@ export default class KeyboardInput {
         this.inputContainer.remove();
         this.inputContainer = null;
     }
+
+    listenPaste() {
+        document.addEventListener('paste', (event) => {
+            const pasteContent = event.clipboardData.getData('text/plain');
+            this.handleInputMsg(pasteContent, 'KEYBOARD_INPUT' , PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK);
+        });
+    }
 }
\ No newline at end of file
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index 69b0bdf..9d00b6f 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -150,7 +150,10 @@ const PROTOCOL_CONFIG = {
     KEYBOARD_INPUT_MSG_TYPE: {
         INPUT_EVENT: 0X00,
         HIDE_KEYBOARD_EVENT: 0X01,
-        TEXT_UPDATE: 0X02
+        TEXT_UPDATE: 0X02,
+        IME_PASTE_TO_SDK: 6,
+        IME_PASTE_FROM_SDK: 7,
+        IME_PASTE_FROM_PC_SDK: 8
     },
     KEYBOARD_INPUT_HEADER_LENGTH:3,
     REMOTE_IME: {
-- 
Gitee


From 9da566d9c996634d792dad185e98b771cc8fee70 Mon Sep 17 00:00:00 2001
From: yujiaxinwt <1157613664@qq.com>
Date: Mon, 8 Jan 2024 16:36:08 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E6=9A=B4=E9=9C=B2=E5=8F=8C=E5=90=91?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4=E6=8E=A5=E5=8F=A3=EF=BC=9B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4vconsole=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/demo/demo.html       | 14 +++++++++++---
 sdk/enter.html           |  3 +--
 sdk/index.html           | 14 +++++++++++---
 sdk/login.html           |  2 --
 sdk/phone.html           |  2 --
 sdk/src/AppController.js | 20 ++++++++------------
 sdk/src/CPHCloudApp.js   |  4 ++++
 sdk/src/CloudApp.js      |  4 ++++
 sdk/src/KeyboardInput.js |  7 ++-----
 9 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html
index da8381b..1f4c818 100644
--- a/sdk/demo/demo.html
+++ b/sdk/demo/demo.html
@@ -452,7 +452,6 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
 </div>
 <script type="text/javascript"
         src="<%= htmlWebpackPlugin.files.chunks.CloudApp.entry %>"></script>
-<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
 <script src="./common.js"></script>
 <script type="text/javascript">
   var phoneId = null;
@@ -483,8 +482,6 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
     };
     commonLibPath = getConfig.libPath;
 
-    // VConsole 默认会挂载到 `window.VConsole` 上
-    var vConsole = new window.VConsole();
     // 从url中获取ip和port
     var urlParams = new URLSearchParams(window.location.search);
     var urlIp = urlParams.get('ip');
@@ -637,6 +634,17 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
         };
 
         listenLocationReload();
+
+        // 监听云机复制内容写入端侧粘贴板
+        cloudapp.on("clipboardDataChange", function (event, data) {
+          navigator.clipboard.writeText(data);
+        });
+
+        // 监听端侧粘贴，获取粘贴板内容发给云机
+        document.addEventListener('paste', (event) => {
+            const pasteContent = event.clipboardData.getData('text/plain');
+            cloudapp.sendClipboardData(pasteContent);
+        });
       }
     } catch (e) {
       console.log(e);
diff --git a/sdk/enter.html b/sdk/enter.html
index 765fa50..058a76f 100644
--- a/sdk/enter.html
+++ b/sdk/enter.html
@@ -252,9 +252,8 @@
       </div>
     </div>
   </div>
-  <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+
   <script type="text/javascript">
-    var vConsole = new window.VConsole();
     let resUserInfo = null;
     const channelType = {
       'socket': 'WebSocket',
diff --git a/sdk/index.html b/sdk/index.html
index da8381b..1f4c818 100644
--- a/sdk/index.html
+++ b/sdk/index.html
@@ -452,7 +452,6 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
 </div>
 <script type="text/javascript"
         src="<%= htmlWebpackPlugin.files.chunks.CloudApp.entry %>"></script>
-<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
 <script src="./common.js"></script>
 <script type="text/javascript">
   var phoneId = null;
@@ -483,8 +482,6 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
     };
     commonLibPath = getConfig.libPath;
 
-    // VConsole 默认会挂载到 `window.VConsole` 上
-    var vConsole = new window.VConsole();
     // 从url中获取ip和port
     var urlParams = new URLSearchParams(window.location.search);
     var urlIp = urlParams.get('ip');
@@ -637,6 +634,17 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
         };
 
         listenLocationReload();
+
+        // 监听云机复制内容写入端侧粘贴板
+        cloudapp.on("clipboardDataChange", function (event, data) {
+          navigator.clipboard.writeText(data);
+        });
+
+        // 监听端侧粘贴，获取粘贴板内容发给云机
+        document.addEventListener('paste', (event) => {
+            const pasteContent = event.clipboardData.getData('text/plain');
+            cloudapp.sendClipboardData(pasteContent);
+        });
       }
     } catch (e) {
       console.log(e);
diff --git a/sdk/login.html b/sdk/login.html
index ac400ec..a469775 100644
--- a/sdk/login.html
+++ b/sdk/login.html
@@ -54,10 +54,8 @@
       </div>
     </div>
   </div>
-  <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
   <script src="./common.js"></script>
   <script type="text/javascript">
-    var vConsole = new window.VConsole();
     let commonParams = null;
     let lastClickTime = 0;
     const threshold = 500; // 阈值500ms
diff --git a/sdk/phone.html b/sdk/phone.html
index eb945c0..703a219 100644
--- a/sdk/phone.html
+++ b/sdk/phone.html
@@ -240,10 +240,8 @@
       </div>
     </div>
   </div>
-  <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
   <script src="./common.js"></script>
   <script>
-    var vConsole = new window.VConsole();
     let commonParams = null;
     let phoneList = null;
     const channelType = {
diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 478655b..36e24cd 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -115,7 +115,8 @@ class AppController {
             'netStateChange',
             'appStateChange',
             'audioStateChange',
-            'cloudAppData'
+            'cloudAppData',
+            'clipboardDataChange'
         ]);
         this.cameraMsgHeader = null;
         this.microPhoneMsgHeader = null;
@@ -353,9 +354,6 @@ class AppController {
         if (this.player) {
             this.keyboardInput = new KeyboardInput(this.options.containerId, this.send);
             this.keyboardInput.init();
-            if (!this.options.isMobile) {
-                this.keyboardInput.listenPaste();
-             }
             this.touchHandler = new TouchHandler({
                 player: this.player,
                 isMobile: this.options.isMobile,
@@ -789,14 +787,8 @@ class AppController {
             const len = (highBytesSize << 8) + lowByteSize;
             const input = len > 0 ? this.util.decodeUTF8(pkg, PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH,
                 PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH + len) : '';
-            // 将信息给端侧的剪贴板
-            navigator.clipboard.writeText(input)
-            .then(() => {
-                console.log("Copy success");
-            })
-            .catch((error) => {
-                console.error("Copy failed", error);
-            });
+            
+            this.subscribe.trigger('clipboardDataChange', input);
         }
     }
 
@@ -1406,6 +1398,10 @@ class AppController {
         this.send(arrayBuf)
     }
 
+    sendClipboardData(data) {
+        this.keyboardInput.sendClipboardData(data);
+    }
+
     exit() {
         this.disconnect(this.terminateSocketWorker.bind(this));
         this.destroy(true);
diff --git a/sdk/src/CPHCloudApp.js b/sdk/src/CPHCloudApp.js
index 85c925b..2c069d5 100644
--- a/sdk/src/CPHCloudApp.js
+++ b/sdk/src/CPHCloudApp.js
@@ -369,6 +369,10 @@ class CPHCloudApp {
     sendKeyCodeMsg(keyCodeType) {
         this.appController.sendKeyCodeMsg(keyCodeType);
     }
+
+    sendClipboardData(data) {
+        this.appController.sendClipboardData(data);
+    }
 }
 
 CPHCloudApp.RESOLUTIONS = {...PROTOCOL_CONFIG.RESOLUTIONS};
diff --git a/sdk/src/CloudApp.js b/sdk/src/CloudApp.js
index 76adff3..e118612 100644
--- a/sdk/src/CloudApp.js
+++ b/sdk/src/CloudApp.js
@@ -92,6 +92,10 @@ class CloudApp {
         this.channel.sendKeyCodeMsg('KEYCODE_APP_SWITCH');
     }
 
+    sendClipboardData(data) {
+        this.channel.sendClipboardData(data);
+    }
+
     updateResolutionAndTouch() {
         this.channel.updateResolutionAndTouch();
     }
diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index 39b8a4f..a7ecbb7 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -116,10 +116,7 @@ export default class KeyboardInput {
         this.inputContainer = null;
     }
 
-    listenPaste() {
-        document.addEventListener('paste', (event) => {
-            const pasteContent = event.clipboardData.getData('text/plain');
-            this.handleInputMsg(pasteContent, 'KEYBOARD_INPUT' , PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK);
-        });
+    sendClipboardData(clipboardData) {
+        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK);
     }
 }
\ No newline at end of file
-- 
Gitee


From 23cab679a96294075917809e392c090b3591091d Mon Sep 17 00:00:00 2001
From: yujiaxinwt <1157613664@qq.com>
Date: Tue, 9 Jan 2024 15:22:20 +0800
Subject: [PATCH 03/22] =?UTF-8?q?PC=E5=9C=BA=E6=99=AF=E4=B8=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=BF=9C=E7=A8=8B=E8=BE=93=E5=85=A5=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/src/AppController.js | 6 +++---
 sdk/src/KeyboardInput.js | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 36e24cd..7ca30c5 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -352,7 +352,7 @@ class AppController {
         this.initPlayer();
 
         if (this.player) {
-            this.keyboardInput = new KeyboardInput(this.options.containerId, this.send);
+            this.keyboardInput = new KeyboardInput(this.options.containerId, this.send, this.options.isMobile);
             this.keyboardInput.init();
             this.touchHandler = new TouchHandler({
                 player: this.player,
@@ -774,13 +774,13 @@ class AppController {
         }
 
         const [type, highBytesSize, lowByteSize] = pkg;
-        if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.INPUT_EVENT) {
+        if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.INPUT_EVENT && this.options.isMobile) {
             const len = (highBytesSize << 8) + lowByteSize;
             const input = len > 0 ? this.util.decodeUTF8(pkg, PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH,
                 PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH + len) : '';
             this.keyboardInput.start(input);
             this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
-        } else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.HIDE_KEYBOARD_EVENT) {
+        } else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.HIDE_KEYBOARD_EVENT && this.options.isMobile) {
             this.keyboardInput.stop();
             this.touchHandler.updateKeyBoardMode('KEYBOARD_MAP');
         } else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_TO_SDK) {
diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index a7ecbb7..f569e8b 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -20,9 +20,10 @@ const KEYCODE_ENTER_CTRL_ZONE = 13;
 
 export default class KeyboardInput {
 
-    constructor(containerId, msgHandler) {
+    constructor(containerId, msgHandler, isMobile) {
         this.containerId = containerId;
         this.msgHandler = msgHandler;
+        this.isMobile = isMobile;
         this.util = new Util();
         this.inputContainer = null;
         this.input = null;
@@ -117,6 +118,10 @@ export default class KeyboardInput {
     }
 
     sendClipboardData(clipboardData) {
-        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK);
+        let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
+        if (this.isMobile) {
+            sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_SDK;
+        }
+        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
     }
 }
\ No newline at end of file
-- 
Gitee


From a07e009e674717f7b1eebeaa2fc1957d7fc67c5f Mon Sep 17 00:00:00 2001
From: yuanruibin <yuanruibin1@huawei.com>
Date: Tue, 23 Jan 2024 14:53:34 +0800
Subject: [PATCH 04/22] 1

---
 sdk/src/AppController.js         | 27 +++++++------
 sdk/src/DirectionHandler.js      |  8 ++--
 sdk/src/KeyboardInput.js         | 66 +++++++++++++++++++++++---------
 sdk/src/config/protocolConfig.js | 16 ++++++--
 sdk/src/config/staticConfig.js   |  3 ++
 5 files changed, 84 insertions(+), 36 deletions(-)
 create mode 100644 sdk/src/config/staticConfig.js

diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index ebc4aa6..caa3294 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -30,6 +30,7 @@ import SocketWorker from './worker/SocketWorker';
 import KeyboardInput from "./KeyboardInput";
 import DirectionHandler from './DirectionHandler';
 import DeviceHardwareHandler from './DeviceHardwareHandler';
+import StaticConfig from './config/staticConfig';
 import {
     PACKAGE_HEADER_LENGTH,
     MEDIA_MSG_HEADER_COUNT,
@@ -363,6 +364,7 @@ class AppController {
                 inputId: this.keyboardInput && this.keyboardInput.inputId || ''
             });
             this.touchHandler.start();
+            this.keyboardInput.getTouchHandler(this.touchHandler);
 
             if(this.touchHandler.displayBox.width && this.touchHandler.displayBox.height) {
                 const ctrlEle = document.getElementById('controlBtn');
@@ -509,6 +511,10 @@ class AppController {
             this.processChannelData(channelDataPkg)
         }
 
+        if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.PC_INPUT) {
+            this.keyboardInput.start();
+        }
+        this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
         const keyboardInputPkg = this.frameParser.shiftPackage('KeyboardInput');
         if (keyboardInputPkg) {
             this.processKeyboardInput(keyboardInputPkg);
@@ -774,20 +780,19 @@ class AppController {
         }
 
         const [type, highBytesSize, lowByteSize] = pkg;
-        if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.INPUT_EVENT && this.options.isMobile) {
-            const len = (highBytesSize << 8) + lowByteSize;
-            const input = len > 0 ? this.util.decodeUTF8(pkg, PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH,
-                PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH + len) : '';
-            this.keyboardInput.start(input);
-            this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
-        } else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.HIDE_KEYBOARD_EVENT && this.options.isMobile) {
-            this.keyboardInput.stop();
-            this.touchHandler.updateKeyBoardMode('KEYBOARD_MAP');
-        } else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_TO_SDK) {
+        // if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.INPUT_EVENT) {
+        //     this.keyboardInput.start();
+        //     this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
+        // } 
+        // else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.HIDE_KEYBOARD_EVENT) {
+        //     this.keyboardInput.stop();
+        //     this.touchHandler.updateKeyBoardMode('KEYBOARD_MAP');
+        // } 
+        // else 
+        if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_TO_SDK) {
             const len = (highBytesSize << 8) + lowByteSize;
             const input = len > 0 ? this.util.decodeUTF8(pkg, PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH,
                 PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH + len) : '';
-            
             this.subscribe.trigger('clipboardDataChange', input);
         }
     }
diff --git a/sdk/src/DirectionHandler.js b/sdk/src/DirectionHandler.js
index 10d4d9b..05f0180 100644
--- a/sdk/src/DirectionHandler.js
+++ b/sdk/src/DirectionHandler.js
@@ -68,8 +68,8 @@ class DirectionHandler {
                     position: absolute;
                     bottom: 5px;
                     left: 0px;
-                    height: 40px;
-                    width: 100%;
+                    height: 0px;
+                    width: 10px;
                 `;
                 break;
             case PROTOCOL_CONFIG.ORIENTATION[16]:
@@ -186,8 +186,8 @@ class DirectionHandler {
             position: absolute;
             top: ${positionParams.keyboardInputTop}px;
             left: ${positionParams.keyboardInputLeft}px;
-            height: 40px;
-            width: ${positionParams.keyboardInputWidth}px;
+            height: 0px;
+            width: 10px;
         `;
 
         this.ctrlEle.style.top = `${positionParams.ctrlEleTop}px`;
diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index f569e8b..ca29bbc 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -26,6 +26,8 @@ export default class KeyboardInput {
         this.isMobile = isMobile;
         this.util = new Util();
         this.inputContainer = null;
+        this.touchHandler = null;
+        this.cnStart = false;
         this.input = null;
         this.inputId = 'keyboardInput' + Date.now();
     }
@@ -43,29 +45,38 @@ export default class KeyboardInput {
         this.input.type = 'text';
 
         this.inputContainer.style.cssText = `
-            display: none;
+            display: block;
             position: absolute;
             bottom: 5px;
             left: 0px;
-            height: 40px;
-            width: 100%;
+            height: 0px;
+            width: 10px;
             `;
         this.input.style.cssText = `
-            height: 40px;
-            width: 100%;
+            height: 0px;
+            width: 10px;
             color: white;
             background-color: rgb(37,43,58);
-            opacity: 0.8;
+            opacity: 0;
             box-sizing: border-box;
             `;
+
+        videoContainer.addEventListener("mouseup", (event) => {
+            this.onMouseUp(event);
+        }, true);
+        this.util.bind(this.input, 'compositionstart', this.compositionstart.bind(this));
+        this.util.bind(this.input, 'compositionend', this.compositionend.bind(this));
         this.util.bind(this.input, 'input', this.onInput.bind(this));
-        this.util.bind(this.input, 'keyup', this.onKeyup.bind(this));
+        this.util.bind(this.input, 'keydown', this.onKeydown.bind(this));
         this.inputContainer.appendChild(this.input);
         videoContainer.appendChild(this.inputContainer);
     }
 
-    start(inputText) {
-        this.input.valueOf = inputText;
+    getTouchHandler(touchHandler) {
+        this.touchHandler = touchHandler;
+    }
+
+    start() {
         this.inputContainer.style.display = 'block';
         this.input.focus();
     }
@@ -78,17 +89,33 @@ export default class KeyboardInput {
     blurInput() {
         this.input.blur();
     }
+    
+    onMouseUp(event) {
+        this.inputContainer.style.left =  event.offsetX + 'px';
+        this.inputContainer.style.top =  event.offsetY + 'px';
+    }
 
-    onInput() {
-        this.handleInputMsg(this.input.value, 'KEYBOARD_INPUT', PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.TEXT_UPDATE);
+    compositionstart() {
+        this.cnStart = true; 
     }
 
-    onKeyup(event) {
-        if (event.keyCode === KEYCODE_ENTER_NUMBER_ZONE || event.keyCode === KEYCODE_ENTER_CTRL_ZONE) {
-            this.stop();
+    compositionend() {
+        this.cnStart = false;
+        this.onInput(); 
+    }
+
+    onInput() {
+        if(!this.cnStart) {
+            this.handleInputMsg(this.input.value, 'KEYBOARD_INPUT' , PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK);
         }
     }
 
+    onKeydown(event) {
+        if(PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]) {
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_DOWN, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
+        }
+    }
     handleInputMsg(input, msgType, textType) {
         const PACKAGE_HEADER_LENGTH = 8;
         const INPUT_HEADER_LENGTH = 3;
@@ -108,6 +135,7 @@ export default class KeyboardInput {
 
         cmdBuf.set(msgData, PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH);
         this.msgHandler(cmdBuf.buffer);
+        this.input.value = ''
     }
 
     destroy() {
@@ -118,10 +146,12 @@ export default class KeyboardInput {
     }
 
     sendClipboardData(clipboardData) {
-        let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
-        if (this.isMobile) {
-            sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_SDK;
+        if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.KEYCODE_INPUT) {
+            let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
+            if (this.isMobile) {
+                sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_SDK;
+            }
+            this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
         }
-        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
     }
 }
\ No newline at end of file
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index 9d00b6f..f337b42 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -151,9 +151,9 @@ const PROTOCOL_CONFIG = {
         INPUT_EVENT: 0X00,
         HIDE_KEYBOARD_EVENT: 0X01,
         TEXT_UPDATE: 0X02,
-        IME_PASTE_TO_SDK: 6,
-        IME_PASTE_FROM_SDK: 7,
-        IME_PASTE_FROM_PC_SDK: 8
+        IME_PASTE_TO_SDK: 6,  // PC|移动端 云机到本地
+        IME_PASTE_FROM_SDK: 7,  // 移动端 本地到云机
+        IME_PASTE_FROM_PC_SDK: 8  // PC端 本地到云机
     },
     KEYBOARD_INPUT_HEADER_LENGTH:3,
     REMOTE_IME: {
@@ -188,6 +188,16 @@ const PROTOCOL_CONFIG = {
         KEYCODE_HOME: 3,
         KEYCODE_BACK: 4,
         KEYCODE_APP_SWITCH: 187,
+    },
+    PC_KEY_MAP: {
+        8: 67, // 退格
+        13: 66, // 回车
+        39: 22, // 右
+        37: 21, // 左
+    },
+    KEYBOARD_TYPE_MAP :{
+        PC_INPUT: 1, // 常规键盘输入
+        KEYCODE_INPUT: 2 // keycode输入
     }
 };
 
diff --git a/sdk/src/config/staticConfig.js b/sdk/src/config/staticConfig.js
new file mode 100644
index 0000000..606f18f
--- /dev/null
+++ b/sdk/src/config/staticConfig.js
@@ -0,0 +1,3 @@
+export default {
+  KEYBOARD_TYPE: 1, // 键盘的输入模式：常规输入模式为 1，keycode模式为 2
+};
-- 
Gitee


From ae141fa78fb4df77bb9e967057c8d8c18067c9cf Mon Sep 17 00:00:00 2001
From: yuanruibin <yuanruibin1@huawei.com>
Date: Tue, 23 Jan 2024 15:28:40 +0800
Subject: [PATCH 05/22] 1

---
 sdk/src/KeyboardListener.js | 52 +++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 sdk/src/KeyboardListener.js

diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
new file mode 100644
index 0000000..9f9fa98
--- /dev/null
+++ b/sdk/src/KeyboardListener.js
@@ -0,0 +1,52 @@
+import Util from "./Util";
+import PROTOCOL_CONFIG from './config/protocolConfig';
+
+export default class KeyboardListener {
+    constructor() {
+        this.keyEventCodeType = PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE;
+        this.Util = new Util();
+    }
+
+    start(touchHandler) {
+        document.addEventListener('keydown', (event) => {
+            touchHandler.sendKeyCodeEventMsg(this.keyEventCodeType.ACTION_DOWN, this.pcKeyCodeToAndroid(event.keyCode));
+            console.log('keydown',event)
+        })
+        document.addEventListener('keyup', (event) => {
+            touchHandler.sendKeyCodeEventMsg(this.keyEventCodeType.ACTION_UP, this.pcKeyCodeToAndroid(event.keyCode));
+            console.log('keyup',event)
+        })
+    }
+
+    pcKeyCodeToAndroid(code) {
+        const keyMap = {};
+        let A = 29;
+        for(let i = 65; i <= 90; i++) {
+            keyMap[i] = A++;
+        }
+
+        let num = 7;
+        for(let i = 48; i <= 57; i++) {
+            keyMap[i] = num++;
+        }
+
+        // 退格 -> del
+        keyMap[8] = 67;
+        // 空格
+        keyMap[32] = 62;
+        // 回车
+        keyMap[13] = 66;
+        // 逗号
+        keyMap[188] = 55;
+        // 句号
+        keyMap[190] = 56;
+        // 分号
+        keyMap[186] = 74;
+        // 引号
+        keyMap[222] = 75;
+        // SLASH
+        keyMap[191] = 76;
+
+        return keyMap[code] || null; 
+    }
+}
\ No newline at end of file
-- 
Gitee


From c12fff6edd393148fe1f08f79a7edbc5c482bddc Mon Sep 17 00:00:00 2001
From: yuanruibin <yuanruibin1@huawei.com>
Date: Tue, 23 Jan 2024 15:51:37 +0800
Subject: [PATCH 06/22] 1

---
 sdk/src/AppController.js         | 22 +++++++++---
 sdk/src/config/protocolConfig.js | 57 ++++++++++++++++++++++++++++++++
 sdk/src/config/staticConfig.js   |  2 +-
 3 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index caa3294..f8994d0 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -38,6 +38,7 @@ import {
     FRAME_TYPE_MAP
 } from './config/commonConfig';
 import FullScreen from './Fullscreen';
+import KeyboardListener from './KeyboardListener';
 
 /*global __IS_DEBUG__*/
 if (__IS_DEBUG__) {
@@ -353,8 +354,14 @@ class AppController {
         this.initPlayer();
 
         if (this.player) {
-            this.keyboardInput = new KeyboardInput(this.options.containerId, this.send, this.options.isMobile);
-            this.keyboardInput.init();
+            if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.KEYCODE_INPUT 
+                && !this.options.isMobile
+            ) {
+                this.KeyboardListener = new KeyboardListener();
+            } else {
+                this.keyboardInput = new KeyboardInput(this.options.containerId, this.send, this.options.isMobile);
+                this.keyboardInput.init();
+            }
             this.touchHandler = new TouchHandler({
                 player: this.player,
                 isMobile: this.options.isMobile,
@@ -364,7 +371,12 @@ class AppController {
                 inputId: this.keyboardInput && this.keyboardInput.inputId || ''
             });
             this.touchHandler.start();
-            this.keyboardInput.getTouchHandler(this.touchHandler);
+            if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.KEYCODE_INPUT 
+                && !this.options.isMobile) {
+                this.KeyboardListener.start(this.touchHandler);
+            } else {
+                this.keyboardInput.getTouchHandler(this.touchHandler);
+            }
 
             if(this.touchHandler.displayBox.width && this.touchHandler.displayBox.height) {
                 const ctrlEle = document.getElementById('controlBtn');
@@ -511,10 +523,10 @@ class AppController {
             this.processChannelData(channelDataPkg)
         }
 
-        if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.PC_INPUT) {
+        if (this.keyboardInput && StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.PC_INPUT) {
+            this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
             this.keyboardInput.start();
         }
-        this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
         const keyboardInputPkg = this.frameParser.shiftPackage('KeyboardInput');
         if (keyboardInputPkg) {
             this.processKeyboardInput(keyboardInputPkg);
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index f337b42..b5668b4 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -190,10 +190,67 @@ const PROTOCOL_CONFIG = {
         KEYCODE_APP_SWITCH: 187,
     },
     PC_KEY_MAP: {
+        // A-Z
+        65: 29,
+        66: 30,
+        67: 31,
+        68: 32,
+        69: 33,
+        70: 34,
+        71: 35,
+        72: 36,
+        73: 37,
+        74: 38,
+        75: 39,
+        76: 40,
+        77: 41,
+        78: 42,
+        79: 43,
+        80: 44,
+        81: 45,
+        82: 46,
+        83: 47,
+        84: 48,
+        85: 49,
+        86: 50,
+        87: 51,
+        88: 52,
+        89: 53,
+        90: 54,
+
+        // 0-9
+        48: 7,
+        49: 8,
+        50: 9,
+        51: 10,
+        52: 11,
+        53: 12,
+        54: 13,
+        55: 14,
+        56: 15,
+        57: 16,
+
         8: 67, // 退格
+        32: 62, // 空格
         13: 66, // 回车
+        9: 61, // TAB
+        188: 55, // 英文逗号
+        190: 56, // 英文句号
+        186: 74, // 英文分号
+        191: 76, // 斜杠
+        27: 4, // ESC
+        38: 19, // 上
+        40: 20, // 下
         39: 22, // 右
         37: 21, // 左
+        20: 115, // 大写锁定
+        192: 68, // 反引号 
+        189: 69, // - 
+        187: 70, // =
+        219: 71, // [ 
+        221: 72, // ]
+        220: 73, // \
+         
     },
     KEYBOARD_TYPE_MAP :{
         PC_INPUT: 1, // 常规键盘输入
diff --git a/sdk/src/config/staticConfig.js b/sdk/src/config/staticConfig.js
index 606f18f..440d055 100644
--- a/sdk/src/config/staticConfig.js
+++ b/sdk/src/config/staticConfig.js
@@ -1,3 +1,3 @@
 export default {
-  KEYBOARD_TYPE: 1, // 键盘的输入模式：常规输入模式为 1，keycode模式为 2
+  KEYBOARD_TYPE: 2, // 键盘的输入模式：常规输入模式为 1，keycode模式为 2
 };
-- 
Gitee


From 11da827919e050c9cfea6106c348bd6a75692934 Mon Sep 17 00:00:00 2001
From: yuanruibin <yuanruibin1@huawei.com>
Date: Tue, 23 Jan 2024 16:14:03 +0800
Subject: [PATCH 07/22] 1

---
 sdk/src/KeyboardInput.js         | 4 ++--
 sdk/src/config/protocolConfig.js | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index ca29bbc..a4254cc 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -112,8 +112,8 @@ export default class KeyboardInput {
 
     onKeydown(event) {
         if(PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]) {
-            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_DOWN, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
-            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_DOWN, PROTOCOL_CONFIG.PC_INUPT_MAP[event.keyCode]);
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_INUPT_MAP[event.keyCode]);
         }
     }
     handleInputMsg(input, msgType, textType) {
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index b5668b4..c69cc6f 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -238,7 +238,7 @@ const PROTOCOL_CONFIG = {
         190: 56, // 英文句号
         186: 74, // 英文分号
         191: 76, // 斜杠
-        27: 4, // ESC
+        27: 111, // ESC
         38: 19, // 上
         40: 20, // 下
         39: 22, // 右
@@ -252,6 +252,12 @@ const PROTOCOL_CONFIG = {
         220: 73, // \
          
     },
+    PC_INUPT_MAP: {
+        8: 67, // 退格
+        13: 66, // 回车
+        39: 22, // 右
+        37: 21, // 左
+    },
     KEYBOARD_TYPE_MAP :{
         PC_INPUT: 1, // 常规键盘输入
         KEYCODE_INPUT: 2 // keycode输入
-- 
Gitee


From 795302812b181bd56dc1e454c5081ff699d0bbfc Mon Sep 17 00:00:00 2001
From: yuanruibin <yuanruibin1@huawei.com>
Date: Tue, 23 Jan 2024 16:35:04 +0800
Subject: [PATCH 08/22] 1

---
 sdk/src/KeyboardInput.js         |  2 +-
 sdk/src/KeyboardListener.js      | 47 ++++++--------------------------
 sdk/src/config/protocolConfig.js |  6 ++--
 3 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index a4254cc..a5e649d 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -111,7 +111,7 @@ export default class KeyboardInput {
     }
 
     onKeydown(event) {
-        if(PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]) {
+        if(PROTOCOL_CONFIG.PC_INUPT_MAP[event.keyCode]) {
             this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_DOWN, PROTOCOL_CONFIG.PC_INUPT_MAP[event.keyCode]);
             this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_INUPT_MAP[event.keyCode]);
         }
diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
index 9f9fa98..b42461a 100644
--- a/sdk/src/KeyboardListener.js
+++ b/sdk/src/KeyboardListener.js
@@ -4,49 +4,20 @@ import PROTOCOL_CONFIG from './config/protocolConfig';
 export default class KeyboardListener {
     constructor() {
         this.keyEventCodeType = PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE;
-        this.Util = new Util();
+        this.util = new Util();
+        this.touchHandler = null;
     }
 
     start(touchHandler) {
-        document.addEventListener('keydown', (event) => {
-            touchHandler.sendKeyCodeEventMsg(this.keyEventCodeType.ACTION_DOWN, this.pcKeyCodeToAndroid(event.keyCode));
-            console.log('keydown',event)
-        })
-        document.addEventListener('keyup', (event) => {
-            touchHandler.sendKeyCodeEventMsg(this.keyEventCodeType.ACTION_UP, this.pcKeyCodeToAndroid(event.keyCode));
-            console.log('keyup',event)
-        })
+        this.touchHandler = touchHandler;
+        this.util.bind(this.input, 'keydown', this.onKeydown.bind(this));
     }
 
-    pcKeyCodeToAndroid(code) {
-        const keyMap = {};
-        let A = 29;
-        for(let i = 65; i <= 90; i++) {
-            keyMap[i] = A++;
+    onKeydown(event) {
+        console.log('keyup',event.keyCode)
+        if(PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]) {
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_DOWN, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
         }
-
-        let num = 7;
-        for(let i = 48; i <= 57; i++) {
-            keyMap[i] = num++;
-        }
-
-        // 退格 -> del
-        keyMap[8] = 67;
-        // 空格
-        keyMap[32] = 62;
-        // 回车
-        keyMap[13] = 66;
-        // 逗号
-        keyMap[188] = 55;
-        // 句号
-        keyMap[190] = 56;
-        // 分号
-        keyMap[186] = 74;
-        // 引号
-        keyMap[222] = 75;
-        // SLASH
-        keyMap[191] = 76;
-
-        return keyMap[code] || null; 
     }
 }
\ No newline at end of file
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index c69cc6f..9aa72c9 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -233,12 +233,12 @@ const PROTOCOL_CONFIG = {
         8: 67, // 退格
         32: 62, // 空格
         13: 66, // 回车
-        9: 61, // TAB
         188: 55, // 英文逗号
         190: 56, // 英文句号
         186: 74, // 英文分号
-        191: 76, // 斜杠
-        27: 111, // ESC
+        222: 75, // 英文单引号
+        191: 76, // "/"
+        27: 4, // ESC
         38: 19, // 上
         40: 20, // 下
         39: 22, // 右
-- 
Gitee


From 095f541b2ad6c52b8b09e4cbf88d9782ad688d0b Mon Sep 17 00:00:00 2001
From: yuanruibin <yuanruibin1@huawei.com>
Date: Wed, 24 Jan 2024 16:17:13 +0800
Subject: [PATCH 09/22] 1

---
 sdk/src/KeyboardListener.js      | 10 +++-
 sdk/src/config/protocolConfig.js | 96 ++++++++++++++++++++++++--------
 2 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
index b42461a..cb5114f 100644
--- a/sdk/src/KeyboardListener.js
+++ b/sdk/src/KeyboardListener.js
@@ -11,13 +11,21 @@ export default class KeyboardListener {
     start(touchHandler) {
         this.touchHandler = touchHandler;
         this.util.bind(this.input, 'keydown', this.onKeydown.bind(this));
+        this.util.bind(this.input, 'keypress', this.onKeypress.bind(this));
     }
 
     onKeydown(event) {
-        console.log('keyup',event.keyCode)
+        console.log('down',event.keyCode)
         if(PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]) {
             this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_DOWN, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
             this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_KEY_MAP[event.keyCode]);
         }
     }
+    onKeypress(event) {
+        console.log('press',event.keyCode)
+        if(PROTOCOL_CONFIG.PC_KEY_PRESS_MAP[event.keyCode]) {
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_DOWN, PROTOCOL_CONFIG.PC_KEY_PRESS_MAP[event.keyCode]);
+            this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_KEY_PRESS_MAP[event.keyCode]);
+        }
+    }
 }
\ No newline at end of file
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index 9aa72c9..2286d31 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -190,6 +190,34 @@ const PROTOCOL_CONFIG = {
         KEYCODE_APP_SWITCH: 187,
     },
     PC_KEY_MAP: {
+        8: 67, // 退格
+        32: 62, // 空格
+        13: 66, // 回车
+        27: 4, // ESC
+        38: 19, // 上
+        40: 20, // 下
+        39: 22, // 右
+        37: 21, // 左
+        20: 115, // 大写锁定
+
+        // 小键盘
+        96: 7, // 0
+        97: 8, // 1
+        98: 9, // 2
+        99: 10, // 3
+        100: 11, // 4
+        101: 12, // 5
+        102: 13, // 6
+        103: 14, // 7
+        104: 15, // 8
+        105: 16, // 9
+        110: 56, // .
+        109: 156, // -
+        107: 157, // +
+        111: 154, // /
+        106: 155, // *
+    },
+    PC_KEY_PRESS_MAP: {
         // A-Z
         65: 29,
         66: 30,
@@ -217,6 +245,34 @@ const PROTOCOL_CONFIG = {
         88: 52,
         89: 53,
         90: 54,
+        
+        // a-z 
+        97: 29,
+        98: 30,
+        99: 31,
+        100: 32,
+        101: 33,
+        102: 34,
+        103: 35,
+        104: 36,
+        105: 37,
+        106: 38,
+        107: 39,
+        108: 40,
+        109: 41,
+        110: 42,
+        111: 43,
+        112: 44,
+        113: 45,
+        114: 46,
+        115: 47,
+        116: 48,
+        117: 49,
+        118: 50,
+        119: 51,
+        120: 52,
+        121: 53,
+        122: 54,
 
         // 0-9
         48: 7,
@@ -230,27 +286,23 @@ const PROTOCOL_CONFIG = {
         56: 15,
         57: 16,
 
-        8: 67, // 退格
-        32: 62, // 空格
-        13: 66, // 回车
-        188: 55, // 英文逗号
-        190: 56, // 英文句号
-        186: 74, // 英文分号
-        222: 75, // 英文单引号
-        191: 76, // "/"
-        27: 4, // ESC
-        38: 19, // 上
-        40: 20, // 下
-        39: 22, // 右
-        37: 21, // 左
-        20: 115, // 大写锁定
-        192: 68, // 反引号 
-        189: 69, // - 
-        187: 70, // =
-        219: 71, // [ 
-        221: 72, // ]
-        220: 73, // \
-         
+        44: 55, // ,
+        46: 56, // .
+        47: 76, // /
+        59: 74, // ;
+        39: 75, // ''
+        96: 68, // 反引号 
+        45: 69, // - 
+        61: 70, // =
+        91: 71, // [ 
+        93: 72, // ] 
+        92: 73, // \
+        36: 18, // #
+        64: 77, // @
+        42: 155, // *
+        43: 157, // +
+        40: 162, // (
+        41: 163, // )
     },
     PC_INUPT_MAP: {
         8: 67, // 退格
@@ -258,7 +310,7 @@ const PROTOCOL_CONFIG = {
         39: 22, // 右
         37: 21, // 左
     },
-    KEYBOARD_TYPE_MAP :{
+    KEYBOARD_TYPE_MAP: {
         PC_INPUT: 1, // 常规键盘输入
         KEYCODE_INPUT: 2 // keycode输入
     }
-- 
Gitee


From 230659b04d364b38e94dbf2716479e00dc31d88c Mon Sep 17 00:00:00 2001
From: yuanruibin <yuanruibin1@huawei.com>
Date: Wed, 31 Jan 2024 14:16:28 +0800
Subject: [PATCH 10/22] 1

---
 sdk/src/KeyboardInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index a5e649d..235a770 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -14,6 +14,7 @@
 
 import PROTOCOL_CONFIG from "./config/protocolConfig";
 import Util from "./Util";
+import StaticConfig from './config/staticConfig';
 
 const KEYCODE_ENTER_NUMBER_ZONE = 108;
 const KEYCODE_ENTER_CTRL_ZONE = 13;
-- 
Gitee


From 00d973ea13588766afceaeae9eb3fe3aac6ff5e8 Mon Sep 17 00:00:00 2001
From: yujiaxinwt <1157613664@qq.com>
Date: Mon, 5 Feb 2024 19:09:23 +0800
Subject: [PATCH 11/22] support pc h5 input

---
 sdk/demo/demo.html          |  3 ++-
 sdk/src/AppController.js    | 34 +++++++++++++---------------------
 sdk/src/CPHCloudApp.js      |  4 +++-
 sdk/src/KeyboardInput.js    | 10 ++++------
 sdk/src/KeyboardListener.js | 30 +++++++++++++++++++++++++++++-
 5 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html
index ece9042..3147a27 100644
--- a/sdk/demo/demo.html
+++ b/sdk/demo/demo.html
@@ -578,7 +578,8 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
       _debug: true,
       auto_rotate: true,
       libPath: commonLibPath, // 配置库文件地址
-      microPhoneOutputType: 'OPUS' // PCM或OPUS
+      microPhoneOutputType: 'OPUS', // PCM或OPUS
+      key_code_input: false
     };
     try {
       if (CloudApp.isSupport()) {
diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index e067093..732593e 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -30,7 +30,6 @@ import SocketWorker from './worker/SocketWorker';
 import KeyboardInput from "./KeyboardInput";
 import DirectionHandler from './DirectionHandler';
 import DeviceHardwareHandler from './DeviceHardwareHandler';
-import StaticConfig from './config/staticConfig';
 import {
     PACKAGE_HEADER_LENGTH,
     MEDIA_MSG_HEADER_COUNT,
@@ -352,12 +351,10 @@ class AppController {
 
     initPlyerAndStart() {
         this.initPlayer();
-
+        console.log("initPlyerAndStart " + this.options.keyCodeInput);
         if (this.player) {
-            if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.KEYCODE_INPUT 
-                && !this.options.isMobile
-            ) {
-                this.KeyboardListener = new KeyboardListener();
+            if (this.options.keyCodeInput && !this.options.isMobile) {
+                this.keyboardListener = new KeyboardListener(this.options.containerId, this.send);
             } else {
                 this.keyboardInput = new KeyboardInput(this.options.containerId, this.send, this.options.isMobile);
                 this.keyboardInput.init();
@@ -371,9 +368,8 @@ class AppController {
                 inputId: this.keyboardInput && this.keyboardInput.inputId || ''
             });
             this.touchHandler.start();
-            if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.KEYCODE_INPUT 
-                && !this.options.isMobile) {
-                this.KeyboardListener.start(this.touchHandler);
+            if (this.options.keyCodeInput && !this.options.isMobile) {
+                this.keyboardListener.start(this.touchHandler);
             } else {
                 this.keyboardInput.getTouchHandler(this.touchHandler);
             }
@@ -523,7 +519,7 @@ class AppController {
             this.processChannelData(channelDataPkg)
         }
 
-        if (this.keyboardInput && StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.PC_INPUT) {
+        if (this.keyboardInput && !this.options.keyCodeInput) {
             this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
             this.keyboardInput.start();
         }
@@ -791,16 +787,7 @@ class AppController {
             return;
         }
 
-        const [type, highBytesSize, lowByteSize] = pkg;
-        // if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.INPUT_EVENT) {
-        //     this.keyboardInput.start();
-        //     this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
-        // } 
-        // else if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.HIDE_KEYBOARD_EVENT) {
-        //     this.keyboardInput.stop();
-        //     this.touchHandler.updateKeyBoardMode('KEYBOARD_MAP');
-        // } 
-        // else 
+        const [type, highBytesSize, lowByteSize] = pkg; 
         if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_TO_SDK) {
             const len = (highBytesSize << 8) + lowByteSize;
             const input = len > 0 ? this.util.decodeUTF8(pkg, PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH,
@@ -1423,7 +1410,12 @@ class AppController {
     }
 
     sendClipboardData(data) {
-        this.keyboardInput.sendClipboardData(data);
+        if (this.keyboardListener) {
+            this.keyboardListener.sendClipboardData(data);
+        }
+        if (this.keyboardInput) {
+            this.keyboardInput.sendClipboardData(data);
+        }
     }
 
     exit() {
diff --git a/sdk/src/CPHCloudApp.js b/sdk/src/CPHCloudApp.js
index 2c069d5..57e67be 100644
--- a/sdk/src/CPHCloudApp.js
+++ b/sdk/src/CPHCloudApp.js
@@ -81,8 +81,10 @@ class CPHCloudApp {
             needHeatBeat: userOptions.need_heartbeat === undefined ? true : userOptions.need_heartbeat,
             reconnectTimes: userOptions.reconnect_times === undefined ? DEFAULT_RECONNECT_TIMES : userOptions.reconnect_times,
             libPath: userOptions.libPath,
-            microPhoneOutputType: userOptions.microPhoneOutputType
+            microPhoneOutputType: userOptions.microPhoneOutputType,
+            keyCodeInput: userOptions.key_code_input === undefined ? true : userOptions.key_code_input
         };
+        console.log("CPHCloudApp " + options.keyCodeInput);
         options.autoRotate = userOptions.auto_rotate && options.isMobile;
         if (userOptions.media_config) {
             options.mediaConfig = userOptions.media_config;
diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index f260a3a..18dd56f 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -152,12 +152,10 @@ export default class KeyboardInput {
     }
 
     sendClipboardData(clipboardData) {
-        if (StaticConfig.KEYBOARD_TYPE === PROTOCOL_CONFIG.KEYBOARD_TYPE_MAP.KEYCODE_INPUT) {
-            let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
-            if (this.isMobile) {
-                sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_SDK;
-            }
-            this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
+        if (!this.isMobile) {
+            return;
         }
+        let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_SDK;
+        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
     }
 }
\ No newline at end of file
diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
index cb5114f..42890e6 100644
--- a/sdk/src/KeyboardListener.js
+++ b/sdk/src/KeyboardListener.js
@@ -2,7 +2,9 @@ import Util from "./Util";
 import PROTOCOL_CONFIG from './config/protocolConfig';
 
 export default class KeyboardListener {
-    constructor() {
+    constructor(containerId, msgHandler) {
+        this.containerId = containerId;
+        this.msgHandler = msgHandler;
         this.keyEventCodeType = PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE;
         this.util = new Util();
         this.touchHandler = null;
@@ -28,4 +30,30 @@ export default class KeyboardListener {
             this.touchHandler.sendKeyCodeEventMsg(PROTOCOL_CONFIG.KEYEVENT_KEYCODE_TYPE.ACTION_UP, PROTOCOL_CONFIG.PC_KEY_PRESS_MAP[event.keyCode]);
         }
     }
+
+    sendClipboardData(clipboardData) {
+        let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
+        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
+    }
+    
+    handleInputMsg(input, msgType, textType) {
+        const PACKAGE_HEADER_LENGTH = 8;
+        const INPUT_HEADER_LENGTH = 3;
+        const msgData = this.util.encodeUTF8(input);
+        const cmdBuf = new Uint8Array(PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH + msgData.length);
+        cmdBuf[0] = 90;
+        cmdBuf[1] = 90;
+        cmdBuf[2] = 180 + PROTOCOL_CONFIG.MSG_TYPE[msgType];
+        cmdBuf[3] = PROTOCOL_CONFIG.MSG_TYPE[msgType];
+        cmdBuf[4] = (INPUT_HEADER_LENGTH + msgData.length) >> 24;
+        cmdBuf[5] = (INPUT_HEADER_LENGTH + msgData.length) >> 16;
+        cmdBuf[6] = (INPUT_HEADER_LENGTH + msgData.length) >> 8;
+        cmdBuf[7] = (INPUT_HEADER_LENGTH + msgData.length);
+        cmdBuf[8] = textType;
+        cmdBuf[9] = msgData.length >> 8;
+        cmdBuf[10] = msgData.length;
+
+        cmdBuf.set(msgData, PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH);
+        this.msgHandler(cmdBuf.buffer);
+    }
 }
\ No newline at end of file
-- 
Gitee


From 3f7830ed11901bb22b31f017669bd8df5e95d158 Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 11:54:15 +0800
Subject: [PATCH 12/22] support keycode and keyboard

---
 sdk/demo/demo.html             |  2 +-
 sdk/src/AppController.js       |  8 ++++----
 sdk/src/CPHCloudApp.js         |  4 ++--
 sdk/src/KeyboardListener.js    | 11 ++++-------
 sdk/src/config/staticConfig.js |  3 ---
 5 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100644 sdk/src/config/staticConfig.js

diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html
index 3147a27..b34d37f 100644
--- a/sdk/demo/demo.html
+++ b/sdk/demo/demo.html
@@ -579,7 +579,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
       auto_rotate: true,
       libPath: commonLibPath, // 配置库文件地址
       microPhoneOutputType: 'OPUS', // PCM或OPUS
-      key_code_input: false
+      keycode_input: false
     };
     try {
       if (CloudApp.isSupport()) {
diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 732593e..cc75d8b 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -351,9 +351,9 @@ class AppController {
 
     initPlyerAndStart() {
         this.initPlayer();
-        console.log("initPlyerAndStart " + this.options.keyCodeInput);
+        console.log("initPlyerAndStart " + this.options.keycodeInput);
         if (this.player) {
-            if (this.options.keyCodeInput && !this.options.isMobile) {
+            if (this.options.keycodeInput && !this.options.isMobile) {
                 this.keyboardListener = new KeyboardListener(this.options.containerId, this.send);
             } else {
                 this.keyboardInput = new KeyboardInput(this.options.containerId, this.send, this.options.isMobile);
@@ -368,7 +368,7 @@ class AppController {
                 inputId: this.keyboardInput && this.keyboardInput.inputId || ''
             });
             this.touchHandler.start();
-            if (this.options.keyCodeInput && !this.options.isMobile) {
+            if (this.options.keycodeInput && !this.options.isMobile) {
                 this.keyboardListener.start(this.touchHandler);
             } else {
                 this.keyboardInput.getTouchHandler(this.touchHandler);
@@ -519,7 +519,7 @@ class AppController {
             this.processChannelData(channelDataPkg)
         }
 
-        if (this.keyboardInput && !this.options.keyCodeInput) {
+        if (this.keyboardInput && !this.options.keycodeInput) {
             this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
             this.keyboardInput.start();
         }
diff --git a/sdk/src/CPHCloudApp.js b/sdk/src/CPHCloudApp.js
index 57e67be..9517742 100644
--- a/sdk/src/CPHCloudApp.js
+++ b/sdk/src/CPHCloudApp.js
@@ -82,9 +82,9 @@ class CPHCloudApp {
             reconnectTimes: userOptions.reconnect_times === undefined ? DEFAULT_RECONNECT_TIMES : userOptions.reconnect_times,
             libPath: userOptions.libPath,
             microPhoneOutputType: userOptions.microPhoneOutputType,
-            keyCodeInput: userOptions.key_code_input === undefined ? true : userOptions.key_code_input
+            keycodeInput: userOptions.keycode_input === undefined ? true : userOptions.keycode_input
         };
-        console.log("CPHCloudApp " + options.keyCodeInput);
+        console.log("CPHCloudApp " + options.keycodeInput);
         options.autoRotate = userOptions.auto_rotate && options.isMobile;
         if (userOptions.media_config) {
             options.mediaConfig = userOptions.media_config;
diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
index 42890e6..7e8cc5d 100644
--- a/sdk/src/KeyboardListener.js
+++ b/sdk/src/KeyboardListener.js
@@ -32,14 +32,12 @@ export default class KeyboardListener {
     }
 
     sendClipboardData(clipboardData) {
-        let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
-        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
-    }
-    
-    handleInputMsg(input, msgType, textType) {
+        let textType = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
+        let msgType = 'KEYBOARD_INPUT';
+
         const PACKAGE_HEADER_LENGTH = 8;
         const INPUT_HEADER_LENGTH = 3;
-        const msgData = this.util.encodeUTF8(input);
+        const msgData = this.util.encodeUTF8(clipboardData);
         const cmdBuf = new Uint8Array(PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH + msgData.length);
         cmdBuf[0] = 90;
         cmdBuf[1] = 90;
@@ -55,5 +53,4 @@ export default class KeyboardListener {
 
         cmdBuf.set(msgData, PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH);
         this.msgHandler(cmdBuf.buffer);
-    }
 }
\ No newline at end of file
diff --git a/sdk/src/config/staticConfig.js b/sdk/src/config/staticConfig.js
deleted file mode 100644
index 440d055..0000000
--- a/sdk/src/config/staticConfig.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  KEYBOARD_TYPE: 2, // 键盘的输入模式：常规输入模式为 1，keycode模式为 2
-};
-- 
Gitee


From fe29ebf93462792dfe77d1d9ebb844a465be9dfd Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 11:54:15 +0800
Subject: [PATCH 13/22] support keycode and keyboard

---
 sdk/demo/demo.html             |  2 +-
 sdk/src/AppController.js       |  8 ++++----
 sdk/src/CPHCloudApp.js         |  4 ++--
 sdk/src/KeyboardListener.js    | 10 ++++------
 sdk/src/config/staticConfig.js |  3 ---
 5 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 sdk/src/config/staticConfig.js

diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html
index 3147a27..b34d37f 100644
--- a/sdk/demo/demo.html
+++ b/sdk/demo/demo.html
@@ -579,7 +579,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
       auto_rotate: true,
       libPath: commonLibPath, // 配置库文件地址
       microPhoneOutputType: 'OPUS', // PCM或OPUS
-      key_code_input: false
+      keycode_input: false
     };
     try {
       if (CloudApp.isSupport()) {
diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 732593e..cc75d8b 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -351,9 +351,9 @@ class AppController {
 
     initPlyerAndStart() {
         this.initPlayer();
-        console.log("initPlyerAndStart " + this.options.keyCodeInput);
+        console.log("initPlyerAndStart " + this.options.keycodeInput);
         if (this.player) {
-            if (this.options.keyCodeInput && !this.options.isMobile) {
+            if (this.options.keycodeInput && !this.options.isMobile) {
                 this.keyboardListener = new KeyboardListener(this.options.containerId, this.send);
             } else {
                 this.keyboardInput = new KeyboardInput(this.options.containerId, this.send, this.options.isMobile);
@@ -368,7 +368,7 @@ class AppController {
                 inputId: this.keyboardInput && this.keyboardInput.inputId || ''
             });
             this.touchHandler.start();
-            if (this.options.keyCodeInput && !this.options.isMobile) {
+            if (this.options.keycodeInput && !this.options.isMobile) {
                 this.keyboardListener.start(this.touchHandler);
             } else {
                 this.keyboardInput.getTouchHandler(this.touchHandler);
@@ -519,7 +519,7 @@ class AppController {
             this.processChannelData(channelDataPkg)
         }
 
-        if (this.keyboardInput && !this.options.keyCodeInput) {
+        if (this.keyboardInput && !this.options.keycodeInput) {
             this.touchHandler.updateKeyBoardMode('KEYBOARD_INPUT');
             this.keyboardInput.start();
         }
diff --git a/sdk/src/CPHCloudApp.js b/sdk/src/CPHCloudApp.js
index 57e67be..9517742 100644
--- a/sdk/src/CPHCloudApp.js
+++ b/sdk/src/CPHCloudApp.js
@@ -82,9 +82,9 @@ class CPHCloudApp {
             reconnectTimes: userOptions.reconnect_times === undefined ? DEFAULT_RECONNECT_TIMES : userOptions.reconnect_times,
             libPath: userOptions.libPath,
             microPhoneOutputType: userOptions.microPhoneOutputType,
-            keyCodeInput: userOptions.key_code_input === undefined ? true : userOptions.key_code_input
+            keycodeInput: userOptions.keycode_input === undefined ? true : userOptions.keycode_input
         };
-        console.log("CPHCloudApp " + options.keyCodeInput);
+        console.log("CPHCloudApp " + options.keycodeInput);
         options.autoRotate = userOptions.auto_rotate && options.isMobile;
         if (userOptions.media_config) {
             options.mediaConfig = userOptions.media_config;
diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
index 42890e6..0323e68 100644
--- a/sdk/src/KeyboardListener.js
+++ b/sdk/src/KeyboardListener.js
@@ -32,14 +32,12 @@ export default class KeyboardListener {
     }
 
     sendClipboardData(clipboardData) {
-        let sendMsgCode = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
-        this.handleInputMsg(clipboardData, 'KEYBOARD_INPUT' , sendMsgCode);
-    }
-    
-    handleInputMsg(input, msgType, textType) {
+        let textType = PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_FROM_PC_SDK;
+        let msgType = 'KEYBOARD_INPUT';
+
         const PACKAGE_HEADER_LENGTH = 8;
         const INPUT_HEADER_LENGTH = 3;
-        const msgData = this.util.encodeUTF8(input);
+        const msgData = this.util.encodeUTF8(clipboardData);
         const cmdBuf = new Uint8Array(PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH + msgData.length);
         cmdBuf[0] = 90;
         cmdBuf[1] = 90;
diff --git a/sdk/src/config/staticConfig.js b/sdk/src/config/staticConfig.js
deleted file mode 100644
index 440d055..0000000
--- a/sdk/src/config/staticConfig.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  KEYBOARD_TYPE: 2, // 键盘的输入模式：常规输入模式为 1，keycode模式为 2
-};
-- 
Gitee


From b0d2fecef8a3ba2f3cfabc1f33a22acec1d01330 Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 11:59:19 +0800
Subject: [PATCH 14/22] support keycode

---
 sdk/src/KeyboardListener.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
index 7e8cc5d..0323e68 100644
--- a/sdk/src/KeyboardListener.js
+++ b/sdk/src/KeyboardListener.js
@@ -53,4 +53,5 @@ export default class KeyboardListener {
 
         cmdBuf.set(msgData, PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH);
         this.msgHandler(cmdBuf.buffer);
+    }
 }
\ No newline at end of file
-- 
Gitee


From 2a3aff63566011b176c3a08bca84a55dab4654ed Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 12:02:03 +0800
Subject: [PATCH 15/22] support keycode

---
 sdk/src/KeyboardListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/src/KeyboardListener.js b/sdk/src/KeyboardListener.js
index 0323e68..f085650 100644
--- a/sdk/src/KeyboardListener.js
+++ b/sdk/src/KeyboardListener.js
@@ -53,5 +53,5 @@ export default class KeyboardListener {
 
         cmdBuf.set(msgData, PACKAGE_HEADER_LENGTH + INPUT_HEADER_LENGTH);
         this.msgHandler(cmdBuf.buffer);
-    }
+    }    
 }
\ No newline at end of file
-- 
Gitee


From f3af529c4a73b7c03cad84481e15041d052e5bdf Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 12:06:14 +0800
Subject: [PATCH 16/22] support keycode

---
 sdk/src/KeyboardInput.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/src/KeyboardInput.js b/sdk/src/KeyboardInput.js
index 18dd56f..426934d 100644
--- a/sdk/src/KeyboardInput.js
+++ b/sdk/src/KeyboardInput.js
@@ -14,7 +14,6 @@
 
 import PROTOCOL_CONFIG from "./config/protocolConfig";
 import Util from "./Util";
-import StaticConfig from './config/staticConfig';
 
 const KEYCODE_ENTER_NUMBER_ZONE = 108;
 const KEYCODE_ENTER_CTRL_ZONE = 13;
-- 
Gitee


From 3bcded1a226be33cd3c970aa8e2fc5dcb60d9339 Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 15:26:56 +0800
Subject: [PATCH 17/22] support keycode

---
 sdk/demo/demo.html       | 3 +--
 sdk/src/AppController.js | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html
index b34d37f..ece9042 100644
--- a/sdk/demo/demo.html
+++ b/sdk/demo/demo.html
@@ -578,8 +578,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
       _debug: true,
       auto_rotate: true,
       libPath: commonLibPath, // 配置库文件地址
-      microPhoneOutputType: 'OPUS', // PCM或OPUS
-      keycode_input: false
+      microPhoneOutputType: 'OPUS' // PCM或OPUS
     };
     try {
       if (CloudApp.isSupport()) {
diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index cc75d8b..9f8e89e 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -524,9 +524,7 @@ class AppController {
             this.keyboardInput.start();
         }
         const keyboardInputPkg = this.frameParser.shiftPackage('KeyboardInput');
-        if (keyboardInputPkg) {
-            this.processKeyboardInput(keyboardInputPkg);
-        }
+        this.processKeyboardInput(keyboardInputPkg);
     }
 
     updateResolutionAndTouch() {
@@ -783,7 +781,7 @@ class AppController {
     }
 
     processKeyboardInput(pkg) {
-        if (!this.keyboardInput || pkg.length < PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH) {
+        if (pkg.length < PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH) {
             return;
         }
 
-- 
Gitee


From f42ade828bee8304f7fa034ee088f7800297ffa1 Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 15:29:05 +0800
Subject: [PATCH 18/22] modify version to 23.12.3.1

---
 sdk/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/package.json b/sdk/package.json
index 9fa2621..ac5963d 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CloudAppSdk_H5",
-  "version": "23.12.3",
+  "version": "23.12.3.1",
   "description": "cas h5 sdk",
   "main": ".eslintrc.js",
   "scripts": {
-- 
Gitee


From ffd288d6bf0c9449fbcada71e366aeec86d0dceb Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Mon, 19 Feb 2024 15:29:05 +0800
Subject: [PATCH 19/22] modify version to 23.12.3.1

---
 sdk/package.json         | 2 +-
 sdk/src/AppController.js | 1 -
 sdk/src/CPHCloudApp.js   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sdk/package.json b/sdk/package.json
index 9fa2621..ac5963d 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CloudAppSdk_H5",
-  "version": "23.12.3",
+  "version": "23.12.3.1",
   "description": "cas h5 sdk",
   "main": ".eslintrc.js",
   "scripts": {
diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 9f8e89e..7506fee 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -351,7 +351,6 @@ class AppController {
 
     initPlyerAndStart() {
         this.initPlayer();
-        console.log("initPlyerAndStart " + this.options.keycodeInput);
         if (this.player) {
             if (this.options.keycodeInput && !this.options.isMobile) {
                 this.keyboardListener = new KeyboardListener(this.options.containerId, this.send);
diff --git a/sdk/src/CPHCloudApp.js b/sdk/src/CPHCloudApp.js
index 9517742..51d79c7 100644
--- a/sdk/src/CPHCloudApp.js
+++ b/sdk/src/CPHCloudApp.js
@@ -84,7 +84,6 @@ class CPHCloudApp {
             microPhoneOutputType: userOptions.microPhoneOutputType,
             keycodeInput: userOptions.keycode_input === undefined ? true : userOptions.keycode_input
         };
-        console.log("CPHCloudApp " + options.keycodeInput);
         options.autoRotate = userOptions.auto_rotate && options.isMobile;
         if (userOptions.media_config) {
             options.mediaConfig = userOptions.media_config;
-- 
Gitee


From f2027b44cbb2d4aa90a74b727a5802f18de21085 Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Wed, 21 Feb 2024 14:26:13 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E9=94=AE?=
 =?UTF-8?q?=E7=9B=98=E6=95=B0=E5=AD=97=E8=BE=93=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/src/AppController.js         |  1 -
 sdk/src/config/protocolConfig.js | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 7506fee..7a9d43b 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -783,7 +783,6 @@ class AppController {
         if (pkg.length < PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH) {
             return;
         }
-
         const [type, highBytesSize, lowByteSize] = pkg; 
         if (type === PROTOCOL_CONFIG.KEYBOARD_INPUT_MSG_TYPE.IME_PASTE_TO_SDK) {
             const len = (highBytesSize << 8) + lowByteSize;
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index 2286d31..7df5c2f 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -200,17 +200,6 @@ const PROTOCOL_CONFIG = {
         37: 21, // 左
         20: 115, // 大写锁定
 
-        // 小键盘
-        96: 7, // 0
-        97: 8, // 1
-        98: 9, // 2
-        99: 10, // 3
-        100: 11, // 4
-        101: 12, // 5
-        102: 13, // 6
-        103: 14, // 7
-        104: 15, // 8
-        105: 16, // 9
         110: 56, // .
         109: 156, // -
         107: 157, // +
-- 
Gitee


From 2d5e37054f8a42c5974085e4092e3f065b8c05c4 Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Wed, 21 Feb 2024 15:51:01 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E9=94=AE?=
 =?UTF-8?q?=E7=9B=98+=E2=80=94-=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/src/config/protocolConfig.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index 7df5c2f..cc449a0 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -199,12 +199,6 @@ const PROTOCOL_CONFIG = {
         39: 22, // 右
         37: 21, // 左
         20: 115, // 大写锁定
-
-        110: 56, // .
-        109: 156, // -
-        107: 157, // +
-        111: 154, // /
-        106: 155, // *
     },
     PC_KEY_PRESS_MAP: {
         // A-Z
-- 
Gitee


From 43719a7762c77c2b0e90673e65349be0a6491b72 Mon Sep 17 00:00:00 2001
From: CaiFeng <2397707574@qq.com>
Date: Wed, 21 Feb 2024 17:01:14 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E8=A1=8C?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/src/AppController.js         |  6 ++++--
 sdk/src/Util.js                  | 16 +++-------------
 sdk/src/config/protocolConfig.js |  2 +-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js
index 7a9d43b..5c5031c 100644
--- a/sdk/src/AppController.js
+++ b/sdk/src/AppController.js
@@ -523,7 +523,9 @@ class AppController {
             this.keyboardInput.start();
         }
         const keyboardInputPkg = this.frameParser.shiftPackage('KeyboardInput');
-        this.processKeyboardInput(keyboardInputPkg);
+        if (keyboardInputPkg) {
+            this.processKeyboardInput(keyboardInputPkg);
+        }
     }
 
     updateResolutionAndTouch() {
@@ -780,7 +782,7 @@ class AppController {
     }
 
     processKeyboardInput(pkg) {
-        if (pkg.length < PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH) {
+        if (pkg?.length < PROTOCOL_CONFIG.KEYBOARD_INPUT_HEADER_LENGTH) {
             return;
         }
         const [type, highBytesSize, lowByteSize] = pkg; 
diff --git a/sdk/src/Util.js b/sdk/src/Util.js
index 194e80d..ebb65b2 100644
--- a/sdk/src/Util.js
+++ b/sdk/src/Util.js
@@ -93,19 +93,9 @@ export default class Util {
     }
 
     decodeUTF8(utf8Array, start, end) {
-        const len = utf8Array.length;
-        start = start || 0;
-        end = end || len;
-        if (start < 0 || start >= len || end < 0 || end > len) {
-            return '';
-        }
-
-        let encodedStr = '';
-        for (let i = start; i < end; i++) {
-            encodedStr += '%' + utf8Array[i].toString(16);
-        }
-
-        return decodeURIComponent(encodedStr);
+        const decoder = new TextDecoder('utf-8');
+        const str = decoder.decode(new Uint8Array(utf8Array.slice(start, end))); // 调用decode()方法将数组转换为字符串
+        return str
     }
 
     createEl(tagName = 'div', options) {
diff --git a/sdk/src/config/protocolConfig.js b/sdk/src/config/protocolConfig.js
index cc449a0..8c7a2c8 100644
--- a/sdk/src/config/protocolConfig.js
+++ b/sdk/src/config/protocolConfig.js
@@ -280,7 +280,7 @@ const PROTOCOL_CONFIG = {
         91: 71, // [ 
         93: 72, // ] 
         92: 73, // \
-        36: 18, // #
+        35: 18, // #
         64: 77, // @
         42: 155, // *
         43: 157, // +
-- 
Gitee