You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by xi...@apache.org on 2019/02/12 06:29:26 UTC

[incubator-weex] branch master updated: [iOS] Fix setViewportWidth on iOS. (#2107)

This is an automated email from the ASF dual-hosted git repository.

xifang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git


The following commit(s) were added to refs/heads/master by this push:
     new f4aea82  [iOS] Fix setViewportWidth on iOS. (#2107)
f4aea82 is described below

commit f4aea82fdb5b07cb2f3ff40040a1cb941938ae2a
Author: wqyfavor <wq...@gmail.com>
AuthorDate: Tue Feb 12 14:29:21 2019 +0800

    [iOS] Fix setViewportWidth on iOS. (#2107)
    
    * [iOS] Fix setViewportWidth on iOS.
    
    * [iOS] Add set device size method.
---
 ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.h                |  3 +++
 ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm               |  7 +++++++
 .../Source/core/bridge/platform/core_side_in_platform.cpp    |  5 +----
 weex_core/Source/core/render/manager/render_manager.cpp      | 12 ++++++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.h b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.h
index 0c57099..93689e8 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.h
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.h
@@ -159,6 +159,8 @@ namespace WeexCore
                  isWidthWrapContent:(BOOL)isWidthWrapContent
                 isHeightWrapContent:(BOOL)isHeightWrapContent;
 
++ (void)setDeviceSize:(CGSize)size;
+
 + (void)setViewportWidth:(NSString*)pageId width:(CGFloat)width;
 
 + (void)layoutPage:(NSString*)pageId forced:(BOOL)forced;
@@ -204,6 +206,7 @@ namespace WeexCore
 + (void)registerComponentAffineType:(NSString *)type asType:(NSString *)baseType;
 
 + (BOOL)isComponentAffineType:(NSString *)type asType:(NSString *)baseType;
+
 + (void)registerCoreEnv:(NSString*)key withValue:(NSString*)value;
 
 @end
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
index 7838a8e..c65aad5 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
@@ -832,6 +832,13 @@ static WeexCore::ScriptBridge* jsBridge = nullptr;
     }
 }
 
++ (void)setDeviceSize:(CGSize)size
+{
+    WeexCore::WXCoreEnvironment* env = WeexCore::WXCoreEnvironment::getInstance();
+    env->SetDeviceWidth(std::to_string(size.width));
+    env->SetDeviceHeight(std::to_string(size.height));
+}
+
 + (void)setViewportWidth:(NSString*)pageId width:(CGFloat)width
 {
     if (platformBridge) {
diff --git a/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp b/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp
index 20cde2d..022dffc 100644
--- a/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp
+++ b/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp
@@ -163,10 +163,7 @@ void CoreSideInPlatform::MarkDirty(const std::string &instance_id,
 
 void CoreSideInPlatform::SetViewPortWidth(const std::string &instance_id,
                                           float width) {
-  RenderPage *page = RenderManager::GetInstance()->GetPage(instance_id);
-  if (page == nullptr) return;
-
-  page->set_viewport_width(width);
+    RenderManager::GetInstance()->set_viewport_width(instance_id, width);
 }
 
 void CoreSideInPlatform::SetPageDirty(const std::string &instance_id) {
diff --git a/weex_core/Source/core/render/manager/render_manager.cpp b/weex_core/Source/core/render/manager/render_manager.cpp
index c9c264e..5ab1660 100644
--- a/weex_core/Source/core/render/manager/render_manager.cpp
+++ b/weex_core/Source/core/render/manager/render_manager.cpp
@@ -50,7 +50,7 @@ bool RenderManager::CreatePage(const std::string& page_id, const char *data) {
   std::map<std::string, float>::iterator iter_viewport =
       this->viewports_.find(page_id);
   if (iter_viewport != this->viewports_.end()) {
-    this->set_viewport_width(page_id, iter_viewport->second);
+    page->set_viewport_width(iter_viewport->second);
     this->viewports_.erase(page_id);
   }
 
@@ -82,7 +82,7 @@ bool RenderManager::CreatePage(const std::string& page_id, RenderObject *root) {
   std::map<std::string, float>::iterator iter =
       this->viewports_.find(page_id);
   if (iter != this->viewports_.end()) {
-    RenderManager::GetInstance()->set_viewport_width(page_id, iter->second);
+    page->set_viewport_width(iter->second);
     this->viewports_.erase(page_id);
   }
 
@@ -101,7 +101,7 @@ bool RenderManager::CreatePage(const std::string& page_id, std::function<RenderO
     std::map<std::string, float>::iterator iter =
     this->viewports_.find(page_id);
     if (iter != this->viewports_.end()) {
-        RenderManager::GetInstance()->set_viewport_width(page_id, iter->second);
+        page->set_viewport_width(iter->second);
         this->viewports_.erase(page_id);
     }
     
@@ -371,7 +371,11 @@ float RenderManager::viewport_width(const std::string &page_id) {
 
 void RenderManager::set_viewport_width(const std::string &page_id, float viewport_width) {
   RenderPage *page = GetPage(page_id);
-  if (page == nullptr) return;
+  if (page == nullptr) {
+      // page is not created yet, we should store the view port value
+      viewports_.insert(std::pair<std::string, float>(page_id, viewport_width));
+      return;
+  }
 
   page->set_viewport_width(viewport_width);
 }