From 4a7f6ca8b6fd18257e7acc21b7ce4ba4c7ca1e56 Mon Sep 17 00:00:00 2001
From: "jiale.zhao@kikatech.com" <jiale.zhao@kikatech.com>
Date: Fri, 17 Sep 2021 17:27:22 +0800
Subject: [PATCH 1/2] update master kika code

Signed-off-by: jiale.zhao@kikatech.com <jiale.zhao@kikatech.com>
---
 .../entry/src/main/js/default/pages/index/index.js     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js
index d59aefee94..cfaa8d5d54 100644
--- a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js
+++ b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import app from '@system.app'
+import Window from '@ohos.window'
 import {InputMethodAbility} from '@ohos.inputMethodAbility'
 var inputMethodAbility=new InputMethodAbility();
 export default {
@@ -324,6 +325,10 @@ export default {
         isKeyBoardShow:false,
     },
     onInit(){
+        Window.getTopWindow().then((windowData)=>{
+            windowData.resetSize(480,250);
+            windowData.moveTo(0,710);
+        });
         inputMethodAbility.on('keyboardShow',(err) =>{
             console.info('keyboard show');
             this.isKeyBoardShow=true;
@@ -369,14 +374,15 @@ export default {
     delete(){
         if(this.showText){
             this.showText =  this.showText.substr(0,this.showText.length - 1);
+            inputMethodAbility.DeleteBackward(1);
         }
     },
     //提交数据
     submit(){
-        this.appExit();
+        inputMethodAbility.HideKeyboardSelf();
     },
     downClick(){
-        this.appExit();
+        inputMethodAbility.HideKeyboardSelf();
     }
 }
 
-- 
Gitee


From 10bdf4e48bba55812665158989e9e80e962ac66f Mon Sep 17 00:00:00 2001
From: "jiale.zhao@kikatech.com" <jiale.zhao@kikatech.com>
Date: Sat, 18 Sep 2021 16:19:42 +0800
Subject: [PATCH 2/2] modeify keyboard

Signed-off-by: jiale.zhao@kikatech.com <jiale.zhao@kikatech.com>
---
 .../src/main/js/default/pages/index/index.css      |  1 -
 .../src/main/js/default/pages/index/index.hml      | 14 ++++++++------
 .../entry/src/main/js/default/pages/index/index.js |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.css b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.css
index e1fdd57bbb..9170c3152c 100644
--- a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.css
+++ b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.css
@@ -28,7 +28,6 @@
     align-items: center;
     justify-content: flex-end;
     padding-right: 4%;
-
 }
 .keyboardContainer {
     width: 100%;
diff --git a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.hml b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.hml
index 1257c5c1dc..cf38297db0 100644
--- a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.hml
+++ b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.hml
@@ -1,12 +1,14 @@
 <div class="container">
-    <div class="showContent" show="{{isKeyBoardShow}}" >
-        <text class="keyText" >
-           {{showText}}
-        </text>
-    </div>
+<!--    <div class="showContent" show="{{isKeyBoardShow}}" >-->
+<!--        <text class="keyText" >-->
+<!--           {{showText}}-->
+<!--        </text>-->
+<!--    </div>-->
     <div class="keyboard" id="keyboard" show="{{isKeyBoardShow}}" >
         <div class="downContainer" @click="downClick()" >
-            <image class="itemImg" src="/common/images/down.png"></image>
+            <div>
+                <image class="itemImg" src="/common/images/down.png"></image>
+            </div>
         </div>
         <div class="keyboardContainer" if="{{status===1}}">
             <div class="itemContainer">
diff --git a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js
index cfaa8d5d54..9f99bc6876 100644
--- a/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js
+++ b/CompleteApps/KikaInput/entry/src/main/js/default/pages/index/index.js
@@ -326,8 +326,8 @@ export default {
     },
     onInit(){
         Window.getTopWindow().then((windowData)=>{
-            windowData.resetSize(480,250);
-            windowData.moveTo(0,710);
+            windowData.resetSize(480,190);
+            windowData.moveTo(0,702);
         });
         inputMethodAbility.on('keyboardShow',(err) =>{
             console.info('keyboard show');
-- 
Gitee