Merge branch 'main' into androidsupport

alibaba · Sep 13, 2022 · deffb95 · deffb95
2 parents 892645e + c1d60a0
commit deffb95
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/GaiaXAnalyze/GXAnalyzeCore/GXAnalyze.cpp b/GaiaXAnalyze/GXAnalyzeCore/GXAnalyze.cpp
@@ -1143,6 +1143,7 @@ long GXAnalyze::check(string s, vector<GXATSNode> array, void *p_analyze, void *
                                         }
                                         --valueSize;
                                         isFunction = false;
+                                        paramsSize = 0;
                                         if (fun->tag == GX_TAG_STRING && fun->str != NULL) {
                                             delete[] fun->str;
                                             fun->str = NULL;

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
@@ -50,20 +50,25 @@ fun View.setRoundCornerRadiusAndRoundCornerBorder(style: GXStyle?) {
     val borderColor = style?.borderColor?.value(this.context)
     var cornerRadius = style?.borderRadius?.value
 
+    // 2022/06/21
     // Fix a ui bug,
     // if we set corner radius and border radius in the same time, it will produce some defects at the view corner.
     // we need make a special process in order fix the defects.
-    if (cornerRadius != null && cornerRadius.size == 8 &&
-        borderRadius != null && borderWidth != null && borderColor != null
-    ) {
-        val tl = cornerRadius[0]
-        val tr = cornerRadius[2]
-        val bl = cornerRadius[4]
-        val br = cornerRadius[6]
-        if (tl == tr && tr == bl && bl == br) {
-            cornerRadius = FloatArray(8) { tl + 1F.dpToPx() }
-        }
-    }
+
+    // 2022/09/13
+    // Fix a ui  bug
+    // Remove logic of radius increase because it will caused corner dim
+//    if (cornerRadius != null && cornerRadius.size == 8 &&
+//        borderRadius != null && borderWidth != null && borderColor != null
+//    ) {
+//        val tl = cornerRadius[0]
+//        val tr = cornerRadius[2]
+//        val bl = cornerRadius[4]
+//        val br = cornerRadius[6]
+//        if (tl == tr && tr == bl && bl == br) {
+//            cornerRadius = FloatArray(8) { tl + 1F.dpToPx() }
+//        }
+//    }
 
     if (this is GXIRoundCorner) {
         if (this is GXView) {

diff --git a/GaiaXAndroidDemo/app/src/main/kotlin/com/alibaba/gaiax/demo/MainActivity.kt b/GaiaXAndroidDemo/app/src/main/kotlin/com/alibaba/gaiax/demo/MainActivity.kt
@@ -54,7 +54,7 @@ class MainActivity : AppCompatActivity() {
             val intent = Intent(MainActivity@ this, GaiaXFastPreviewActivity::class.java)
             intent.putExtra(
                 "GAIA_STUDIO_URL",
-                "gaiax://gaiax/preview?url=ws://30.78.149.204:9001&id=test-template&type=auto"
+                "gaiax://gaiax/preview?url=ws://30.78.147.194:9001&id=test-template&type=auto"
             )
             launcher.launch(intent)
         }

diff --git a/GaiaXiOS/GaiaXiOS/Binding/Expression/GXAnalyzeCore/GXAnalyze.cpp b/GaiaXiOS/GaiaXiOS/Binding/Expression/GXAnalyzeCore/GXAnalyze.cpp
@@ -1143,6 +1143,7 @@ long GXAnalyze::check(string s, vector<GXATSNode> array, void *p_analyze, void *
                                         }
                                         --valueSize;
                                         isFunction = false;
+                                        paramsSize = 0;
                                         if (fun->tag == GX_TAG_STRING && fun->str != NULL) {
                                             delete[] fun->str;
                                             fun->str = NULL;