Skip to content

Commit 57be069

Browse files
author
郑立宝
committed
Demo增加表达式计算
1 parent a2a01da commit 57be069

File tree

14 files changed

+819
-806
lines changed

14 files changed

+819
-806
lines changed

Example_oc/FlexLib/res/FlexViewController.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,10 @@
7878
</FlexTouchView>
7979
</UIView>
8080

81-
</FlexScrollView>
81+
82+
83+
</FlexScrollView><UIView layout="$width:ScreenWidth*0.6,height:50,alignItems:center,justifyContent:center" attr="bgColor:#e5e5e5,borderRadius:6">
84+
<UILabel
85+
attr="@:system/buttonText,text:表达式计算,屏幕宽度的60%"/>
86+
</UIView>
8287
</UIView>

Example_swift/FlexSwiftDemo/res/ViewController.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,10 @@
7777
attr="@:system/buttonText,text:FrameView"/>
7878
</FlexTouchView>
7979
</UIView>
80+
81+
<UIView layout="$width:ScreenWidth*0.6,height:50,alignItems:center,justifyContent:center" attr="bgColor:#e5e5e5,borderRadius:6">
82+
<UILabel
83+
attr="@:system/buttonText,text:表达式计算,屏幕宽度的60%"/>
84+
</UIView>
8085
</FlexScrollView>
8186
</UIView>

Example_swift/Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
PODS:
2-
- FlexLib (2.6.0):
3-
- FlexLib/standard (= 2.6.0)
4-
- FlexLib/preview (2.6.0):
2+
- FlexLib (3.0.0):
3+
- FlexLib/standard (= 3.0.0)
4+
- FlexLib/preview (3.0.0):
55
- FlexLib/standard
6-
- FlexLib/standard (2.6.0):
7-
- FlexLib/standard/no-arc (= 2.6.0)
6+
- FlexLib/standard (3.0.0):
7+
- FlexLib/standard/no-arc (= 3.0.0)
88
- Yoga (= 1.14.0)
9-
- FlexLib/standard/no-arc (2.6.0):
9+
- FlexLib/standard/no-arc (3.0.0):
1010
- Yoga (= 1.14.0)
1111
- Yoga (1.14.0)
1212

@@ -16,15 +16,15 @@ DEPENDENCIES:
1616
- Yoga (= 1.14.0)
1717

1818
SPEC REPOS:
19-
https://github.com/CocoaPods/Specs.git:
19+
trunk:
2020
- Yoga
2121

2222
EXTERNAL SOURCES:
2323
FlexLib:
2424
:path: "../"
2525

2626
SPEC CHECKSUMS:
27-
FlexLib: cc6066abc25d47e224748f4c58ab015a28afd61a
27+
FlexLib: 939c6ccbd187451ac7b2fc9220dec7d2a2b24bd4
2828
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
2929

3030
PODFILE CHECKSUM: 4ac29cc7fc8f093e3bab9dae20351ed9692977e1

Example_swift/Pods/Local Podspecs/FlexLib.podspec.json

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_swift/Pods/Manifest.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_swift/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 776 additions & 778 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_swift/Pods/Target Support Files/FlexLib/FlexLib-Info.plist

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_swift/Pods/Target Support Files/FlexLib/FlexLib-umbrella.h

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_swift/Pods/Target Support Files/FlexLib/FlexLib.debug.xcconfig

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_swift/Pods/Target Support Files/FlexLib/FlexLib.release.xcconfig

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)