diff --git a/Tangram/Helper/TangramLayoutParseHelper.m b/Tangram/Helper/TangramLayoutParseHelper.m index c69aa14..0fb3937 100644 --- a/Tangram/Helper/TangramLayoutParseHelper.m +++ b/Tangram/Helper/TangramLayoutParseHelper.m @@ -171,12 +171,17 @@ @implementation TangramLayoutParseHelper layout.pageWidth = pageWidthInConfig/375.f*SCREEN_WIDTH; } } - CGFloat pageHeightInConfig = [styleDict tm_floatForKey:@"pageHeight"]; - if (disableScale) { - layout.pageHeight = pageHeightInConfig; - } - else{ - layout.pageHeight = pageHeightInConfig/375.f*SCREEN_WIDTH; + + //高度应该和宽度一样使用rp单位, 要不然style中设置rp单位无效 + CGFloat pageHeightInConfig = [self floatRPValueByObject:[styleDict tm_safeObjectForKey:@"pageHeight"]]; + + if (pageWidthInConfig > 0.f) { + if (disableScale || [[styleDict tm_stringForKey:@"pageHeight"] containsString:@"rp"]) { + layout.pageHeight = pageHeightInConfig; + } + else{ + layout.pageHeight = pageHeightInConfig/375.f*SCREEN_WIDTH; + } } layout.hGap = [styleDict tm_floatForKey:@"hGap"]; if ([[styleDict tm_stringForKey:@"hasIndicator"] isEqualToString:@"false"]) { diff --git a/TangramDemo/TangramDemo.xcodeproj/project.pbxproj b/TangramDemo/TangramDemo.xcodeproj/project.pbxproj index f20a166..4fc7c4b 100644 --- a/TangramDemo/TangramDemo.xcodeproj/project.pbxproj +++ b/TangramDemo/TangramDemo.xcodeproj/project.pbxproj @@ -206,7 +206,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/../Pods/Target Support Files/Pods-TangramDemo/Pods-TangramDemo-resources.sh", + "${PODS_ROOT}/Target Support Files/Pods-TangramDemo/Pods-TangramDemo-resources.sh", "${PODS_ROOT}/../Tangram/Resources/TangramKitVVElementTypeMap.plist", "${PODS_ROOT}/../Tangram/Resources/TangramLayoutTypeMap.plist", "${PODS_ROOT}/../Tangram/Resources/TmallComponent2.out", @@ -219,7 +219,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-TangramDemo/Pods-TangramDemo-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TangramDemo/Pods-TangramDemo-resources.sh\"\n"; showEnvVarsInLog = 0; }; F04088E1AA23D8122992FFBB /* [CP] Check Pods Manifest.lock */ = {