Merge branch 'main' into androidsupport

alibaba · Sep 14, 2022 · 4eaf58d · 4eaf58d
2 parents deffb95 + e828b59
commit 4eaf58d
Show file tree

Hide file tree

Showing 31 changed files with 1,465 additions and 370 deletions.
diff --git a/...nalyze/GXAnalyzeAndroid/src/androidTest/kotlin/com/alibaba/gaiax/analyze/GXAnalyzeTest.kt b/...nalyze/GXAnalyzeAndroid/src/androidTest/kotlin/com/alibaba/gaiax/analyze/GXAnalyzeTest.kt
diff --git a/GaiaXAnalyze/GXAnalyzeCore/GXATSNode.cpp b/GaiaXAnalyze/GXAnalyzeCore/GXATSNode.cpp
@@ -21,5 +21,13 @@ GXATSNode &GXATSNode::operator=(const GXATSNode &node) {
     GXATSNode::name = node.name;
     GXATSNode::detail = node.detail;
     GXATSNode::token = node.token;
+    GXATSNode::count = node.count;
     return *this;
 }
+
+GXATSNode::GXATSNode(string name, string detail, string token, int count) {
+    GXATSNode::name = name;   //字段
+    GXATSNode::detail = detail;     //code
+    GXATSNode::token = token; //类型
+    GXATSNode::count = count;
+}
diff --git a/GaiaXAnalyze/GXAnalyzeCore/GXATSNode.h b/GaiaXAnalyze/GXAnalyzeCore/GXATSNode.h
@@ -9,12 +9,14 @@ class GXATSNode {
 public:
     GXATSNode();                                   //无参构造函数
     GXATSNode(string name, string detail, string token); //有参构造函数
+    GXATSNode(string name, string detail, string token,int count); //有参构造函数
     ~GXATSNode();                                  //析构函数
     GXATSNode &operator=(const GXATSNode &node);
 
     string name;  //字段
     string token; //类型
     string detail;
+    int count;
 
 private:
 };

diff --git a/GaiaXAnalyze/GXAnalyzeCore/GXAnalyze.cpp b/GaiaXAnalyze/GXAnalyzeCore/GXAnalyze.cpp
diff --git a/GaiaXAnalyze/GXAnalyzeCore/GXAnalyze.h b/GaiaXAnalyze/GXAnalyzeCore/GXAnalyze.h
@@ -40,8 +40,9 @@ class GXAnalyze {
     //获取单个数值计算的结果
     GXATSNode singleCalculate(GXATSNode value1, string op);
 
+    long check(string s, vector<GXATSNode> array, void *p_analyze, void* source,string expression);
 
-    long check(string s, vector<GXATSNode> array, void *p_analyze, void *source, string expression);
+    long calculateCache(string cache,vector<GXATSNode> array,void *p_analyze, void* source);
 };
 
 #endif /*include _GXAnalyze__H_*/
diff --git a/GaiaXAndroid/src/main/kotlin/com/alibaba/gaiax/render/view/GXViewExt.kt b/GaiaXAndroid/src/main/kotlin/com/alibaba/gaiax/render/view/GXViewExt.kt
@@ -57,7 +57,7 @@ fun View.setRoundCornerRadiusAndRoundCornerBorder(style: GXStyle?) {
 
     // 2022/09/13
     // Fix a ui  bug
-    // Remove logic of radius increase because it will caused corner dim
+    // Remove logic of radius increase because it will cause corner dim
 //    if (cornerRadius != null && cornerRadius.size == 8 &&
 //        borderRadius != null && borderWidth != null && borderColor != null
 //    ) {

diff --git a/GaiaXiOS/GaiaXiOS.podspec b/GaiaXiOS/GaiaXiOS.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name          = "GaiaXiOS"
-  s.version       = "0.2.7"
+  s.version       = "0.2.8"
   s.platform      = :ios, "9.0"
   s.summary       = "dynamic template engine is a lightweight cross-end solution of pure native dynamic card"
 

diff --git a/GaiaXiOS/GaiaXiOS.xcodeproj/project.pbxproj b/GaiaXiOS/GaiaXiOS.xcodeproj/project.pbxproj
@@ -653,16 +653,16 @@
 			isa = PBXGroup;
 			children = (
 				8DB609F827F4764E0038BE13 /* GXAnalyzeCore */,
-				8DB609F427F4764E0038BE13 /* GXAnalyzeBridge.h */,
+				8DB60A0F27F4764E0038BE13 /* GXValueParser.h */,
 				8DB609F727F4764E0038BE13 /* GXValueParser.m */,
 				8DB60A0727F4764E0038BE13 /* GXObject.h */,
 				8DB60A0E27F4764E0038BE13 /* GXObject.m */,
 				8DB60A0827F4764E0038BE13 /* GXContext.h */,
 				8DB609F527F4764E0038BE13 /* GXContext.mm */,
-				8DB60A0A27F4764E0038BE13 /* GXAnalyzeImpl.mm */,
 				8DB60A0B27F4764E0038BE13 /* GXAnalyzeImpl.hpp */,
+				8DB60A0A27F4764E0038BE13 /* GXAnalyzeImpl.mm */,
+				8DB609F427F4764E0038BE13 /* GXAnalyzeBridge.h */,
 				8DB60A0C27F4764E0038BE13 /* GXAnalyzeBridge.m */,
-				8DB60A0F27F4764E0038BE13 /* GXValueParser.h */,
 				8DB60A1027F4764E0038BE13 /* GXFunction.h */,
 				8DB60A0927F4764E0038BE13 /* GXFunction.m */,
 				8DB60A0D27F4764E0038BE13 /* GXNativeAnalyze.h */,

diff --git a/GaiaXiOS/GaiaXiOS.xcworkspace/xcuserdata/zhangjc.xcuserdatad/UserInterfaceState.xcuserstate b/GaiaXiOS/GaiaXiOS.xcworkspace/xcuserdata/zhangjc.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/GaiaXiOS/GaiaXiOS/Binding/Expression/GXAnalyzeCore/GXATSNode.cpp b/GaiaXiOS/GaiaXiOS/Binding/Expression/GXAnalyzeCore/GXATSNode.cpp
@@ -21,5 +21,13 @@ GXATSNode &GXATSNode::operator=(const GXATSNode &node) {
     GXATSNode::name = node.name;
     GXATSNode::detail = node.detail;
     GXATSNode::token = node.token;
+    GXATSNode::count = node.count;
     return *this;
 }
+
+GXATSNode::GXATSNode(string name, string detail, string token, int count) {
+    GXATSNode::name = name;   //字段
+    GXATSNode::detail = detail;     //code
+    GXATSNode::token = token; //类型
+    GXATSNode::count = count;
+}
diff --git a/GaiaXiOS/GaiaXiOS/Binding/Expression/GXAnalyzeCore/GXATSNode.h b/GaiaXiOS/GaiaXiOS/Binding/Expression/GXAnalyzeCore/GXATSNode.h
@@ -9,12 +9,14 @@ class GXATSNode {
 public:
     GXATSNode();                                   //无参构造函数
     GXATSNode(string name, string detail, string token); //有参构造函数
+    GXATSNode(string name, string detail, string token,int count); //有参构造函数
     ~GXATSNode();                                  //析构函数
     GXATSNode &operator=(const GXATSNode &node);
 
     string name;  //字段
     string token; //类型
     string detail;
+    int count;
 
 private:
 };