add attribute padding and margin

alibaba · Mar 28, 2018 · 442bb53 · 442bb53
1 parent 1a9a8cb
commit 442bb53
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/compiler-tools/TemplateWorkSpace/config.properties b/compiler-tools/TemplateWorkSpace/config.properties
@@ -106,6 +106,7 @@ itemWidth=Number
 itemHeight=Number
 itemVerticalMargin=Number
 itemHorizontalMargin=Number
+layoutMargin=Number
 layoutMarginLeft=Number
 layoutMarginRight=Number
 layoutMarginTop=Number
@@ -118,6 +119,7 @@ textSize=Number
 lineHeight=Number
 disablePlaceHolder=Number
 fixBy=Number
+padding=Number
 paddingLeft=Number
 paddingRight=Number
 paddingTop=Number

diff --git a/compiler-tools/config/config.properties b/compiler-tools/config/config.properties
@@ -46,6 +46,11 @@ VIEW_ID_VGraph=21
 VIEW_ID_Progress=22
 VIEW_ID_VirtualContainer=23
 VIEW_ID_Var=24
+VIEW_ID_NFrameLayout=25
+VIEW_ID_NGridLayout=26
+VIEW_ID_NRatioLayout=27
+VIEW_ID_NVH2Layout=28
+VIEW_ID_NVHLayout=29
 DEFAULT_PROPERTY_TotalContainer=native
 VIEW_ID_TotalContainer=1010
 flag=Flag
@@ -101,6 +106,7 @@ itemWidth=Number
 itemHeight=Number
 itemVerticalMargin=Number
 itemHorizontalMargin=Number
+layoutMargin=Number
 layoutMarginLeft=Number
 layoutMarginRight=Number
 layoutMarginTop=Number
@@ -113,6 +119,7 @@ textSize=Number
 lineHeight=Number
 disablePlaceHolder=Number
 fixBy=Number
+padding=Number
 paddingLeft=Number
 paddingRight=Number
 paddingTop=Number

diff --git a/gradle.properties b/gradle.properties
@@ -44,5 +44,5 @@
 GROUP=com.alibaba.android
 ARTIFACT=virtual-common
 COMPILER_ARTIFACT=virtual-compiler
-VERSION_NAME=1.0.8
+VERSION_NAME=1.0.9
 PACKAGING_TYPE=jar
diff --git a/virtual-common/src/main/java/com/libra/virtualview/common/StringBase.java b/virtual-common/src/main/java/com/libra/virtualview/common/StringBase.java
@@ -45,7 +45,7 @@ public class StringBase {
             "backgroundImage", "Container", "span", "paintStyle", "var", "vList", "dataParam", "autoRefreshThreshold", "dataMode", "waterfall",
             "supportHTMLStyle", "lineSpaceMultiplier", "lineSpaceExtra", "borderWidth", "borderColor", "maxLines", "dashEffect", "lineSpace", "firstSpace", "lastSpace",
             "maskColor", "blurRadius", "filterWhiteBg", "ratio", "disablePlaceHolder", "disableCache", "fixBy", "alpha", "ck","borderRadius",
-            "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "tag", "lineHeight"
+            "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "tag", "lineHeight", "padding", "layoutMargin"
     };
 
     public static final int[] SYS_KEYS_INDEX = {1302701180, -1822277072, 1310765783, 74637979, 82026147, -1991132755,
@@ -64,7 +64,7 @@ public class StringBase {
             -936434099, 1490730380, 1292595405, 1593011297, 3536714, 789757939, 116519, 111344180, -377785597, -51356769,
             1788852333, -213632750, 506010071, -667362093, -1118334530, 741115130, 722830999, 390232059, 1037639619,
             -1807275662, -172008394, 2002099216, -77812777, -1428201511, 617472950, 108285963, -1358064245, -1012322950,
-            97444684, 92909918, 3176, 1349188574, -1228066334, 333432965, 581268560, 588239831, 114586, -515807685};
+            97444684, 92909918, 3176, 1349188574, -1228066334, 333432965, 581268560, 588239831, 114586, -515807685, -806339567, 1697244536};
 
 
     final public static int STR_ID_SYS_KEY_COUNT = SYS_KEYS.length;
@@ -228,4 +228,6 @@ public class StringBase {
     final public static int STR_ID_borderBottomRightRadius = 588239831;
     final public static int STR_ID_tag = 114586;
     final public static int STR_ID_lineHeight = -515807685;
+    final public static int STR_ID_padding = -806339567;
+    final public static int STR_ID_layoutMargin = 1697244536;
 }