Skip to content

L
LuckFarm
Commit e24ff8d4 authored by Mazy's avatar Mazy
Browse files
Options

fix bugs

parent 1b883c02
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 843 additions and 845 deletions
GYDemo/GYDemo.xcodeproj/project.pbxproj
View file @ e24ff8d4
...@@ -1003,7 +1003,7 @@ ...@@ -1003,7 +1003,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements; CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 103; CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = XWMRLLSSFL; DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO; GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
...@@ -1035,7 +1035,7 @@ ...@@ -1035,7 +1035,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements; CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 103; CURRENT_PROJECT_VERSION = 112;
DEVELOPMENT_TEAM = XWMRLLSSFL; DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO; GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
......
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.h
View file @ e24ff8d4
...@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger countDown; @property (nonatomic, assign) NSInteger countDown;
- (void)showAlertToView: (UIView *)toView amount: (NSString *)money firstShow: (BOOL)isFirst; - (void)showAlertToView: (UIView *)toView amount: (NSString *)money firstShow: (BOOL)isFirst onlyCash: (BOOL)isCash;
- (void)hideAlert: (BOOL)isGain; - (void)hideAlert: (BOOL)isGain;
......
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.m
View file @ e24ff8d4
...@@ -49,20 +49,25 @@ ...@@ -49,20 +49,25 @@
[self hideAlert:true]; [self hideAlert:true];
} }
- (void)showAlertToView: (UIView *)toView amount: (NSString *)money firstShow: (BOOL)isFirst { - (void)showAlertToView: (UIView *)toView amount: (NSString *)money firstShow: (BOOL)isFirst onlyCash: (BOOL)isCash {
if (isFirst) { if (isFirst) {
self.gainAmountLeftLabel.hidden = true; self.gainAmountLeftLabel.hidden = true;
self.gainAmountLabel.text = [NSString stringWithFormat:@"+%@", money]; self.gainAmountLabel.text = [NSString stringWithFormat:@"+%@", money];
self.mainTitleLabel.text = @"现金奖励"; self.mainTitleLabel.text = @"现金奖励";
[self.commitButton setBackgroundImage:[UIImage imageNamed:@"alert_six_cash_btn_bg"] forState:UIControlStateNormal]; // [self.commitButton setBackgroundImage:[UIImage imageNamed:@"alert_six_cash_btn_bg"] forState:UIControlStateNormal];
[self.commitButton setImage:[UIImage imageNamed:@"alert_six_cash_play_btn_bg"] forState:UIControlStateNormal]; if (isCash) {
[self.commitButton setTitle:@" 领6倍奖励" forState:UIControlStateNormal]; [self.commitButton setImage:nil forState:UIControlStateNormal];
[self.commitButton setTitle:@"开心收下" forState:UIControlStateNormal];
} else {
[self.commitButton setImage:[UIImage imageNamed:@"alert_six_cash_play_btn_bg"] forState:UIControlStateNormal];
[self.commitButton setTitle:@" 领6倍奖励" forState:UIControlStateNormal];
}
self.centerImageView.image = [UIImage imageNamed:@"toast_double_cash_icon"]; self.centerImageView.image = [UIImage imageNamed:@"toast_double_cash_icon"];
} else { } else {
self.gainAmountLeftLabel.hidden = false; self.gainAmountLeftLabel.hidden = false;
self.mainTitleLabel.text = @"获得翻倍奖励"; self.mainTitleLabel.text = @"获得翻倍奖励";
[self.commitButton setBackgroundImage:[UIImage imageNamed:@"gift_confirm"] forState:UIControlStateNormal]; // [self.commitButton setBackgroundImage:[UIImage imageNamed:@"gift_confirm"] forState:UIControlStateNormal];
[self.commitButton setImage:nil forState:UIControlStateNormal]; [self.commitButton setImage:nil forState:UIControlStateNormal];
[self.commitButton setTitle:@"开心收下" forState:UIControlStateNormal]; [self.commitButton setTitle:@"开心收下" forState:UIControlStateNormal];
self.centerImageView.image = [UIImage imageNamed:@"toast_double_red_icon"]; self.centerImageView.image = [UIImage imageNamed:@"toast_double_red_icon"];
......
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.xib
View file @ e24ff8d4
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<rect key="frame" x="0.0" y="0.0" width="335" height="334"/> <rect key="frame" x="0.0" y="0.0" width="335" height="334"/>
</imageView> </imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gift_mask" translatesAutoresizingMaskIntoConstraints="NO" id="HHN-9a-UCS"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gift_mask" translatesAutoresizingMaskIntoConstraints="NO" id="HHN-9a-UCS">
<rect key="frame" x="9" y="25.333333333333314" width="317" height="230"/> <rect key="frame" x="9" y="28" width="317" height="230"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="230" id="lxh-II-Sff"/> <constraint firstAttribute="height" constant="230" id="lxh-II-Sff"/>
</constraints> </constraints>
...@@ -37,15 +37,15 @@ ...@@ -37,15 +37,15 @@
<rect key="frame" x="-9" y="-60" width="353" height="155"/> <rect key="frame" x="-9" y="-60" width="353" height="155"/>
</imageView> </imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ylj-kZ-eAE"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ylj-kZ-eAE">
<rect key="frame" x="58.000000000000014" y="265.33333333333337" width="218.66666666666669" height="48.666666666666686"/> <rect key="frame" x="25.333333333333343" y="268" width="284" height="46"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="19"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="21"/>
<state key="normal" title=" 领6倍奖励" image="alert_six_cash_play_btn_bg" backgroundImage="alert_six_cash_btn_bg"/> <state key="normal" title=" 领6倍奖励" backgroundImage="gift_confirm"/>
<connections> <connections>
<action selector="gainSixRedAwardAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="NVa-Jv-Xxj"/> <action selector="gainSixRedAwardAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="NVa-Jv-Xxj"/>
</connections> </connections>
</button> </button>
<stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Dnt-Dm-Z8f"> <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Dnt-Dm-Z8f">
<rect key="frame" x="47.333333333333329" y="197.66666666666669" width="240.33333333333337" height="36"/> <rect key="frame" x="47.333333333333329" y="200.33333333333331" width="240.33333333333337" height="36"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="获得翻倍奖励" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxy-Fc-ho1"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="获得翻倍奖励" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxy-Fc-ho1">
<rect key="frame" x="0.0" y="0.0" width="128.33333333333334" height="36"/> <rect key="frame" x="0.0" y="0.0" width="128.33333333333334" height="36"/>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="toast_double_red_icon" translatesAutoresizingMaskIntoConstraints="NO" id="p9y-5L-dzc"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="toast_double_red_icon" translatesAutoresizingMaskIntoConstraints="NO" id="p9y-5L-dzc">
<rect key="frame" x="93.999999999999986" y="63.000000000000007" width="146.66666666666663" height="114.66666666666669"/> <rect key="frame" x="93.999999999999986" y="65.666666666666686" width="146.66666666666663" height="114.66666666666669"/>
</imageView> </imageView>
</subviews> </subviews>
<constraints> <constraints>
...@@ -129,11 +129,10 @@ ...@@ -129,11 +129,10 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="alert_six_cash_btn_bg" width="218.66667175292969" height="48.666667938232422"/>
<image name="alert_six_cash_play_btn_bg" width="25" height="25"/>
<image name="alert_six_cash_timer_icon" width="28" height="28.666666030883789"/> <image name="alert_six_cash_timer_icon" width="28" height="28.666666030883789"/>
<image name="gift_bg" width="335" height="334"/> <image name="gift_bg" width="335" height="334"/>
<image name="gift_cancel" width="32" height="32"/> <image name="gift_cancel" width="32" height="32"/>
<image name="gift_confirm" width="284" height="46"/>
<image name="gift_mask" width="317" height="228"/> <image name="gift_mask" width="317" height="228"/>
<image name="order_header" width="353" height="155"/> <image name="order_header" width="353" height="155"/>
<image name="toast_double_red_icon" width="146.66667175292969" height="114.66666412353516"/> <image name="toast_double_red_icon" width="146.66667175292969" height="114.66666412353516"/>
......
GYDemo/GYDemo/AppDelegate.mm
View file @ e24ff8d4
...@@ -558,13 +558,12 @@ NSDictionary* appLaunchOpts; ...@@ -558,13 +558,12 @@ NSDictionary* appLaunchOpts;
[[IOSADManager shareADManager] showADType:ADType_Video resultBlock:^(BOOL success) { [[IOSADManager shareADManager] showADType:ADType_Video resultBlock:^(BOOL success) {
if (success) { if (success) {
[[CGNetworkTools shared] postWithAction:open_plant_box parameters:@{} success:^(id _Nonnull response) { [[CGNetworkTools shared] postWithAction:open_plant_box parameters:@{} success:^(id _Nonnull response) {
NSLog(@"open_plant_box = %@", response);
if ([[response objectForKey:@"status"] integerValue] == 200) { if ([[response objectForKey:@"status"] integerValue] == 200) {
NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"]; NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"];
CGFloat awardNumber = [[result objectForKey:@"awardNum"] floatValue];
NSString *awardNumber = [[result objectForKey:@"awardNum"] stringValue];
GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib]; GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
[alertVC showAlertToView:[[weakSelf ufw] appController].window amount:awardNumber firstShow: false]; [alertVC showAlertToView:[[weakSelf ufw] appController].window amount:[NSString stringWithFormat:@"%.2f", awardNumber] firstShow: true onlyCash:true];
[weakSelf ios_getHomeInfo]; [weakSelf ios_getHomeInfo];
} }
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {
...@@ -599,7 +598,7 @@ NSDictionary* appLaunchOpts; ...@@ -599,7 +598,7 @@ NSDictionary* appLaunchOpts;
- (void)awardMultiple: (NSString *)sid moneyNum: (NSString *)num { - (void)awardMultiple: (NSString *)sid moneyNum: (NSString *)num {
GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib]; GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
[alertVC showAlertToView:[[self ufw] appController].window amount:num firstShow: true]; [alertVC showAlertToView:[[self ufw] appController].window amount:num firstShow: true onlyCash:false];
// WEAKSELF // WEAKSELF
alertVC.closeCallBack = ^(bool result) { alertVC.closeCallBack = ^(bool result) {
...@@ -639,7 +638,7 @@ NSDictionary* appLaunchOpts; ...@@ -639,7 +638,7 @@ NSDictionary* appLaunchOpts;
NSString *totalRewardNum = [[rewardContentList.firstObject objectForKey:@"totalRewardNum"] stringValue]; NSString *totalRewardNum = [[rewardContentList.firstObject objectForKey:@"totalRewardNum"] stringValue];
GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib]; GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
[alertVC showAlertToView:[[weakSelf ufw] appController].window amount:totalRewardNum firstShow: false]; [alertVC showAlertToView:[[weakSelf ufw] appController].window amount:totalRewardNum firstShow: false onlyCash:false];
[weakSelf ios_getHomeInfo]; [weakSelf ios_getHomeInfo];
[weakSelf ios_onGetRedPackList]; [weakSelf ios_onGetRedPackList];
...@@ -742,7 +741,7 @@ NSDictionary* appLaunchOpts; ...@@ -742,7 +741,7 @@ NSDictionary* appLaunchOpts;
[[CGUserManager shared] getServiceInfo:^{ [[CGUserManager shared] getServiceInfo:^{
NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue]; NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
NSLog(@"isopenH5 = %@", status); NSLog(@"isopenH5 = %@", status);
if (![status isEqualToString:@"1"]) { if ([status isEqualToString:@"1"]) {
Data * data = [[Data alloc] init]; Data * data = [[Data alloc] init];
if([[data Read] objectForKey:@"refresh_token"] == nil) { if([[data Read] objectForKey:@"refresh_token"] == nil) {
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(launchAdSuccesShow) name:LaunchAdSuccesShow object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(launchAdSuccesShow) name:LaunchAdSuccesShow object:nil];
......
GYDemo/GYDemo/ViewController/GYLoginViewController.m
View file @ e24ff8d4
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
/// 微信登录 /// 微信登录
- (IBAction)weichatLoginAction:(UIButton *)sender { - (IBAction)weichatLoginAction:(UIButton *)sender {
if ([WXApi isWXAppInstalled]) { if (![WXApi isWXAppInstalled]) {
[MBProgressHUD showError:@"请先安装微信"]; [MBProgressHUD showError:@"请先安装微信"];
return; return;
} }
......
GYDemo/Pods/Pods.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ e24ff8d4
...@@ -14,17 +14,17 @@ ...@@ -14,17 +14,17 @@
<key>BaiduMobAd_SDK.xcscheme_^#shared#^_</key> <key>BaiduMobAd_SDK.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>13</integer> <integer>17</integer>
</dict> </dict>
<key>Bytedance-UnionAD.xcscheme_^#shared#^_</key> <key>Bytedance-UnionAD.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>6</integer> <integer>14</integer>
</dict> </dict>
<key>GDTMobSDK.xcscheme_^#shared#^_</key> <key>GDTMobSDK.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>11</integer> <integer>7</integer>
</dict> </dict>
<key>KSAdSDK.xcscheme_^#shared#^_</key> <key>KSAdSDK.xcscheme_^#shared#^_</key>
<dict> <dict>
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
<key>MJExtension.xcscheme_^#shared#^_</key> <key>MJExtension.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>7</integer> <integer>8</integer>
</dict> </dict>
<key>MJRefresh.xcscheme_^#shared#^_</key> <key>MJRefresh.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>10</integer> <integer>11</integer>
</dict> </dict>
<key>Masonry.xcscheme</key> <key>Masonry.xcscheme</key>
<dict> <dict>
...@@ -65,12 +65,12 @@ ...@@ -65,12 +65,12 @@
<key>RSPodKSAdaper.xcscheme_^#shared#^_</key> <key>RSPodKSAdaper.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>14</integer> <integer>10</integer>
</dict> </dict>
<key>SigmobAd-iOS.xcscheme_^#shared#^_</key> <key>SigmobAd-iOS.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>9</integer> <integer>12</integer>
</dict> </dict>
<key>SwiftyStoreKit.xcscheme</key> <key>SwiftyStoreKit.xcscheme</key>
<dict> <dict>
...@@ -82,17 +82,17 @@ ...@@ -82,17 +82,17 @@
<key>UMCCommon.xcscheme_^#shared#^_</key> <key>UMCCommon.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>12</integer> <integer>9</integer>
</dict> </dict>
<key>VLionAdSDKPoly.xcscheme_^#shared#^_</key> <key>VLionAdSDKPoly.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>15</integer> <integer>13</integer>
</dict> </dict>
<key>WechatOpenSDK.xcscheme_^#shared#^_</key> <key>WechatOpenSDK.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>8</integer> <integer>15</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>
......
UnityiOSFarm/Classes/Native/profile.json
View file @ e24ff8d4
This diff is collapsed.
UnityiOSFarm/Data/level1
View file @ e24ff8d4
No preview for this file type
UnityiOSFarm/Unity-iPhone.xcodeproj/project.pbxproj
View file @ e24ff8d4
This source diff could not be displayed because it is too large. You can view the blob instead.
UnityiOSFarm/Unity-iPhone.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ e24ff8d4
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>Unity-iPhone.xcscheme_^#shared#^_</key> <key>Unity-iPhone.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>16</integer> <integer>6</integer>
</dict> </dict>
<key>UnityFramework.xcscheme_^#shared#^_</key> <key>UnityFramework.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>17</integer> <integer>16</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment