diff --git a/OAT.xml b/OAT.xml
index 49e2427e..524df54d 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -80,6 +80,40 @@
 				<filteritem type="filepath" name="figures/.*.png" desc="self developed image"/>
 				
 				<filteritem type="filepath" name="figures/.*.jpg" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/phone/dropdownpanel/src/main/resources/phone/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/phone/dropdownpanel/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="features/controlcentercomponent/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/pc/notificationpanel/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="AppScope/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/default/notificationmanagement/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/phone/statusbar/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="entry/pc/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/pc/statusbar/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="entry/phone/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="features/bluetoothcomponent/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="features/locationcomponent/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="features/volumepanelcomponent/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/default/navigationBar/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/default/volumepanel/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="features/statusbarcomponent/src/main/resources/base/media/.*.png" desc="self developed image"/>
+
+				<filteritem type="filepath" name="product/pc/controlpanel/src/main/resources/base/media/.*.png" desc="self developed image"/>
 			</filefilter>
 			<filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
 				<filteritem type="filename" name="README|README_zh|.*.log|.*.json5|.*.json" desc=""/>
diff --git a/features/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets b/features/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets
index afca2178..829f0d99 100644
--- a/features/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets
+++ b/features/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets
@@ -66,7 +66,6 @@ export default struct IconItemComponent {
     const statusBarStatusKey = 'StatusBar_Status_' + this.keyId
     AppStorage.SetOrCreate(statusBarStatusKey, { selected: false })
     this.mItemStatus = AppStorage.Get(statusBarStatusKey)
-//    this.mItemStatus = AppStorage.SetAndLink('StatusBar_Status_' + this.keyId, { selected: false }).get()
   }
 
   build() {
diff --git a/product/default/navigationBar/src/main/ets/common/IndicatorConfig.ts b/product/default/navigationBar/src/main/ets/common/IndicatorConfig.ts
index aaa4c738..7d950f34 100644
--- a/product/default/navigationBar/src/main/ets/common/IndicatorConfig.ts
+++ b/product/default/navigationBar/src/main/ets/common/IndicatorConfig.ts
@@ -1,5 +1,16 @@
 /*
- * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved.
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 export default class IndicatorStyle {
diff --git a/product/default/navigationBar/src/main/ets/viewmodel/ViewModel.ts b/product/default/navigationBar/src/main/ets/viewmodel/ViewModel.ts
index 25dcb679..65074789 100644
--- a/product/default/navigationBar/src/main/ets/viewmodel/ViewModel.ts
+++ b/product/default/navigationBar/src/main/ets/viewmodel/ViewModel.ts
@@ -1,5 +1,16 @@
 /*
- * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved.
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import privacyManager from '@ohos.privacyManager';
diff --git a/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets b/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets
index 4feff5bf..468650b2 100644
--- a/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets
+++ b/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets
@@ -117,14 +117,6 @@ struct Index {
     Log.showDebug(TAG, `onBannerNoticeShow start`);
     let winInfoNotice = WindowManager.getWindowInfo(WindowType.NOTIFICATION_PANEL);
     let bannerDisabledFlg = false;
-//    let screenLockStatusInfo = AppStorage.Link('lockStatus');
-//    let screenLockStatus = ScreenLockStatus.Unlock;
-//    if (!!screenLockStatusInfo) {
-//      screenLockStatus = screenLockStatusInfo.get();
-//    }
-//    if (screenLockStatus == ScreenLockStatus.Locking) {
-//      bannerDisabledFlg = true;
-//    } else
       if (winInfoNotice) {
       if (winInfoNotice.visibility) {
         bannerDisabledFlg = true;
diff --git a/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets b/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets
index 9c3dca30..91f6a71a 100644
--- a/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets
+++ b/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets
@@ -117,14 +117,6 @@ struct Index {
     Log.showDebug(TAG, `onBannerNoticeShow start`);
     let windowInfoDrop = WindowManager.getWindowInfo(WindowType.DROPDOWN_PANEL);
     let bannerDisabledFlg = false;
-//    let screenLockStatusInfo = AppStorage.Link('lockStatus');
-//    let screenLockStatus = ScreenLockStatus.Unlock;
-//    if (!!screenLockStatusInfo) {
-//      screenLockStatus = screenLockStatusInfo.get();
-//    }
-//    if (screenLockStatus == ScreenLockStatus.Locking) {
-//      bannerDisabledFlg = true;
-//    } else
       if (windowInfoDrop) {
       if (windowInfoDrop.visibility) {
         bannerDisabledFlg = true;