optimize code

GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.m

@@ -78,10 +78,11 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         //: 开始显示广告
         [self getAdsDataSource];
+        CGFloat offset = (UIScreen.mainScreen.bounds.size.height - self.mainContentView.bounds.size.height) / 2 - 40 - statusBarFrameHeight;
         [UIView animateWithDuration:0.25 animations:^{
-            self.mainContentView.transform  = CGAffineTransformMakeTranslation(0, -160);
-            self.adContentView.transform  = CGAffineTransformMakeTranslation(0, -160);
-            self.cancelButton.transform  = CGAffineTransformMakeTranslation(0, -160);
+            self.mainContentView.transform  = CGAffineTransformMakeTranslation(0, -offset);
+            self.adContentView.transform  = CGAffineTransformMakeTranslation(0, -offset);
+            self.cancelButton.transform  = CGAffineTransformMakeTranslation(0, -offset);
         } completion:^(BOOL finished) {
             
         }];

GYDemo/GYDemo/Alert/GYGiftAlertView.m

@@ -126,9 +126,10 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         //: 开始显示广告
          [self getAdsDataSource];
+        CGFloat offset = (UIScreen.mainScreen.bounds.size.height - self.bgView.bounds.size.height) / 2 - 40 - statusBarFrameHeight;
         [UIView animateWithDuration:0.25 animations:^{
-            self.bgView.transform  = CGAffineTransformMakeTranslation(0, -160);
-            self.adContentView.transform  = CGAffineTransformMakeTranslation(0, -160);
+            self.bgView.transform = CGAffineTransformMakeTranslation(0, -offset);
+            self.adContentView.transform  = CGAffineTransformMakeTranslation(0, -offset);
         } completion:^(BOOL finished) {
             
         }];

GYDemo/GYDemo/Alert/GYGiftAlertView.xib

 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.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"/>
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
@@ -12,23 +12,23 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="GYGiftAlertView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4qd-2X-2kQ">
-                    <rect key="frame" x="16.5" y="248" width="381" height="400"/>
+                    <rect key="frame" x="16.666666666666657" y="168" width="380.66666666666674" height="400"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gift_bg" translatesAutoresizingMaskIntoConstraints="NO" id="wec-0m-x6P">
-                            <rect key="frame" x="5" y="68.5" width="371" height="341.5"/>
+                            <rect key="frame" x="5" y="68.666666666666657" width="370.66666666666669" height="341.33333333333337"/>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LPX-8e-GMj">
-                            <rect key="frame" x="18" y="88.5" width="345" height="228"/>
+                            <rect key="frame" x="18" y="88.666666666666686" width="344.66666666666669" height="228"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gift_mask" translatesAutoresizingMaskIntoConstraints="NO" id="KPA-TL-pwU">
-                                    <rect key="frame" x="-5" y="5" width="355" height="228"/>
+                                    <rect key="frame" x="-5" y="5" width="354.66666666666669" height="228"/>
                                 </imageView>
                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="3gA-JC-WLJ">
-                                    <rect key="frame" x="0.0" y="50" width="345" height="178"/>
+                                    <rect key="frame" x="0.0" y="50" width="344.66666666666669" height="178"/>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="e4W-tH-xOm">
                                         <size key="itemSize" width="128" height="128"/>
@@ -51,10 +51,10 @@
                             </constraints>
                         </view>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="order_header" translatesAutoresizingMaskIntoConstraints="NO" id="pFs-il-GHF">
-                            <rect key="frame" x="0.0" y="0.0" width="381" height="155"/>
+                            <rect key="frame" x="0.0" y="0.0" width="380.66666666666669" height="155"/>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BUz-Se-wQ9">
-                            <rect key="frame" x="53.5" y="334.5" width="274" height="51"/>
+                            <rect key="frame" x="53.333333333333314" y="334.66666666666669" width="274" height="50.666666666666686"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="BUz-Se-wQ9" secondAttribute="height" multiplier="248:46" id="uTK-td-geA"/>
                             </constraints>
