Commit 75e504ab authored by zhangshuai's avatar zhangshuai

增加接口 修改

parent 898f66ad
......@@ -19,6 +19,10 @@
64F89681255FABB800AF9AD7 /* AddGDTADManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 64F89678255FABB800AF9AD7 /* AddGDTADManager.m */; };
64F89682255FABB800AF9AD7 /* IOSADManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 64F89679255FABB800AF9AD7 /* IOSADManager.m */; };
64F89683255FABB800AF9AD7 /* GYAdsTrackMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 64F8967B255FABB800AF9AD7 /* GYAdsTrackMode.m */; };
686352072563E0E400F7BAD3 /* WelfareCenterVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 686352052563E0E400F7BAD3 /* WelfareCenterVC.m */; };
686352082563E0E400F7BAD3 /* WelfareCenterVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 686352062563E0E400F7BAD3 /* WelfareCenterVC.xib */; };
686352292563E26900F7BAD3 /* WelfareCenterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 686352272563E26900F7BAD3 /* WelfareCenterCell.m */; };
6863522A2563E26900F7BAD3 /* WelfareCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 686352282563E26900F7BAD3 /* WelfareCenterCell.xib */; };
6E42AF336D54EF2C5073BB5C /* Pods_GYDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 917ED4A8EF1F82D94F8A8E38 /* Pods_GYDemo.framework */; };
A91A7879253EE56B00F9B216 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = A91A7878253EE56B00F9B216 /* AppDelegate.mm */; };
A91A7882253EE56B00F9B216 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A91A7880253EE56B00F9B216 /* Main.storyboard */; };
......@@ -132,6 +136,12 @@
64F8967B255FABB800AF9AD7 /* GYAdsTrackMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GYAdsTrackMode.m; sourceTree = "<group>"; };
64F8967C255FABB800AF9AD7 /* GYAdsTrackModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GYAdsTrackModel.h; sourceTree = "<group>"; };
64F8967D255FABB800AF9AD7 /* IOSADManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSADManager.h; sourceTree = "<group>"; };
686352042563E0E400F7BAD3 /* WelfareCenterVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WelfareCenterVC.h; sourceTree = "<group>"; };
686352052563E0E400F7BAD3 /* WelfareCenterVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WelfareCenterVC.m; sourceTree = "<group>"; };
686352062563E0E400F7BAD3 /* WelfareCenterVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WelfareCenterVC.xib; sourceTree = "<group>"; };
686352262563E26900F7BAD3 /* WelfareCenterCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WelfareCenterCell.h; sourceTree = "<group>"; };
686352272563E26900F7BAD3 /* WelfareCenterCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WelfareCenterCell.m; sourceTree = "<group>"; };
686352282563E26900F7BAD3 /* WelfareCenterCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WelfareCenterCell.xib; sourceTree = "<group>"; };
917ED4A8EF1F82D94F8A8E38 /* Pods_GYDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GYDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A91A7874253EE56B00F9B216 /* GYDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GYDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
A91A7877253EE56B00F9B216 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
......@@ -546,6 +556,12 @@
A9F5CFEF254850340035F17B /* GYLoginViewController.h */,
A9F5CFF0254850340035F17B /* GYLoginViewController.m */,
A91A791D253EF29B00F9B216 /* GYNative.storyboard */,
686352042563E0E400F7BAD3 /* WelfareCenterVC.h */,
686352052563E0E400F7BAD3 /* WelfareCenterVC.m */,
686352062563E0E400F7BAD3 /* WelfareCenterVC.xib */,
686352262563E26900F7BAD3 /* WelfareCenterCell.h */,
686352272563E26900F7BAD3 /* WelfareCenterCell.m */,
686352282563E26900F7BAD3 /* WelfareCenterCell.xib */,
);
path = ViewController;
sourceTree = "<group>";
......@@ -670,6 +686,7 @@
A91A7887253EE56D00F9B216 /* LaunchScreen.storyboard in Resources */,
A9AB9D7225403E6B00F0D766 /* GYTaskCell.xib in Resources */,
A9AB9D62254039FD00F0D766 /* GYTaskAlertView.xib in Resources */,
6863522A2563E26900F7BAD3 /* WelfareCenterCell.xib in Resources */,
A93AF227254AB23E002E8CBE /* GYCountDownTimeView.xib in Resources */,
A91A791E253EF29B00F9B216 /* GYNative.storyboard in Resources */,
A9AB9D9F2541228E00F0D766 /* MBProgressHUD.bundle in Resources */,
......@@ -685,6 +702,7 @@
A91A7882253EE56B00F9B216 /* Main.storyboard in Resources */,
A91A7982253F248E00F9B216 /* GYGiftAlertView.xib in Resources */,
A93AF243254AED79002E8CBE /* GYWithDrawAlertView.xib in Resources */,
686352082563E0E400F7BAD3 /* WelfareCenterVC.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -781,6 +799,7 @@
A91A78F2253EE87500F9B216 /* AESCipher.m in Sources */,
A91A7997253FDEFD00F9B216 /* GYSettingViewController.m in Sources */,
A91A794E253F14C300F9B216 /* LaunchScreenPlaceHolderVC.m in Sources */,
686352292563E26900F7BAD3 /* WelfareCenterCell.m in Sources */,
64F8967F255FABB800AF9AD7 /* AddCSJADManager.m in Sources */,
64022D5C255D6B7D00513333 /* GYCashSixAwardAlertView.m in Sources */,
64F89680255FABB800AF9AD7 /* AddRuiShiADManager.m in Sources */,
......@@ -811,6 +830,7 @@
64F89682255FABB800AF9AD7 /* IOSADManager.m in Sources */,
64F89683255FABB800AF9AD7 /* GYAdsTrackMode.m in Sources */,
A91A7913253EEF5100F9B216 /* GYWheelSurfModel.m in Sources */,
686352072563E0E400F7BAD3 /* WelfareCenterVC.m in Sources */,
64F8967E255FABB800AF9AD7 /* AddSigmobADManager.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -1003,7 +1023,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 127;
CURRENT_PROJECT_VERSION = 109;
DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
......@@ -1035,7 +1055,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 127;
CURRENT_PROJECT_VERSION = 109;
DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
......
......@@ -90,6 +90,11 @@
#define WEAKSELF __weak __typeof(self) weakSelf = self;
#define PF_SC_L @"PingFangSC-Light"
#define PF_SC_R @"PingFangSC-Regular"
#define PF_SC_M @"PingFangSC-Medium"
#import "Data.h"
#import "KeychainItemManager.h"
......
......@@ -42,7 +42,9 @@ typedef enum : NSUInteger {
is_bind_wx, //是否绑定微信
getRedPackList, // 红包配置列表
cloudCheck //云朵加速校验
cloudCheck, //云朵加速校验
cash2Coin, //兑换成金币
} TQNetwortGetAction;
......
......@@ -90,6 +90,8 @@ static CGNetworkTools* _tools = nil;
return @"/app/v1/game/farm/rp_list";
case cloudCheck:
return @"/app/v1/game/farm/cloud_check";
case cash2Coin:
return @"/app/v1/game/farm/cash2Coin";
default:
return @"";
}
......
......@@ -72,6 +72,7 @@
[webViewConfig.userContentController addScriptMessageHandler:self name:@"showWithdrawSucces"];
[webViewConfig.userContentController addScriptMessageHandler:self name:@"showDialog"];
[webViewConfig.userContentController addScriptMessageHandler:self name:@"jumpWebActivity"];
[webViewConfig.userContentController addScriptMessageHandler:self name:@"getVersionName()"]; // 告诉h5 版本号
//屏蔽底部黑框
self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) configuration:webViewConfig];
......@@ -127,6 +128,9 @@
[backButton addTarget:self action:@selector(goBackController) forControlEvents:UIControlEventTouchUpInside];
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"返回" style:UIBarButtonItemStyleDone target:self action:@selector(goBackController)];
}
}
- (void)storeCoin{
......@@ -333,6 +337,8 @@
- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(null_unspecified WKNavigation *)navigation{
[MBProgressHUD showLoading:@"Loading..." toView:self.view];
self.progressView.hidden = NO;
self.progressView.transform = CGAffineTransformMakeScale(1.0f, 1.5f);
[self.view bringSubviewToFront:self.progressView];
......@@ -346,6 +352,7 @@
// self.title = _webView.title;
// }
// 禁止放大缩小
NSString *injectionJSString = @"var script = document.createElement('meta');"
"script.name = 'viewport';"
......@@ -461,7 +468,7 @@
// JS
- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
NSLog(@"%@",message.name);// 方法名
NSLog(@"message >%@",message.name);// 方法名
__weak typeof(self) weakSelf = self;
if([message.name isEqualToString:@"backTrack"] || [message.name isEqualToString:@"closeView"]){
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
......@@ -580,6 +587,8 @@
if (bodyStr) {
[[CGUserManager shared] addLocCollection:bodyStr value:@""];
}
}else if ([message.name isEqualToString:@"getVersionName()"]){
}
}
......
//
// WelfareCenterCell.h
// GYDemo
//
// Created by zhangshuai on 2020/11/17.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface WelfareCenterCell : UITableViewCell
@end
NS_ASSUME_NONNULL_END
//
// WelfareCenterCell.m
// GYDemo
//
// Created by zhangshuai on 2020/11/17.
//
#import "WelfareCenterCell.h"
@implementation WelfareCenterCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="WelfareCenterCell">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
</tableViewCell>
</objects>
</document>
//
// WelfareCenterVC.h
// GYDemo
//
// Created by zhangshuai on 2020/11/17.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface WelfareCenterVC : UIViewController
@end
NS_ASSUME_NONNULL_END
//
// WelfareCenterVC.m
// GYDemo
//
// Created by zhangshuai on 2020/11/17.
//
#import "WelfareCenterVC.h"
#import "WelfareCenterCell.h"
#define Identifier @"WelfareCenterCell"
@interface WelfareCenterVC ()
@property (nonatomic, strong) NSMutableArray * dataArray;
@property (weak, nonatomic) IBOutlet UITableView *tableView;
@end
@implementation WelfareCenterVC
- (void)dealloc{
[[NSNotificationCenter defaultCenter]removeObserver:self.tableView];
}
- (NSMutableArray * )dataArray{
if (_dataArray == nil) {
_dataArray = [[NSMutableArray alloc]init];
}
return _dataArray;
}
- (void)viewDidLoad {
[super viewDidLoad];
[self loadData];
[self initTableView];
// Do any additional setup after loading the view from its nib.
}
- (void)initTableView{
self.tableView.rowHeight = UITableViewAutomaticDimension;
self.tableView.estimatedRowHeight = UITableViewAutomaticDimension;
self.tableView.backgroundColor = UIColor.clearColor;//kColorFromHex(0xFAFAFA);
UINib * nib = [UINib nibWithNibName:Identifier bundle:nil];
[self.tableView registerNib:nib forCellReuseIdentifier:Identifier];
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
return 1;
}
- (NSInteger)tableView:(nonnull UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return self.dataArray.count;
}
- (nonnull UITableViewCell *)tableView:(nonnull UITableView *)tableView cellForRowAtIndexPath:(nonnull NSIndexPath *)indexPath {
// ESMusicListData * data = [self.dataArray objectAtIndex:indexPath.row];
WelfareCenterCell * cell = [tableView dequeueReusableCellWithIdentifier:Identifier forIndexPath:indexPath];
// cell.cellType = self.cellType;
// cell.title.text = data.songName;
// cell.content.text = data.musicCategory;
//// [cell.musicImage setImageWithURL:[NSURL URLWithString:data.musicCover] placeholderImage:[UIImage imageNamed:@"home_top_bg"]];
// [cell.musicImage sd_setImageWithURL:[NSURL URLWithString:data.musicCover] placeholderImage:[UIImage imageNamed:@"home_top_bg"]];
//
// cell.isPlaying = [[MMusicManager shareManager]isPlayingWithModel:data listName:self.albumCategory];
// if (cell.isPlaying) {
// self.indexPath = indexPath;
// }
return cell;
}
-(void)tableView:(UITableView *)tableView willDisplayCell:(UITableView *)cell forRowAtIndexPath:(NSIndexPath *)indexPath{
}
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
return 0;
}
-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
UIView*header = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, 40)];
UILabel * label = [[UILabel alloc]initWithFrame:CGRectMake(20, 12, KScreenWidth, 20)];
label.text = @"Explore Meditation";
label.textColor = UIColor.whiteColor;
label.font = [UIFont fontWithName:PF_SC_M size:20];
[header addSubview:label];
return header;
}
-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
UIView * sectionView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth,4 )];
return sectionView;
}
-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
return 0;
}
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
[tableView deselectRowAtIndexPath:indexPath animated:NO];
[tableView reloadData];
}
- (void)loadData{
WEAKSELF;
[MBProgressHUD showLoading:@"loading"];
// [self.dataSource requestMusicListWithPreferenceData:self.preferenceID results:^(NSArray * _Nonnull array) {
// if (array.count == 0) {
// return;
// }
//
//
// [MBProgressHUD hideHUD];
// [weakSelf.tableView.mj_footer endRefreshing];
// if (array.count < 20) {
// [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
// }else{
//
// }
// if (self.dataSource.currentPage == 1) {
// [weakSelf.dataArray removeAllObjects];
// }
// [weakSelf.dataArray addObjectsFromArray:array];
//
// [weakSelf.tableView reloadData];
//
// }];
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
<?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="retina4_7" 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"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WelfareCenterVC">
<connections>
<outlet property="tableView" destination="cLQ-3z-U9W" id="lrz-YI-VgV"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="cLQ-3z-U9W">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="YN3-rf-K4G"/>
<outlet property="delegate" destination="-1" id="ifg-sF-Ftu"/>
</connections>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="cLQ-3z-U9W" secondAttribute="trailing" id="028-KM-XZz"/>
<constraint firstItem="cLQ-3z-U9W" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="7pf-5Q-Gok"/>
<constraint firstAttribute="bottom" secondItem="cLQ-3z-U9W" secondAttribute="bottom" id="8VV-5W-bB8"/>
<constraint firstItem="cLQ-3z-U9W" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" id="kEn-qd-C6h"/>
</constraints>
<point key="canvasLocation" x="-146" y="69"/>
</view>
</objects>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
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