You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2018/01/10 13:58:41 UTC

incubator-weex git commit: [android][WEEX-187] weex custom font not rendered right when font is first downloaded

Repository: incubator-weex
Updated Branches:
  refs/heads/master e326e3508 -> 05ce0e4d0


[android][WEEX-187] weex custom font not rendered right when font  is first downloaded

[android][WEEX-187] weex custom font not rendered right when font  is first downloaded
close #972


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/05ce0e4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/05ce0e4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/05ce0e4d

Branch: refs/heads/master
Commit: 05ce0e4d08e2605f66fa6eac853dbf58ea302bcf
Parents: e326e35
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Jan 8 19:33:25 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Jan 10 21:58:13 2018 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/dom/WXDomHandler.java  |  3 ++
 .../java/com/taobao/weex/dom/flex/CSSNode.java  | 14 ++++++--
 .../com/taobao/weex/ui/component/WXText.java    | 38 +++++++++++---------
 .../com/taobao/weex/utils/TypefaceUtil.java     | 30 ++++++++++++----
 4 files changed, 60 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05ce0e4d/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
index a11e820..ceafbdf 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomHandler.java
@@ -136,6 +136,9 @@ public class WXDomHandler implements Handler.Callback {
 
     public static final int WX_DOM_TRANSITION_BATCH = 0xfb;
 
+
+    public static final int WX_DOM_START_BATCH = 0xfc;
+
     @Deprecated
     public static final int WX_COMPONENT_SIZE= 0xff1;
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05ce0e4d/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
index 0818c15..9452fb6 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
@@ -182,10 +182,18 @@ public class CSSNode {
   /**
    * See {@link LayoutState#DIRTY}.
    */
-  protected boolean isDirty() {
+  public boolean isDirty() {
     return mLayoutState == LayoutState.DIRTY;
   }
 
+  public void markDirty() {
+    try{
+      this.dirty();
+    }catch (Exception e){
+      WXLogUtils.e("markDirty",  e);
+    }
+  }
+
   protected void dirty() {
     if (mLayoutState == LayoutState.DIRTY) {
       return;
@@ -193,7 +201,9 @@ public class CSSNode {
       if(WXEnvironment.isApkDebugable()){
           WXLogUtils.d("Previous csslayout was ignored! markLayoutSeen() never called");
       }
-      markLayoutSeen();
+      if(hasNewLayout()) {
+        markLayoutSeen();
+      }
     }
 
     mLayoutState = LayoutState.DIRTY;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05ce0e4d/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
index ea7b9ea..654681e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
@@ -25,18 +25,19 @@ import android.content.IntentFilter;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.Layout;
-import android.view.ViewGroup;
 
 import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.WXSDKInstance;
+import com.taobao.weex.WXSDKManager;
 import com.taobao.weex.annotation.Component;
 import com.taobao.weex.common.Constants;
+import com.taobao.weex.dom.DOMActionContext;
+import com.taobao.weex.dom.WXDomHandler;
 import com.taobao.weex.dom.WXDomObject;
 import com.taobao.weex.ui.ComponentCreator;
 import com.taobao.weex.ui.flat.FlatComponent;
 import com.taobao.weex.ui.flat.widget.TextWidget;
 import com.taobao.weex.ui.view.WXTextView;
-import com.taobao.weex.utils.FontDO;
 import com.taobao.weex.utils.TypefaceUtil;
 import com.taobao.weex.utils.WXLogUtils;
 
@@ -198,23 +199,28 @@ public class WXText extends WXComponent<WXTextView> implements FlatComponent<Tex
         if (!mFontFamily.equals(fontFamily)) {
           return;
         }
-
-        FontDO fontDO = TypefaceUtil.getFontDO(fontFamily);
-        if (fontDO != null && fontDO.getTypeface() != null && getHostView() != null) {
-          WXTextView hostView = getHostView();
-          Layout layout = hostView.getTextLayout();
-          if (layout != null) {
-            layout.getPaint().setTypeface(fontDO.getTypeface());
-            WXLogUtils.d("WXText", "Apply font family " + fontFamily + " to paint");
-          } else {
-            WXLogUtils.w("WXText", "Layout not created");
-          }
-          hostView.invalidate();
+        if(isDestoryed()){
+          return;
+        }
+        DOMActionContext domActionContext = WXSDKManager.getInstance().getWXDomManager().getDomContext(getInstanceId());
+        if(domActionContext == null){
+          return;
+        }
+        WXDomObject domObject = domActionContext.getDomByRef(getRef());
+        if(domObject == null){
+          return;
+        }
+        domObject.markDirty();
+        domActionContext.markDirty();
+        WXSDKManager.getInstance().getWXDomManager().sendEmptyMessageDelayed(WXDomHandler.MsgType.WX_DOM_START_BATCH, 2);
+        if(WXEnvironment.isApkDebugable()) {
+           WXLogUtils.d("WXText", "Font family " + fontFamily + " is available");
         }
-        WXLogUtils.d("WXText", "Font family " + fontFamily + " is available");
       }
     };
-
+    if(WXEnvironment.isApkDebugable()) {
+      WXLogUtils.d("WXText", "Font family register " + desiredFontFamily + " is available" + getRef());
+    }
     LocalBroadcastManager.getInstance(WXEnvironment.getApplication()).registerReceiver(mTypefaceObserver, new IntentFilter(TypefaceUtil.ACTION_TYPE_FACE_AVAILABLE));
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05ce0e4d/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java b/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java
index 65e6ad2..bebefa9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java
@@ -145,11 +145,11 @@ public class TypefaceUtil {
           dir.mkdirs();
         }
         final String fullPath =  dir.getAbsolutePath()+ File.separator +fileName;
-        if (!loadLocalFontFile(fullPath, fontFamily)) {
+        if (!loadLocalFontFile(fullPath, fontFamily, false)) {
           downloadFontByNetwork(url, fullPath, fontFamily);
         }
       } else if (fontDo.getType() == FontDO.TYPE_FILE) {
-        boolean result = loadLocalFontFile(fontDo.getUrl(), fontDo.getFontFamilyName());
+        boolean result = loadLocalFontFile(fontDo.getUrl(), fontDo.getFontFamilyName(), false);
         if (!result) {
           fontDo.setState(FontDO.STATE_FAILED);
         }
@@ -204,7 +204,7 @@ public class TypefaceUtil {
         if (statusCode >= 200 && statusCode <= 299 && response.originalData != null) {
           result = WXFileUtils.saveFile(fullPath, response.originalData, WXEnvironment.getApplication());
           if (result) {
-            result = loadLocalFontFile(fullPath, fontFamily);
+            result = loadLocalFontFile(fullPath, fontFamily, true);
           } else {
             if(WXEnvironment.isApkDebugable()) {
               WXLogUtils.d(TAG, "downloadFontByNetwork() onHttpFinish success, but save file failed.");
@@ -224,7 +224,7 @@ public class TypefaceUtil {
     });
   }
 
-  private static boolean loadLocalFontFile(String path, String fontFamily) {
+  private static boolean loadLocalFontFile(String path, final String fontFamily, boolean hasNetworkDowload) {
     if (TextUtils.isEmpty(path) || TextUtils.isEmpty(fontFamily)) {
       return false;
     }
@@ -243,9 +243,25 @@ public class TypefaceUtil {
             WXLogUtils.d(TAG, "load local font file success");
           }
 
-          Intent intent = new Intent(ACTION_TYPE_FACE_AVAILABLE);
-          intent.putExtra("fontFamily", fontFamily);
-          LocalBroadcastManager.getInstance(WXEnvironment.getApplication()).sendBroadcast(intent);
+          if(hasNetworkDowload) {
+            /**
+             * wxtext may be measured when font not load, when register broadcast receiver,
+             * this broadcast has been send, which cause textview not rendered right.
+             * delay broadcast ensure text will render right
+             * */
+            WXSDKManager.getInstance().getWXRenderManager().postOnUiThread(new Runnable() {
+              @Override
+              public void run() {
+                Intent intent = new Intent(ACTION_TYPE_FACE_AVAILABLE);
+                intent.putExtra("fontFamily", fontFamily);
+                LocalBroadcastManager.getInstance(WXEnvironment.getApplication()).sendBroadcast(intent);
+              }
+            }, 50);
+          }else{
+            Intent intent = new Intent(ACTION_TYPE_FACE_AVAILABLE);
+            intent.putExtra("fontFamily", fontFamily);
+            LocalBroadcastManager.getInstance(WXEnvironment.getApplication()).sendBroadcast(intent);
+          }
           return true;
         }
       } else {