Commit dba23e9d by pierce

备份,已达到可测试标准

parent 3ef6be85
Showing with 28 additions and 11 deletions
...@@ -75,6 +75,14 @@ ...@@ -75,6 +75,14 @@
*/ */
+ (BOOL)fus_createBatabaseTables + (BOOL)fus_createBatabaseTables
{ {
// 创建数据库,如果有则打开
BOOL isCreateDB = [self fus_createBatabase];
if (!isCreateDB) {
FUSLogInfo(@"--->创建数据库表失败,打开数据库失败");
return NO;
}
if ([NSDictionary isNull:FUSDBCreateTable.sharedInstance.tableStructDict]) { if ([NSDictionary isNull:FUSDBCreateTable.sharedInstance.tableStructDict]) {
return false; return false;
} }
......
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
//设置图标 //设置图标
if (_item.icon) { if (_item.icon) {
self.imageView.image = [UIImage imageNamed:_item.icon]; self.imageView.image = [UIImage com_ImageNamed:_item.icon];
} }
//设置标题字体 //设置标题字体
......
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
NSArray *btnsArr = @[self.facebookBtn,self.twitterBtn,self.lineBtn,self.googleBtn,self.fusiIdBtn]; NSArray *btnsArr = @[self.facebookBtn,self.twitterBtn,self.lineBtn,self.googleBtn,self.fusiIdBtn];
[btnsArr enumerateObjectsUsingBlock:^(UIButton * obj, NSUInteger idx, BOOL * _Nonnull stop) { [btnsArr enumerateObjectsUsingBlock:^(UIButton * obj, NSUInteger idx, BOOL * _Nonnull stop) {
[obj setImage:[UIImage imageNamed:btnImgNamesArr[idx]] forState:UIControlStateNormal]; [obj setImage:[UIImage com_ImageNamed:btnImgNamesArr[idx]] forState:UIControlStateNormal];
[obj setImage:[UIImage imageNamed:btnSelectImgNamesArr[idx]] forState:UIControlStateSelected]; [obj setImage:[UIImage com_ImageNamed:btnSelectImgNamesArr[idx]] forState:UIControlStateSelected];
[self.contentView addSubview:obj]; [self.contentView addSubview:obj];
[obj addTarget:self action:@selector(onButtonClickAction:) forControlEvents:UIControlEventTouchUpInside]; [obj addTarget:self action:@selector(onButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
......
...@@ -653,7 +653,7 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey"; ...@@ -653,7 +653,7 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
allowScroll = [dataDict[@"allowScroll"] integerValue]; allowScroll = [dataDict[@"allowScroll"] integerValue];
} }
FUSHalfWebViewModel *webModel = [FUSHalfWebViewModel fus_modelWithDict:dataDict]; FUSHalfWebViewModel *webModel = [FUSHalfWebViewModel fus_modelWithDict:dataDict];
[FUSRouter.liveRouter fus_showHalfWebViewWithModel:dataDict needMouted:needMouted == 1 allowScroll:allowScroll userInteractionEnabled:isThrough != 1]; [FUSRouter.liveRouter fus_showHalfWebViewWithModel:webModel needMouted:needMouted == 1 allowScroll:allowScroll userInteractionEnabled:isThrough != 1];
break; break;
} }
......
...@@ -45,6 +45,10 @@ ...@@ -45,6 +45,10 @@
@implementation FUSExchangeDiamondViewController @implementation FUSExchangeDiamondViewController
- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
return [super initWithNibName:nibNameOrNil bundle:FUSCommonBundle.bundle];
}
- (void)viewDidLoad - (void)viewDidLoad
{ {
[super viewDidLoad]; [super viewDidLoad];
...@@ -108,7 +112,7 @@ ...@@ -108,7 +112,7 @@
_tableView.tableFooterView = [[UIView alloc] init]; _tableView.tableFooterView = [[UIView alloc] init];
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone; _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
_tableView.rowHeight = CELL_HEIGTH; _tableView.rowHeight = CELL_HEIGTH;
[_tableView registerNib:[UINib nibWithNibName:@"FUSExchangeDiamondTableViewCell" bundle:nil] forCellReuseIdentifier:CellReuseIdentifier]; [_tableView registerNib:[UINib nibWithNibName:@"FUSExchangeDiamondTableViewCell" bundle:FUSCommonBundle.bundle] forCellReuseIdentifier:CellReuseIdentifier];
} }
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
// //
#import "FUSRechargeViewController.h" #import "FUSRechargeViewController.h"
#import "FUSWKWebViewController.h"
#import "FUSRechargeTableViewCell.h" #import "FUSRechargeTableViewCell.h"
#import "FUSCommonCacheOperate.h" #import "FUSCommonCacheOperate.h"
#import "FUSUserDefaultsStore.h" #import "FUSUserDefaultsStore.h"
...@@ -25,7 +24,6 @@ ...@@ -25,7 +24,6 @@
#import "FUSRechargeCheckingCell.h" #import "FUSRechargeCheckingCell.h"
#import "FUSCacheDataShare.h"
#import "EventTrackParams.h" #import "EventTrackParams.h"
#import "FUSNotificationCenter.h" #import "FUSNotificationCenter.h"
...@@ -59,6 +57,7 @@ ...@@ -59,6 +57,7 @@
@property (weak, nonatomic) IBOutlet UICollectionView *checkingCollectionView; @property (weak, nonatomic) IBOutlet UICollectionView *checkingCollectionView;
@property (weak, nonatomic) IBOutlet FUSStyleButton *checkingSureBtn; @property (weak, nonatomic) IBOutlet FUSStyleButton *checkingSureBtn;
@property (weak, nonatomic) IBOutlet UILabel *checkingDescLabel; @property (weak, nonatomic) IBOutlet UILabel *checkingDescLabel;
@property (weak, nonatomic) IBOutlet UIView *topBgImageView;
@property (nonatomic, assign) NSInteger checkingSelectedIndex; @property (nonatomic, assign) NSInteger checkingSelectedIndex;
...@@ -186,6 +185,10 @@ ...@@ -186,6 +185,10 @@
} }
} }
- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
return [super initWithNibName:nibNameOrNil bundle:FUSCommonBundle.bundle];
}
- (void)viewDidLoad - (void)viewDidLoad
{ {
// [FIRAnalytics logEventWithName:@"view_item_list" parameters:@{@"recharge_type":@"apple_iap"}]; // [FIRAnalytics logEventWithName:@"view_item_list" parameters:@{@"recharge_type":@"apple_iap"}];
...@@ -310,6 +313,7 @@ ...@@ -310,6 +313,7 @@
headerBgLayerView.layer.shadowOffset = CGSizeMake(0, 2); headerBgLayerView.layer.shadowOffset = CGSizeMake(0, 2);
// headerBgLayerView.layer.shadowRadius = 12; // headerBgLayerView.layer.shadowRadius = 12;
self.diamondImageView.image = UIImage.fus_diamonIcon; self.diamondImageView.image = UIImage.fus_diamonIcon;
[self.topBgImageView insertSubview:headerBgLayerView atIndex:0];
[headerBgLayerView mas_makeConstraints:^(MASConstraintMaker *make) { [headerBgLayerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.inset(18); make.left.right.inset(18);
make.top.bottom.inset(10); make.top.bottom.inset(10);
...@@ -332,7 +336,7 @@ ...@@ -332,7 +336,7 @@
// 配置TableView // 配置TableView
_tableView.tableFooterView = [[UIView alloc] init]; _tableView.tableFooterView = [[UIView alloc] init];
[_tableView registerNib:[UINib nibWithNibName:CellReuseIdentifier bundle:nil] forCellReuseIdentifier:CellReuseIdentifier]; [_tableView registerNib:[UINib nibWithNibName:CellReuseIdentifier bundle:FUSCommonBundle.bundle] forCellReuseIdentifier:CellReuseIdentifier];
[FUSEventTrack logEventWithName:@"entered_recharge_view"]; [FUSEventTrack logEventWithName:@"entered_recharge_view"];
_dataSource = _appStoreDataSource; _dataSource = _appStoreDataSource;
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<outlet property="normalView" destination="i5M-Pr-FkT" id="FqY-Xl-mlg"/> <outlet property="normalView" destination="i5M-Pr-FkT" id="FqY-Xl-mlg"/>
<outlet property="premiumRechargeBtn" destination="B6a-mj-s4m" id="WSg-Y2-WVA"/> <outlet property="premiumRechargeBtn" destination="B6a-mj-s4m" id="WSg-Y2-WVA"/>
<outlet property="tableView" destination="o3j-Et-9JY" id="dY5-9P-0P5"/> <outlet property="tableView" destination="o3j-Et-9JY" id="dY5-9P-0P5"/>
<outlet property="topBgImageView" destination="Tax-eY-knd" id="GZU-bQ-RW1"/>
<outlet property="view" destination="zXO-Sr-vIN" id="9Wb-3r-dQ5"/> <outlet property="view" destination="zXO-Sr-vIN" id="9Wb-3r-dQ5"/>
</connections> </connections>
</placeholder> </placeholder>
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
* *
* @return FUSZhaiXinModel数组 * @return FUSZhaiXinModel数组
*/ */
+ (NSArray *)fus_selectZhaiXinInfosTable; - (NSArray *)fus_selectZhaiXinInfosTable;
/** /**
* 写入多条数据到寨信表 * 写入多条数据到寨信表
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
* *
* @return 写入结果 * @return 写入结果
*/ */
+ (BOOL)fus_writeMultiDataToZhaiXinInfosTableWithModelArray:(NSArray *)modelArray keyArray:(NSArray *)keyArray; - (BOOL)fus_writeMultiDataToZhaiXinInfosTableWithModelArray:(NSArray *)modelArray keyArray:(NSArray *)keyArray;
/** /**
查找某聊天最后一条消息 查找某聊天最后一条消息
...@@ -144,6 +144,6 @@ ...@@ -144,6 +144,6 @@
@param talkID 对方 ID @param talkID 对方 ID
@return 最后一条消息 @return 最后一条消息
*/ */
+ (FUSZhaiXinModel *)fus_findLastReceiveMessageWithTalkID:(NSString *)talkID; - (FUSZhaiXinModel *)fus_findLastReceiveMessageWithTalkID:(NSString *)talkID;
@end @end
This source diff could not be displayed because it is too large. You can view the blob instead.
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 sign in to comment