@@ -65,7 +65,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eUM-sc-sxa">
-                            <rect key="frame" x="321" y="0.0" width="60" height="60"/>
+                            <rect key="frame" x="320.66666666666663" y="0.0" width="60" height="60"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="60" id="2C0-m8-t2w"/>
                                 <constraint firstAttribute="width" constant="60" id="4v0-E1-tEj"/>
@@ -97,7 +97,7 @@
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KW0-bM-2mY">
-                    <rect key="frame" x="16.5" y="668" width="381" height="180"/>
+                    <rect key="frame" x="16.666666666666657" y="588" width="380.66666666666674" height="180"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="180" id="sfE-Ry-Myq"/>
                     </constraints>

GYDemo/GYDemo/Alert/GYGiftCell.xib

@@ -11,18 +11,18 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="GYGiftCell">
-            <rect key="frame" x="0.0" y="0.0" width="163" height="158"/>
+            <rect key="frame" x="0.0" y="0.0" width="163" height="125"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="163" height="158"/>
+                <rect key="frame" x="0.0" y="0.0" width="163" height="125"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gift_seed_1" translatesAutoresizingMaskIntoConstraints="NO" id="171-mY-Szm">
-                        <rect key="frame" x="61" y="48" width="41" height="46"/>
+                        <rect key="frame" x="61" y="23.5" width="41" height="46"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kiQ-IN-LG2">
-                        <rect key="frame" x="71.5" y="104" width="20.5" height="23"/>
-                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="19"/>
+                        <rect key="frame" x="68.5" y="79.5" width="26" height="27.5"/>
+                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="23"/>
                         <color key="textColor" red="0.56078431370000004" green="0.29803921570000003" blue="0.027450980390000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="highlightedColor" red="0.5607843137254902" green="0.29803921568627451" blue="0.027450980392156862" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </label>
@@ -30,17 +30,17 @@
             </view>
             <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
             <constraints>
-                <constraint firstItem="171-mY-Szm" firstAttribute="centerY" secondItem="gTV-IL-0wX" secondAttribute="centerY" multiplier="0.9" id="Kl2-ma-YxH"/>
+                <constraint firstItem="171-mY-Szm" firstAttribute="centerY" secondItem="gTV-IL-0wX" secondAttribute="centerY" multiplier="0.9" constant="-10" id="Kl2-ma-YxH"/>
                 <constraint firstItem="kiQ-IN-LG2" firstAttribute="centerX" secondItem="171-mY-Szm" secondAttribute="centerX" id="RsR-LS-6BH"/>
                 <constraint firstItem="kiQ-IN-LG2" firstAttribute="top" secondItem="171-mY-Szm" secondAttribute="bottom" constant="10" id="SeE-GA-9tk"/>
                 <constraint firstItem="171-mY-Szm" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="vNq-a3-EZS"/>
             </constraints>
-            <size key="customSize" width="163" height="158"/>
+            <size key="customSize" width="163" height="125"/>
             <connections>
                 <outlet property="giftImv" destination="171-mY-Szm" id="Pml-mw-e9M"/>
                 <outlet property="numLab" destination="kiQ-IN-LG2" id="2yK-Lh-PDC"/>
             </connections>
-            <point key="canvasLocation" x="219.56521739130437" y="91.071428571428569"/>
+            <point key="canvasLocation" x="219.56521739130437" y="80.022321428571431"/>
         </collectionViewCell>
     </objects>
     <resources>

GYDemo/GYDemo/AppDelegate.mm

