Demo增加表达式计算

zhenglibao · Jun 15, 2021 · 57be069 · 57be069
1 parent a2a01da
commit 57be069
Show file tree

Hide file tree

Showing 14 changed files with 819 additions and 806 deletions.
diff --git a/Example_oc/FlexLib/res/FlexViewController.xml b/Example_oc/FlexLib/res/FlexViewController.xml
@@ -78,5 +78,10 @@
            </FlexTouchView>
        </UIView>
 
-    </FlexScrollView>
+
+
+    </FlexScrollView><UIView layout="$width:ScreenWidth*0.6,height:50,alignItems:center,justifyContent:center" attr="bgColor:#e5e5e5,borderRadius:6">
+        <UILabel
+           attr="@:system/buttonText,text:表达式计算，屏幕宽度的60%"/>
+   </UIView>
 </UIView> 
diff --git a/Example_swift/FlexSwiftDemo/res/ViewController.xml b/Example_swift/FlexSwiftDemo/res/ViewController.xml
@@ -77,5 +77,10 @@
                attr="@:system/buttonText,text:FrameView"/>
            </FlexTouchView>
        </UIView>
+
+       <UIView layout="$width:ScreenWidth*0.6,height:50,alignItems:center,justifyContent:center" attr="bgColor:#e5e5e5,borderRadius:6">
+            <UILabel
+               attr="@:system/buttonText,text:表达式计算，屏幕宽度的60%"/>
+       </UIView>
     </FlexScrollView>
 </UIView> 
diff --git a/Example_swift/Podfile.lock b/Example_swift/Podfile.lock
@@ -1,12 +1,12 @@
 PODS:
-  - FlexLib (2.6.0):
-    - FlexLib/standard (= 2.6.0)
-  - FlexLib/preview (2.6.0):
+  - FlexLib (3.0.0):
+    - FlexLib/standard (= 3.0.0)
+  - FlexLib/preview (3.0.0):
     - FlexLib/standard
-  - FlexLib/standard (2.6.0):
-    - FlexLib/standard/no-arc (= 2.6.0)
+  - FlexLib/standard (3.0.0):
+    - FlexLib/standard/no-arc (= 3.0.0)
     - Yoga (= 1.14.0)
-  - FlexLib/standard/no-arc (2.6.0):
+  - FlexLib/standard/no-arc (3.0.0):
     - Yoga (= 1.14.0)
   - Yoga (1.14.0)
 
@@ -16,15 +16,15 @@ DEPENDENCIES:
   - Yoga (= 1.14.0)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  trunk:
     - Yoga
 
 EXTERNAL SOURCES:
   FlexLib:
     :path: "../"
 
 SPEC CHECKSUMS:
-  FlexLib: cc6066abc25d47e224748f4c58ab015a28afd61a
+  FlexLib: 939c6ccbd187451ac7b2fc9220dec7d2a2b24bd4
   Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
 
 PODFILE CHECKSUM: 4ac29cc7fc8f093e3bab9dae20351ed9692977e1

diff --git a/Example_swift/Pods/Local Podspecs/FlexLib.podspec.json b/Example_swift/Pods/Local Podspecs/FlexLib.podspec.json
diff --git a/Example_swift/Pods/Manifest.lock b/Example_swift/Pods/Manifest.lock
diff --git a/Example_swift/Pods/Pods.xcodeproj/project.pbxproj b/Example_swift/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example_swift/Pods/Target Support Files/FlexLib/FlexLib-Info.plist b/Example_swift/Pods/Target Support Files/FlexLib/FlexLib-Info.plist
diff --git a/Example_swift/Pods/Target Support Files/FlexLib/FlexLib-umbrella.h b/Example_swift/Pods/Target Support Files/FlexLib/FlexLib-umbrella.h
diff --git a/Example_swift/Pods/Target Support Files/FlexLib/FlexLib.debug.xcconfig b/Example_swift/Pods/Target Support Files/FlexLib/FlexLib.debug.xcconfig
diff --git a/Example_swift/Pods/Target Support Files/FlexLib/FlexLib.release.xcconfig b/Example_swift/Pods/Target Support Files/FlexLib/FlexLib.release.xcconfig
diff --git a/Example_swift/Pods/Target Support Files/FlexLib/ResourceBundle-FlexLib-FlexLib-Info.plist b/Example_swift/Pods/Target Support Files/FlexLib/ResourceBundle-FlexLib-FlexLib-Info.plist
diff --git a/..._swift/Pods/Target Support Files/FlexLib/ResourceBundle-FlexLibPreview-FlexLib-Info.plist b/..._swift/Pods/Target Support Files/FlexLib/ResourceBundle-FlexLibPreview-FlexLib-Info.plist
diff --git a/Example_swift/Pods/Target Support Files/Pods-FlexSwiftDemo/Pods-FlexSwiftDemo.debug.xcconfig b/Example_swift/Pods/Target Support Files/Pods-FlexSwiftDemo/Pods-FlexSwiftDemo.debug.xcconfig
diff --git a/...le_swift/Pods/Target Support Files/Pods-FlexSwiftDemo/Pods-FlexSwiftDemo.release.xcconfig b/...le_swift/Pods/Target Support Files/Pods-FlexSwiftDemo/Pods-FlexSwiftDemo.release.xcconfig