Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm

GYDemo/GYDemo/Alert/GYGiftAlertView.m

@@ -65,6 +65,7 @@
 
 - (void)layoutSubviews{
     [super layoutSubviews];
+    _gradientLayer.frame = _giftBgView.bounds;
 }
 
 - (void)setBoxModel:(GYOpenBoxModel *)boxModel{

GYDemo/GYDemo/Alert/GYOrderAlertView.m

@@ -71,7 +71,7 @@
     _model = model;
     _dataSource = _model.orderDetailModels;
     
-    NSString * amt = [NSString stringWithFormat:@"%.2f", [_model.awardCash integerValue]*1.0/100];
+    NSString * amt = [NSString stringWithFormat:@"%.2f", [_model.awardCash integerValue]*1.0];
     NSString * amtStr = [NSString stringWithFormat:@"完成当前订单将获得%@元", amt];
     NSMutableAttributedString * att = [[NSMutableAttributedString alloc] initWithString:amtStr];
     [att addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:30], NSForegroundColorAttributeName:kColorWithRGB(255, 145, 40)} range:[amtStr rangeOfString:amt]];
@@ -88,6 +88,7 @@
 
 - (void)layoutSubviews{
     [super layoutSubviews];
+    _gradientLayer.frame = _giftBgView.bounds;
 }
 
 - (void)refreshDataSource{

GYDemo/GYDemo/Assets.xcassets/wheel/wheel_point.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "组 2 拷贝@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "组 2 拷贝@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

GYDemo/GYDemo/ViewController/GYNative.storyboard

@@ -2,6 +2,7 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -33,7 +34,7 @@
                                 </constraints>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wheel_point_select" translatesAutoresizingMaskIntoConstraints="NO" id="Pr8-br-4g4">
-                                <rect key="frame" x="0.0" y="209" width="414" height="192.5"/>
+                                <rect key="frame" x="0.0" y="305.5" width="414" height="99.5"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="422-i1-mAf">
                                 <rect key="frame" x="354" y="168" width="50" height="50"/>
@@ -70,7 +71,7 @@
                         <viewLayoutGuide key="safeArea" id="9T1-9q-KQY"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="Pr8-br-4g4" firstAttribute="centerY" secondItem="Tzj-np-8e2" secondAttribute="centerY" constant="-60" id="9Wx-Zf-6Iu"/>
+                            <constraint firstItem="Pr8-br-4g4" firstAttribute="centerY" secondItem="Tzj-np-8e2" secondAttribute="centerY" constant="-10" id="9Wx-Zf-6Iu"/>
                             <constraint firstItem="Pr8-br-4g4" firstAttribute="leading" secondItem="Tzj-np-8e2" secondAttribute="leading" id="Fhs-lu-zfL"/>
                             <constraint firstItem="B36-KL-4fe" firstAttribute="centerX" secondItem="t4G-Kb-nWs" secondAttribute="centerX" id="Fjt-Mb-dqt"/>
                             <constraint firstItem="B36-KL-4fe" firstAttribute="top" secondItem="t4G-Kb-nWs" secondAttribute="bottom" constant="28" id="HVA-rI-Wm6"/>
@@ -337,7 +338,7 @@
         <image name="wheel_cancel" width="38.5" height="38"/>
         <image name="wheel_corona" width="348" height="348"/>
         <image name="wheel_header" width="203.5" height="89"/>
-        <image name="wheel_point_select" width="129.5" height="192.5"/>
+        <image name="wheel_point_select" width="72" height="99.5"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

GYDemo/GYDemo/ViewController/GYWheelSurfViewController.m

@@ -161,7 +161,7 @@
     CABasicAnimation *layer = [CABasicAnimation animationWithKeyPath:@"transform.rotation"];
     
     //先转4圈 再选区 顺时针(所有这里需要用360-对应的角度) 逆时针不需要
-    layer.toValue = @((M_PI*2 - (perSection*index)) + M_PI*2*8);
+    layer.toValue = @((M_PI*2 - (perSection*index)) + M_PI*2*4);
     layer.duration = 4;
     layer.removedOnCompletion = NO;
     layer.fillMode = kCAFillModeForwards;