From a13d67f92c45bdfd66edabd1d43e425bea10a6b2 Mon Sep 17 00:00:00 2001
From: some-one-mmx <maominxian1@huawei.com>
Date: Fri, 15 Sep 2023 07:15:05 +0000
Subject: [PATCH] add web optimization switch api & add nweb id log

Signed-off-by: some-one-mmx <maominxian1@huawei.com>
Change-Id: If4edcb1468e10ebe473b1a0f8ac41b52e3107ef8
---
 ohos_nweb/src/cef_delegate/nweb_delegate.cc | 18 +++++++++---------
 ohos_nweb/src/nweb_impl.cc                  | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ohos_nweb/src/cef_delegate/nweb_delegate.cc b/ohos_nweb/src/cef_delegate/nweb_delegate.cc
index 18dc4f1b0d..2858e75982 100755
--- a/ohos_nweb/src/cef_delegate/nweb_delegate.cc
+++ b/ohos_nweb/src/cef_delegate/nweb_delegate.cc
@@ -907,7 +907,7 @@ void NWebDelegate::InitialScale(float scale) const {
 }
 
 void NWebDelegate::OnPause() {
-  LOG(DEBUG) << "NWebDelegate::OnPause";
+  LOG(DEBUG) << "NWebDelegate::OnPause, nweb_id = " << nweb_id_;
   if (!GetBrowser().get()) {
     return;
   }
@@ -923,7 +923,7 @@ void NWebDelegate::OnPause() {
 
   if (!hidden_) {
     // Set the browser as hidden.
-    LOG(DEBUG) << "NWebDelegate::OnPause set hidden";
+    LOG(DEBUG) << "NWebDelegate::OnPause set hidden, nweb_id = " << nweb_id_;
     GetBrowser()->GetHost()->WasHidden(true);
     hidden_ = true;
   }
@@ -931,13 +931,13 @@ void NWebDelegate::OnPause() {
 }
 
 void NWebDelegate::OnContinue() {
-  LOG(DEBUG) << "NWebDelegate::OnContinue";
+  LOG(DEBUG) << "NWebDelegate::OnContinue, nweb_id = " << nweb_id_;
   if (!GetBrowser().get()) {
     return;
   }
 
   if (occluded_) {
-    LOG(DEBUG) << "NWebDelegate::OnContinue set occluded";
+    LOG(DEBUG) << "NWebDelegate::OnContinue set occluded, nweb_id = " << nweb_id_;
     hidden_ = false;
     GetBrowser()->GetHost()->WasOccluded(true);
     return;
@@ -945,7 +945,7 @@ void NWebDelegate::OnContinue() {
 
   if (hidden_) {
     // Set the browser as visible.
-    LOG(DEBUG) << "NWebDelegate::OnContinue set unhidden";
+    LOG(DEBUG) << "NWebDelegate::OnContinue set unhidden, nweb_id = " << nweb_id_;
     GetBrowser()->GetHost()->WasHidden(false);
     hidden_ = false;
   }
@@ -962,28 +962,28 @@ void NWebDelegate::OnContinue() {
 }
 
 void NWebDelegate::OnOccluded() {
-  LOG(DEBUG) << "NWebDelegate::OnOccluded";
+  LOG(DEBUG) << "NWebDelegate::OnOccluded, nweb_id = " << nweb_id_;
   if (!GetBrowser().get()) {
     return;
   }
 
   if (!hidden_ && !occluded_) {
     // Set the browser as occluded.
-    LOG(DEBUG) << "NWebDelegate::OnOccluded set occluded";
+    LOG(DEBUG) << "NWebDelegate::OnOccluded set occluded, nweb_id = " << nweb_id_;
     GetBrowser()->GetHost()->WasOccluded(true);
   }
   occluded_ = true;
 }
 
 void NWebDelegate::OnUnoccluded() {
-  LOG(DEBUG) << "NWebDelegate::OnUnoccluded";
+  LOG(DEBUG) << "NWebDelegate::OnUnoccluded, nweb_id = " << nweb_id_;
   if (!GetBrowser().get()) {
     return;
   }
 
   if (!hidden_ && occluded_) {
     // Set the browser as visible.
-    LOG(DEBUG) << "NWebDelegate::OnUnoccluded set unoccluded";
+    LOG(DEBUG) << "NWebDelegate::OnUnoccluded set unoccluded, nweb_id = " << nweb_id_;
     GetBrowser()->GetHost()->WasOccluded(false);
   }
   occluded_ = false;
diff --git a/ohos_nweb/src/nweb_impl.cc b/ohos_nweb/src/nweb_impl.cc
index b38953a4b1..00112e74b8 100755
--- a/ohos_nweb/src/nweb_impl.cc
+++ b/ohos_nweb/src/nweb_impl.cc
@@ -74,6 +74,12 @@ bool g_browser_service_api_enabled = false;
 uint32_t g_nweb_max_count = 0;
 #endif
 
+bool GetWebOptimizationValue() {
+  auto& system_properties_adapter = OHOS::NWeb::OhosAdapterHelper::GetInstance()
+                                    .GetSystemPropertiesInstance();
+  return system_properties_adapter.GetWebOptimizationValue();
+}
+
 }  // namespace
 
 namespace OHOS::NWeb {
@@ -606,6 +612,10 @@ void NWebImpl::InitialScale(float scale) const {
 }
 
 void NWebImpl::OnPause() const {
+  if (!GetWebOptimizationValue()) {
+    LOG(DEBUG) << "WebOptimization disabled.";
+    return;
+  }
   if (nweb_delegate_ == nullptr) {
     LOG(ERROR) << "nweb_delegate_ is nullptr.";
     return;
@@ -637,6 +647,10 @@ void NWebImpl::OnContinue() const {
 }
 
 void NWebImpl::OnOccluded() const {
+  if (!GetWebOptimizationValue()) {
+    LOG(DEBUG) << "WebOptimization disabled.";
+    return;
+  }
   if (nweb_delegate_ == nullptr) {
     LOG(ERROR) << "nweb_delegate_ is nullptr.";
     return;
-- 
Gitee