!93 输入密码时点击小眼睛发现文字显示不全问题解决

Merge pull request !93 from fangzheng24/cherry-pick-1679557761

features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem.ets

@@ -57,7 +57,6 @@ export default struct BannerNotificationItem {
 
   aboutToAppear() {
     Log.showInfo(TAG, `aboutToAppear Start`)
-    setAppBgColor('#00000000')
     this.mCloseEnableFlg = false;
     this.mDefaultBannerRect = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_BANNER_NOTICE, 'bannerRect');
     setTimeout(() => {

features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts

@@ -176,10 +176,10 @@ export default class AccountsModel {
     private sortAccount(info1, info2): number {
         if (info1.isActived || info2.isActived) {
             return info1.isActived ? -1 : 1;
-        } else if (info1.type == osAccount.OsAccoutType.ADMIN || info2.type == osAccount.OsAccoutType.ADMIN) {
-            return info1.type == osAccount.OsAccoutType.ADMIN ? -1 : 1;
-        } else if (info1.type == osAccount.OsAccoutType.GUEST || info2.type == osAccount.OsAccoutType.GUEST) {
-            return info1.type == osAccount.OsAccoutType.GUEST ? 1 : -1;
+        } else if (info1.type.ADMIN == TYPE_ADMIN || info2.type.ADMIN == TYPE_ADMIN) {
+            return info1.type.ADMIN == TYPE_ADMIN ? -1 : 1;
+        } else if (info1.type.GUEST == TYPE_GUEST || info2.type.GUEST == TYPE_GUEST) {
+            return info1.type.GUEST == TYPE_GUEST ? 1 : -1;
         } else {
             return info2.localId - info1.localId;
         }

features/screenlock/src/main/resources/phone/element/float.json

@@ -118,7 +118,7 @@
     },
     {
       "name": "mixedpsd_prompt_text_fontsize",
-      "value": "20fp"
+      "value": "12fp"
     },
     {
       "name": "mixedpsd_prompt_margin_bottom",

features/wallpapercomponent/src/main/ets/com/ohos/vm/wallpaperViewModel.ts

@@ -41,6 +41,7 @@ export default class WallpaperViewModel {
         WallpaperMar.getPixelMap(WallpaperMar.WallpaperType.WALLPAPER_LOCKSCREEN, (error, data) => {
             if (error != undefined && error != null) {
                 Log.showError(TAG, 'getScreenLockWallpaper error:' + JSON.stringify(error));
+                this.getScreenLockWallpaper()
             } else {
                 Log.showDebug(TAG, 'getScreenLockWallpaper data:' + JSON.stringify(data));
                 this.wallpaperData = data

product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts

@@ -21,6 +21,7 @@ import Log from '../../../../../../common/src/main/ets/default/Log'
 import Constants from '../../../../../../features/screenlock/src/main/ets/com/ohos/common/constants'
 import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'
 import sTimeManager from '../../../../../../common/src/main/ets/default/TimeManager'
+import inputMethod from '@ohos.inputMethod'
 
 const TAG = "ScreenLock-ServiceExtAbility"
 const AUTO_ROTATION_RETRICTED: number = 8
@@ -49,6 +50,13 @@ class ServiceExtAbility extends ServiceExtension {
                         Log.showInfo(TAG, "direction change : " + this.direction)
                         AppStorage.SetOrCreate('screenlockdirection', this.direction)
                         this.resetWindow(display.width,display.height)
+                        let inputMethodController = inputMethod.getController();
+                        Log.showInfo(TAG, "inputMethodController: "+inputMethodController)
+                        inputMethodController.hideSoftKeyboard().then(() => {
+                            Log.showInfo(TAG, "Succeeded in hiding softKeyboard")
+                        }).catch((err) => {
+                            Log.showError(TAG, "failed to hideSoftKeyboard: " + JSON.stringify(err));
+                        });
                     }
                 }
             })

product/pc/src/main/ets/pages/index.ets

@@ -38,7 +38,6 @@ struct Index {
   aboutToAppear() {
     Log.showInfo(TAG, `aboutToAppear`)
     try {
-      setAppBgColor('#00000000')
       CommonStyleManager.setAbilityPageName(TAG)
       let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect')
       Log.showDebug(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`)

product/pc/src/main/module.json5

@@ -75,6 +75,9 @@
       },
       {
         "name": "ohos.permission.REBOOT"
+      },
+      {
+        "name": "ohos.permission.CONNECT_IME_ABILITY"
       }
     ],
     "extensionAbilities": [

product/phone/src/main/ets/pages/index.ets

@@ -40,7 +40,6 @@ struct Index {
     this.mViewModel.ViewModelInit()
     this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR
     try {
-      setAppBgColor('#00000000')
       CommonStyleManager.setAbilityPageName(TAG)
       let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect')
       Log.showDebug(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`)