Skip to content

L
LuckFarm
Commit 7f2041c6 authored by zhangshuai's avatar zhangshuai
Browse files
Options

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

parents 870e12b0 2da0d055
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 24 deletions
GYDemo/GYDemo.xcodeproj/project.pbxproj
View file @ 7f2041c6
......@@ -1003,7 +1003,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 112;
CURRENT_PROJECT_VERSION = 113;
DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
......@@ -1035,7 +1035,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 112;
CURRENT_PROJECT_VERSION = 113;
DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
......
GYDemo/GYDemo/AppDelegate.mm
View file @ 7f2041c6
......@@ -588,6 +588,7 @@ NSDictionary* appLaunchOpts;
} else {
[self awardMultiple: multipleSid moneyNum: moneyNumber];
}
[self ios_onGetRedPackList];
}
} failure:^(NSError * _Nonnull error) {
......@@ -600,10 +601,10 @@ NSDictionary* appLaunchOpts;
GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
[alertVC showAlertToView:[[self ufw] appController].window amount:num firstShow: true onlyCash:false];
// WEAKSELF
WEAKSELF
alertVC.closeCallBack = ^(bool result) {
if (result) {
[self gainMultipleAward: sid];
[weakSelf gainMultipleAward: sid];
} else {
// 取消播放领取
[[CGNetworkTools shared] postWithAction: adForcePost parameters:@{} success:^(id _Nonnull response) {
......@@ -629,7 +630,7 @@ NSDictionary* appLaunchOpts;
NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"];
NSArray *rewardContentList = [result objectForKey:@"rewardContentList"];
if (rewardContentList){
if (rewardContentList == nil){
return;
}
if (rewardContentList.count <= 0) {
......@@ -741,8 +742,7 @@ NSDictionary* appLaunchOpts;
[[CGUserManager shared] getServiceInfo:^{
NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
NSLog(@"isopenH5 = %@", status);
if (![status isEqualToString:@"1"]) {
Data * data = [[Data alloc] init];
if ([status isEqualToString:@"1"]) {
if([[data Read] objectForKey:@"refresh_token"] == nil) {
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(launchAdSuccesShow) name:LaunchAdSuccesShow object:nil];
}
......@@ -750,9 +750,14 @@ NSDictionary* appLaunchOpts;
} failure:^{
}];
[[IOSADManager shareADManager] showADType:ADType_OpenScreen resultBlock:^(BOOL success) {
if ([[data Read] objectForKey:@"isFirstInstall"]) {
[[IOSADManager shareADManager] showADType:ADType_OpenScreen resultBlock:^(BOOL success) {
[[IOSADManager shareADManager] requestVideoAD];
}];
} else {
[data WirteDic: @"1" Key:@"isFirstInstall"];
[[IOSADManager shareADManager] requestVideoAD];
}];
}
return YES;
}
......@@ -764,6 +769,7 @@ NSDictionary* appLaunchOpts;
loginVC.modalPresentationStyle = UIModalPresentationFullScreen;
UINavigationController *naviVC = [[UINavigationController alloc] initWithRootViewController:loginVC];
naviVC.modalPresentationStyle = UIModalPresentationFullScreen;
naviVC.view.frame = UIScreen.mainScreen.bounds;
[[[self ufw] appController].window.rootViewController.view addSubview:naviVC.view];
[[[self ufw] appController].window.rootViewController addChildViewController:naviVC];
// });
......
GYDemo/GYDemo/Base.lproj/Main.storyboard
View file @ 7f2041c6
......@@ -17,9 +17,12 @@
<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">
<imageView clipsSubviews="YES" 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="736"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="25D-Gd-d40">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
</button>
<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="10" width="33" height="32"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
......@@ -94,9 +97,12 @@
<viewLayoutGuide key="safeArea" id="CnQ-kP-08k"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="25D-Gd-d40" firstAttribute="leading" secondItem="dYL-zr-8sU" secondAttribute="leading" id="5CB-Sg-g9k"/>
<constraint firstItem="CnQ-kP-08k" firstAttribute="bottom" secondItem="HN2-80-MUu" secondAttribute="bottom" constant="10" id="5CH-CY-arC"/>
<constraint firstItem="iEN-Z8-WSa" firstAttribute="centerX" secondItem="CnQ-kP-08k" secondAttribute="centerX" id="AHn-2D-iCo"/>
<constraint firstItem="7mW-as-1Ow" firstAttribute="leading" secondItem="TWR-n9-3GS" secondAttribute="leading" id="Hgv-Aa-Z7O"/>
<constraint firstItem="25D-Gd-d40" firstAttribute="trailing" secondItem="CnQ-kP-08k" secondAttribute="trailing" id="J4L-mG-JcS"/>
<constraint firstItem="25D-Gd-d40" firstAttribute="top" secondItem="CnQ-kP-08k" secondAttribute="top" id="KAo-x2-KEq"/>
<constraint firstItem="j4f-2W-n3v" firstAttribute="top" secondItem="kyj-A5-ZZN" secondAttribute="bottom" constant="15" id="PKs-Y9-tVp"/>
<constraint firstItem="UOH-Jk-9M5" firstAttribute="top" secondItem="dYL-zr-8sU" secondAttribute="top" id="QGc-z2-3hQ"/>
<constraint firstItem="kyj-A5-ZZN" firstAttribute="top" secondItem="iEN-Z8-WSa" secondAttribute="bottom" constant="80" id="Qj0-mv-hk5"/>
......@@ -107,6 +113,7 @@
<constraint firstAttribute="bottom" secondItem="UOH-Jk-9M5" secondAttribute="bottom" id="bO1-z3-h9L"/>
<constraint firstItem="7mW-as-1Ow" firstAttribute="trailing" secondItem="TWR-n9-3GS" secondAttribute="trailing" id="bZ9-TX-c1y"/>
<constraint firstItem="TWR-n9-3GS" firstAttribute="top" secondItem="CnQ-kP-08k" secondAttribute="top" constant="10" id="kUB-dB-HDp"/>
<constraint firstItem="25D-Gd-d40" firstAttribute="bottom" secondItem="CnQ-kP-08k" secondAttribute="bottom" id="qej-Dv-IA9"/>
<constraint firstItem="kyj-A5-ZZN" firstAttribute="centerY" secondItem="CnQ-kP-08k" secondAttribute="centerY" id="rBv-t9-VV4"/>
<constraint firstItem="UOH-Jk-9M5" firstAttribute="trailing" secondItem="CnQ-kP-08k" secondAttribute="trailing" id="rqx-g0-qN2"/>
<constraint firstItem="HN2-80-MUu" firstAttribute="centerX" secondItem="CnQ-kP-08k" secondAttribute="centerX" id="w50-oT-za8"/>
......@@ -120,7 +127,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="5xP-ph-tof" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="747.82608695652175" y="-385.04464285714283"/>
<point key="canvasLocation" x="747.82608695652175" y="-385.59782608695656"/>
</scene>
</scenes>
<resources>
......
GYDemo/GYDemo/SCAds/IOSADManager.m
View file @ 7f2041c6
......@@ -254,7 +254,7 @@ static IOSADManager * manager = nil;
[weakSelf blockResultLoadWithData:model andSuccess:success];
};
csjAd.showSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
[weakSelf blockResultShowWithData:model andSuccess:YES];
[weakSelf blockResultShowWithData:model andSuccess:success];
};
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
......@@ -277,7 +277,7 @@ static IOSADManager * manager = nil;
[weakSelf blockResultLoadWithData:model andSuccess:success];
};
csjAd.showSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
[weakSelf blockResultShowWithData:model andSuccess:YES];
[weakSelf blockResultShowWithData:model andSuccess:success];
};
}
......@@ -298,7 +298,7 @@ static IOSADManager * manager = nil;
[weakSelf blockResultLoadWithData:model andSuccess:success];
};
csjAd.showSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
[weakSelf blockResultShowWithData:model andSuccess:YES];
[weakSelf blockResultShowWithData:model andSuccess:success];
};
}
......@@ -318,7 +318,7 @@ static IOSADManager * manager = nil;
[weakSelf blockResultLoadWithData:model andSuccess:success];
};
csjAd.showSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
[weakSelf blockResultShowWithData:model andSuccess:YES];
[weakSelf blockResultShowWithData:model andSuccess:success];
};
......
GYDemo/GYDemo/ViewController/GYLoginViewController.m
View file @ 7f2041c6
......@@ -26,15 +26,20 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(WXLoginOauth:) name:WXLoginName object:nil];
NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
NSLog(@"isopenH5 = %@", status);
if ([status isEqualToString:@"1"]) {
self.skipButton.hidden = true;
self.skipLineView.hidden = true;
} else {
self.skipButton.hidden = false;
self.skipLineView.hidden = false;
}
// NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
// NSLog(@"isopenH5 = %@", status);
// if ([status isEqualToString:@"1"]) {
// self.skipButton.hidden = true;
// self.skipLineView.hidden = true;
// } else {
// self.skipButton.hidden = false;
// self.skipLineView.hidden = false;
// }
}
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
self.view.frame = UIScreen.mainScreen.bounds;
}
- (void)viewWillAppear:(BOOL)animated {
......@@ -46,6 +51,7 @@
- (IBAction)skipAction:(UIButton *)sender {
[self.view removeFromSuperview];
[self removeFromParentViewController];
[[CGUserManager shared] addLocCollection:@"click_skip_button" value:@""];
}
/// 微信登录
......
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