@@ -578,13 +578,18 @@ NSDictionary* appLaunchOpts;
 - (void)ios_onRedPackReceive: (int)redPackId redPackMoneyNum: (const char *)moneyNum {
     //redPackReceive
     NSString * moneyNumber = [[NSString alloc] initWithUTF8String: moneyNum];
+    WEAKSELF
     [[CGNetworkTools shared] postWithAction:redPackReceive parameters:@{@"id": [NSString stringWithFormat:@"%d", redPackId]} success:^(id  _Nonnull response) {
         NSDictionary *data = [[response objectForKey:@"result"] objectForKey:@"data"];
         NSString *multipleSid = [[data objectForKey:@"double"] objectForKey:@"multipleSid"];
         if (multipleSid) {
-            
+            NSInteger result = [[data objectForKey:@"force"] integerValue];
+            if (result == 1) {
+                [weakSelf gainMultipleAward: multipleSid];
+            } else {
                 [self awardMultiple: multipleSid moneyNum: moneyNumber];
             }
+        }
     } failure:^(NSError * _Nonnull error) {
         
     }];
@@ -596,19 +601,15 @@ NSDictionary* appLaunchOpts;
     GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
     [alertVC showAlertToView:[[self ufw] appController].window amount:num firstShow: true];
     
-    WEAKSELF
+//    WEAKSELF
     alertVC.closeCallBack = ^(bool result) {
         if (result) {
             [self gainMultipleAward: sid];
         } else {
             // 取消播放领取
             [[CGNetworkTools shared] postWithAction: adForcePost parameters:@{} success:^(id  _Nonnull response) {
-                NSDictionary *data = [[response objectForKey:@"result"] objectForKey:@"data"];
-                NSLog(@"取消播放领取 adForcePost = %@", data);
-                NSInteger result = [[data objectForKey:@"force"] integerValue];
-                if (result == 1) {
-                    [weakSelf gainMultipleAward: sid];
-                }
+                NSLog(@"取消播放领取 adForcePost = %@", response);
+//                NSDictionary *data = [[response objectForKey:@"result"] objectForKey:@"data"];
             } failure:^(NSError * _Nonnull error) {
                 
             }];
@@ -629,6 +630,9 @@ NSDictionary* appLaunchOpts;
                     
                     NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"];
                     NSArray *rewardContentList = [result objectForKey:@"rewardContentList"];
+                    if (rewardContentList){
+                        return;
+                    }
                     if (rewardContentList.count <= 0) {
                         return;
                     }
@@ -751,15 +755,6 @@ NSDictionary* appLaunchOpts;
         [[IOSADManager shareADManager] requestVideoAD];
     }];
     
-    NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
-    NSLog(@"isopenH5  = %@", status);
-    if (![status isEqualToString:@"1"]) {
-        Data * data = [[Data alloc] init];
-        if([[data Read] objectForKey:@"refresh_token"] == nil) {
-            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(launchAdSuccesShow) name:LaunchAdSuccesShow object:nil];
-        }
-    }
-    
     return YES;
 }
 
@@ -816,14 +811,6 @@ NSDictionary* appLaunchOpts;
 - (void)applicationWillTerminate:(UIApplication *)application {
     [[[self ufw] appController] applicationWillTerminate: application]; }
 
-- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
-    return  [WXApi handleOpenURL:url delegate:self];
-}
-
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
-    return [WXApi handleOpenURL:url delegate:self];
-}
-
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options{
     return [WXApi handleOpenURL:url delegate:self];
 }

GYDemo/GYDemo/Base.lproj/Main.storyboard

 <?xml version="1.0" encoding="UTF-8"?>
 <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"/>
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
@@ -14,14 +14,14 @@
             <objects>
                 <viewController storyboardIdentifier="GYLoginViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Ux2-xp-g9C" customClass="GYLoginViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="dYL-zr-8sU">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wechat_login_bg" translatesAutoresizingMaskIntoConstraints="NO" id="UOH-Jk-9M5">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TWR-n9-3GS">
-                                <rect key="frame" x="366" y="54" width="33" height="32"/>
+                                <rect key="frame" x="366" y="10" width="33" height="32"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <state key="normal" title="跳过">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -31,39 +31,39 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7mW-as-1Ow">
-                                <rect key="frame" x="366" y="80" width="33" height="0.5"/>
+                                <rect key="frame" x="366" y="36" width="33" height="0.6666666666666643"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="0.5" id="WfN-fn-KKv"/>
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kyj-A5-ZZN">
-                                <rect key="frame" x="83.5" y="423.5" width="247" height="59.5"/>
+                                <rect key="frame" x="83.666666666666686" y="338.33333333333331" width="247" height="59.666666666666686"/>
                                 <state key="normal" image="wechat_login_btn_bg"/>
                                 <connections>
                                     <action selector="weichatLoginAction:" destination="Ux2-xp-g9C" eventType="touchUpInside" id="igX-Hu-OSY"/>
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="微信登录才能提现哦～" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4f-2W-n3v">
-                                <rect key="frame" x="115.5" y="498" width="183.5" height="21.5"/>
+                                <rect key="frame" x="115.33333333333333" y="413" width="183.66666666666669" height="21.666666666666686"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                 <color key="textColor" red="0.70196078431372544" green="0.23137254901960785" blue="0.0039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wechat_login_logo_icon" translatesAutoresizingMaskIntoConstraints="NO" id="iEN-Z8-WSa">
-                                <rect key="frame" x="147.5" y="197" width="119" height="146.5"/>
+                                <rect key="frame" x="147.66666666666666" y="111.66666666666667" width="118.99999999999997" height="146.66666666666663"/>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HN2-80-MUu">
-                                <rect key="frame" x="78" y="823" width="258" height="29"/>
+                                <rect key="frame" x="78" y="697" width="258" height="29"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="登录即同意" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Whn-XS-fJg">
-                                        <rect key="frame" x="0.0" y="0.0" width="71.5" height="29"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="71.666666666666671" height="29"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <color key="textColor" red="0.49803921568627452" green="0.28627450980392155" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" tag="1000" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vcR-Dv-jn1">
-                                        <rect key="frame" x="71.5" y="0.0" width="86" height="29"/>
+                                        <rect key="frame" x="71.666666666666657" y="0.0" width="86" height="29"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <state key="normal" title="《用户协议》">
                                             <color key="titleColor" red="0.77254901960784317" green="0.40392156862745099" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/>
@@ -73,7 +73,7 @@
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="和" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ToV-NI-nOm">
-                                        <rect key="frame" x="157.5" y="0.0" width="14.5" height="29"/>
+                                        <rect key="frame" x="157.66666666666666" y="0.0" width="14.333333333333343" height="29"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <color key="textColor" red="0.49803921569999998" green="0.28627450980000002" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -125,8 +125,8 @@
     </scenes>
     <resources>
         <image name="wechat_login_bg" width="375" height="667"/>
-        <image name="wechat_login_btn_bg" width="247" height="59.5"/>
-        <image name="wechat_login_logo_icon" width="119" height="146.5"/>
+        <image name="wechat_login_btn_bg" width="247" height="59.666667938232422"/>
+        <image name="wechat_login_logo_icon" width="119" height="146.66667175292969"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

GYDemo/GYDemo/Network/CGNetworkTools.m

@@ -361,6 +361,7 @@ static CGNetworkTools* _tools = nil;
     if ([[data Read] objectForKey:@"source"]) {
          [dict setValue: [[data Read] objectForKey:@"source"] forKey: @"source"];
     }
+    [dict setValue: [[data Read] objectForKey:@"common"] forKey: @"source"];
     
     NSString *uid = [[data Read] objectForKey:@"uid"]; 
     if (uid != nil) { [dict setValue: uid forKey: @"uid"]; }

GYDemo/GYDemo/ViewController/GYLoginViewController.m

@@ -50,6 +50,12 @@
 
 /// 微信登录
 - (IBAction)weichatLoginAction:(UIButton *)sender {
+    
+    if ([WXApi isWXAppInstalled]) {
+        [MBProgressHUD showError:@"请先安装微信"];
+        return;
+    }
+    
     Data * data = [[Data alloc] init];
     if([[data Read] objectForKey:@"refresh_token"]){
         [self WXLoginOauth:nil];

farm.xcworkspace/xcuserdata/mazy.xcuserdatad/IDEFindNavigatorScopes.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>