Merge branch 'main' into androidsupport

alibaba · Jun 14, 2022 · 2e247af · 2e247af
2 parents c96ff78 + 4e28724
commit 2e247af
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md
@@ -31,7 +31,11 @@ assignees: ''
  - 设备: [e.g. iPhone6]
  - 系统: [e.g. iOS8.1]
  - GaiaX SDK版本 [e.g. 0.1.0]
+ - Gaia Studio版本 [e.g. 0.1.0]
  - GaiaX 模板文件和模板数据
 
+**崩溃日志**
+在这里添加崩溃日志
+
 **附加信息**
 在这里添加有关该问题的任何其他信息。
diff --git a/GaiaXAdapterAndroid/src/main/java/com/alibaba/gaiax/adapter/GXExtensionExpression.kt b/GaiaXAdapterAndroid/src/main/java/com/alibaba/gaiax/adapter/GXExtensionExpression.kt
@@ -83,6 +83,9 @@ class GXExtensionExpression : GXRegisterCenter.GXIExtensionExpression {
                                 is Float -> {
                                     return GXAnalyze.createValueFloat64(value)
                                 }
+                                is Double -> {
+                                    return GXAnalyze.createValueFloat64(value.toFloat())
+                                }
                                 null -> {
                                     return GXAnalyze.createValueNull()
                                 }

diff --git a/GaiaXiOSDemo/GaiaXiOSDemo/Preview/GaiaXPreviewViewController.m b/GaiaXiOSDemo/GaiaXiOSDemo/Preview/GaiaXPreviewViewController.m
@@ -315,15 +315,15 @@ - (void)handleTemlateInfo:(NSDictionary *)templateInfo{
                 //容器模板
                 NSMutableArray *nodes = [NSMutableArray array];
                 for (int i = 0; i < 10; i++) {
-                    [nodes addObject:@{@"data":@"mock"}];
+                    [nodes addObject:@{@"data":@"'mock'"}];
                 }
                 [dbDict gx_setObject:@{@"value":nodes} forKey:templateId];
 
             } else {
                 //普通模板
                 NSDictionary *dependencies = [[indexJsonDict gx_dictionaryForKey:@"package"] gx_dictionaryForKey:@"dependencies"];
                 [dependencies enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
-                    [dbDict gx_setObject:@{@"data":@"mock"} forKey:key];
+                    [dbDict gx_setObject:@{@"data":@"'mock'"} forKey:key];
                 }];
             }
 
@@ -333,7 +333,7 @@ - (void)handleTemlateInfo:(NSDictionary *)templateInfo{
 
             //获取数据源
             if (isRoot) {
-                _mockData = @{@"data":@"mock"};
+                _mockData = @{@"data":@"'mock'"};
             }
 
         }

diff --git a/README-ZH.md b/README-ZH.md
@@ -206,10 +206,16 @@ UIView *view = [TheGXTemplateEngine creatViewByTemplateItem:item measureSize:siz
 ## 联系我们
 
 钉钉：
-<img src="https://gw.alicdn.com/imgextra/i4/O1CN01yjayyb1yAudRg1WE5_!!6000000006539-2-tps-954-1242.png" width="238" height="310" />
+
+<img src="https://gw.alicdn.com/imgextra/i3/O1CN01mmrIDM1ofvIASkhPI_!!6000000005253-2-tps-474-469.png" width="200" height="200" />
 
 微信：
-<img src="https://user-images.githubusercontent.com/6761107/165739894-301807db-949f-43be-b82a-421e968ee54d.png" width="200" height="200" />
+
+<img src="https://gw.alicdn.com/imgextra/i1/O1CN01LlZEeh1dLLjGAVpFn_!!6000000003719-2-tps-746-746.png" width="200" height="200" />
+
+Email:
+
+biezhihua@gmail.com
 
 ## 支持者
 

diff --git a/README.md b/README.md
@@ -207,10 +207,12 @@ We very welcome your to contribute code for the project. In you before writing a
 ## Contact us
 
 DingTalk：
-<img src="https://gw.alicdn.com/imgextra/i4/O1CN01yjayyb1yAudRg1WE5_!!6000000006539-2-tps-954-1242.png" width="238" height="310" />
+
+<img src="https://gw.alicdn.com/imgextra/i3/O1CN01mmrIDM1ofvIASkhPI_!!6000000005253-2-tps-474-469.png" width="200" height="200" />
 
 WeChat：
-<img src="https://user-images.githubusercontent.com/6761107/165739894-301807db-949f-43be-b82a-421e968ee54d.png" width="200" height="200" />
+
+<img src="https://gw.alicdn.com/imgextra/i1/O1CN01LlZEeh1dLLjGAVpFn_!!6000000003719-2-tps-746-746.png" width="200" height="200" />
 
 Email:
 biezhihua@gmail.com