Skip to content

D
Dolphins
Commit aaa5b56b authored by zhangguangyi's avatar zhangguangyi
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/master' 

Conflicts:
	.DS_Store
parents 7c29df19 1140631a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 311 additions and 837 deletions
Dolphins.xcodeproj/project.pbxproj
View file @ aaa5b56b
This diff is collapsed.
Dolphins/AppDelegate.m
View file @ aaa5b56b
......@@ -48,7 +48,7 @@
[AMapServices sharedServices].apiKey = @"501f8a894329f4b57bbfee208a11676f";
[UMConfigure initWithAppkey:@"5f02fdef167edd8d94000012" channel:nil];
[UMConfigure initWithAppkey:@"5f2291bcb4b08b653e8fd2a2" channel:nil];
[MobClick event:@"app_start"];
BuglyConfig * config = [[BuglyConfig alloc] init];
......@@ -60,7 +60,9 @@
[data InitPlist];
[KeychainItemManager ReadUUIDAndNickName];
[ZTPurchaseManager launchWithSwiftyStoreKit];
[ZTPurchaseManager launchWithSwiftyStoreKitWithSuccess:^{
}];
//创蓝
[ZJOauthLoginManager initWithShanYanAppID:ShanYanAppID];
......
Dolphins/Assets.xcassets/Care/矢量智能对象.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Goods/remind_cell_3_3.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_pet_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Goods/selected.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"filename" : "selected.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "selected@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "selected@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Goods/un_selected.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"filename" : "un_selected.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "un_selected@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "un_selected@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_0_0.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_briefcase_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_0_1.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_activity_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_0_2.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_water_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_0_3.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_gift_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_1_0.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_flight_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_1_1.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_punch_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_1_2.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_cake_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_1_3.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_fitness_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_2_0.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_fruit_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_2_1.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_money_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_2_2.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_drug_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_2_3.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_vegetables_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_3_0.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_eat_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_3_1.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_game_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Guard/remind_cell_3_2.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "select_bed_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Login/login_icon.imageset/Contents.json
View file @ aaa5b56b
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "迹录1@2x.png",
"filename" : "1211596276017_.pic.jpg",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "迹录1@3x.png",
"filename" : "1181596275942_.pic.jpg",
"idiom" : "universal",
"scale" : "3x"
}
......
Dolphins/Assets.xcassets/Map/Map_style2/map_style2_header_search.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "搜索@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "搜索@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Map/map_card_change_friend_icon_down.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "map_card_change_friend_icon_down@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "map_card_change_friend_icon_down@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Dolphins/Assets.xcassets/Mine/coarse_location.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(5).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(5).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Mine/emergency_contact.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(2).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Mine/mine_feedback.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(7).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(7).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Mine/mine_setting.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Mine/mine_share_icon.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(4).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(4).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Mine/my_tracks.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(1).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(1).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Assets.xcassets/Mine/online_service.imageset/Contents.json deleted 100644 → 0
View file @ 7c29df19
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(6).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(6).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Dolphins/Classes/Care/Controller/ZJBaseCareViewController.m
View file @ aaa5b56b
......@@ -255,7 +255,8 @@
}
- (void)showFriendSet:(ZJFriendModel *)model {
[MobClick event:@"addfriends_show_unlock_dialog"];
__weak typeof(self) weakSelf = self;
friend = [[ZJFriendSettingView alloc] init];
......
Dolphins/Classes/Care/Controller/ZJCareStyle2ViewController.m
View file @ aaa5b56b
......@@ -400,6 +400,7 @@
}
- (void)myTrack{
[MobClick event:@"home_mycard_click"];
ZJFriendTrackMapViewController *trackMapVc = [[ZJFriendTrackMapViewController alloc] init];
trackMapVc.isMyTrack = YES;
[self.navigationController showViewController:trackMapVc sender:nil];
......
Dolphins/Classes/Care/Controller/ZJCareViewController.m
View file @ aaa5b56b
......@@ -99,6 +99,7 @@
NSLog(@"添加关心的人");
[self logCollection];
[MobClick event:@"home_addfriend_click"];
[MobClick event:@"add_person"];
ZJTianJiaViewController *tianJiaVC = [[ZJTianJiaViewController alloc] init];
[self.navigationController pushViewController:tianJiaVC animated:YES];
}
......
Dolphins/Classes/Care/Controller/ZJJinJiViewController.m
View file @ aaa5b56b
......@@ -117,6 +117,7 @@
#pragma mark 发送信息给所有紧急联系人
- (void)sendAllEmergencyContact{
[MobClick event:@"alert"];
if (![ZJUserInfoManager shared].isLogin) {
// [MBProgressHUD showMessage:@"请先进行登录"];
ZJOauthLoginConfig * config = [[ZJOauthLoginConfig alloc] initWithCurrentVC:self];
......
Dolphins/Classes/Goods/Controller/ZJGoodsViewController.m
View file @ aaa5b56b
......@@ -273,21 +273,34 @@
[self.xuanZheButoon addTarget:self action:@selector(xuanZheButoonClick:) forControlEvents:UIControlEventTouchUpInside];
UILabel * lab = [UILabel labelWithtext:@"购买前请先阅读并同意" font:[UIFont systemFontOfSize:KFont(13)] textColor:[UIColor colorWithHex:0x666666] alignment:NSTextAlignmentLeft];
[lab sizeToFit];
lab.userInteractionEnabled = YES;
[self.beiJingView addSubview:lab];
[lab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.xuanZheButoon.mas_right).mas_offset(KScaleWidth(5));
make.centerY.equalTo(self.xuanZheButoon).mas_offset(KScaleWidth(0));
make.size.mas_equalTo(lab.size);
}];
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(protocolTextGesTap)];
[lab addGestureRecognizer:tap];
//同意Button
self.tongYButton = [UIButton buttonWithType:UIButtonTypeCustom];
// self.tongYButton.backgroundColor = [UIColor redColor];
self.tongYButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
[self.tongYButton setTitle:@"购买前请先阅读并同意《海豚守护付费会员服务协议》" forState:0];
[self.tongYButton setTitleColor:[UIColor colorWithHex:0x666666] forState:UIControlStateNormal];
[self.tongYButton setTitle:@"《海豚守护付费会员服务协议》" forState:0];
[self.tongYButton setTitleColor:kColorWithRGB(86, 142, 252) forState:UIControlStateNormal];
[self.tongYButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(13)]];
self.tongYButton.titleLabel.adjustsFontSizeToFitWidth = YES;
[self.beiJingView addSubview:self.tongYButton];
[self.tongYButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.xuanZheButoon.mas_right).mas_offset(KScaleWidth(5));
make.left.equalTo(lab.mas_right).mas_offset(KScaleWidth(0));
make.centerY.equalTo(self.xuanZheButoon).mas_offset(KScaleWidth(0));
make.size.mas_offset(CGSizeMake(KScaleWidth(300), KScaleWidth(12.5)));
make.size.mas_offset(CGSizeMake(KScaleWidth(200), KScaleWidth(12.5)));
}];
// [self.tongYButton addTarget:self action:@selector(tongYButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.tongYButton addTarget:self action:@selector(protocolButoonClick:) forControlEvents:UIControlEventTouchUpInside];
}
- (void)fanHuiButtonClick{
......@@ -315,6 +328,7 @@
[MBProgressHUD showError:@"获取产品信息失败"];
return;
}
// dolphinsguard_lifetime_vip
[ZTPurchaseManager purchaseWithProductIdWithProductId:productId inView:self.view success:^{
if (self.payFinish) {
......@@ -381,10 +395,22 @@
}
}
- (void)protocolTextGesTap{
[self xuanZheButoonClick:nil];
}
- (void)xuanZheButoonClick:(UIButton *)btn{
btn = self.xuanZheButoon;
btn.selected = !btn.selected;
}
- (void)protocolButoonClick:(UIButton *)btn{
NSDictionary * dic = [ZJUserInfoManager shared].h5_url;
BaseWebViewController * web = [[BaseWebViewController alloc] init];
web.url = [dic objectForKey:@"pay"];
[self.navigationController pushViewController:web animated:YES];
}
-(void)getIpaList {
__weak typeof(self) weakSelf = self;
[[TQNetworkTools shared]getWithAction:PaymentConfiguration parameters:@{} success:^(id _Nonnull response) {
......
Dolphins/Classes/Guard/Controller/ZJElectricalRemindVC.m
View file @ aaa5b56b
......@@ -91,6 +91,7 @@
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:modelDic options:NSJSONWritingPrettyPrinted error:nil];
NSString * string = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
[MobClick event:@"low_power_switch_click"];
[[TQNetworkTools shared] postWithAction:userRemindInfoSet parameters:@{@"":string} success:^(id _Nonnull response) {
NSString *result = [[NSString alloc] initWithData:response
......
Dolphins/Classes/Guard/Controller/ZJGuardViewController.m
View file @ aaa5b56b
......@@ -135,19 +135,9 @@
// return;
// }
if(![ZJUserInfoManager shared].userInfoModel.isMember){
[[ZJGoodsMagager shared] goodsWithVC:self callBack:^(id _Nonnull s) {
[[ZJUserInfoManager shared] updataUserInfo:^(ZJMineUserInfoModel * _Nonnull model) {
} failure:^(id _Nonnull error) {
}];
}];
return;
}
switch (sender.tag-0x64) {
case 0:{
[MobClick event:@"friends_location_card_click"];
NSDictionary * switchDic = [[self.data Read] objectForKey:@"switch"];
BOOL map_style2 = switchDic && [[NSString stringWithFormat:@"%@",[switchDic objectForKey:@"map_page_style"]] isEqualToString:@"1"];
......@@ -157,11 +147,37 @@
}
break;
case 1:{
if(![ZJUserInfoManager shared].userInfoModel.isMember){
[[ZJGoodsMagager shared] goodsWithVC:self callBack:^(id _Nonnull s) {
[[ZJUserInfoManager shared] updataUserInfo:^(ZJMineUserInfoModel * _Nonnull model) {
} failure:^(id _Nonnull error) {
}];
}];
return;
}
[MobClick event:@"place_remind_card_click"];
ZJLocationAttentionVC * vc = [ZJLocationAttentionVC new];
[self.navigationController pushViewController:vc animated:YES];
}
break;
case 2:{
if(![ZJUserInfoManager shared].userInfoModel.isMember){
[[ZJGoodsMagager shared] goodsWithVC:self callBack:^(id _Nonnull s) {
[[ZJUserInfoManager shared] updataUserInfo:^(ZJMineUserInfoModel * _Nonnull model) {
} failure:^(id _Nonnull error) {
}];
}];
return;
}
[MobClick event:@"low_power_card_click"];
ZJElectricalRemindVC * remind = [[UIStoryboard storyboardWithName:@"Guard" bundle:nil] instantiateViewControllerWithIdentifier:@"ZJElectricalRemindVC"];
[self.navigationController pushViewController:remind animated:YES];
}
......@@ -236,15 +252,21 @@
if(![ZJUserInfoManager shared].userInfoModel.isMember){
[[ZJGoodsMagager shared] goodsWithVC:self callBack:^(id _Nonnull s) {
[[ZJUserInfoManager shared] updataUserInfo:^(ZJMineUserInfoModel * _Nonnull model) {
} failure:^(id _Nonnull error) {
}];
}];
return;
}
if (indexPath.row < 4){
NSArray * event = @[@"vegetable_click", @"getup_click", @"fruit_click", @"Water_click"];
[MobClick event:event[indexPath.row]];
}
if (indexPath.row == self.dataSource.count - 1) {
[MobClick event:@"add_remind_click"];
ZJAddReminderController *vc = [ZJAddReminderController new];
[self.navigationController pushViewController:vc animated:YES];
}else{
......
Dolphins/Classes/LocationAttention/ZJLocationAttentionVC.xib
View file @ aaa5b56b
......@@ -32,7 +32,7 @@
<rect key="frame" x="107" y="15" width="200" height="194"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uob-FV-s6z">
<rect key="frame" x="79" y="598.5" width="256.5" height="57.5"/>
<rect key="frame" x="79" y="435" width="256.5" height="57.5"/>
<state key="normal" image="LocationHint_back_btn_select"/>
<state key="selected" image="LocationHint_back_btn_selected"/>
<connections>
......@@ -62,13 +62,14 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="chR-61-Bcl" firstAttribute="centerX" secondItem="j5y-pY-6pp" secondAttribute="centerX" id="CSP-9Z-apR"/>
<constraint firstItem="Uob-FV-s6z" firstAttribute="top" secondItem="9E9-pW-Lib" secondAttribute="bottom" constant="80" id="Dx2-tr-cB3"/>
<constraint firstItem="9E9-pW-Lib" firstAttribute="top" secondItem="chR-61-Bcl" secondAttribute="bottom" constant="20" id="KIr-bb-Qf1"/>
<constraint firstItem="9E9-pW-Lib" firstAttribute="centerX" secondItem="chR-61-Bcl" secondAttribute="centerX" id="YEm-z9-yB6"/>
<constraint firstItem="j5y-pY-6pp" firstAttribute="centerX" secondItem="jqH-qv-uUS" secondAttribute="centerX" id="a0s-5I-zzr"/>
<constraint firstItem="chR-61-Bcl" firstAttribute="top" secondItem="j5y-pY-6pp" secondAttribute="bottom" constant="42" id="csD-Mf-xFw"/>
<constraint firstItem="j5y-pY-6pp" firstAttribute="top" secondItem="jqH-qv-uUS" secondAttribute="top" constant="15" id="p8K-u9-NQh"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="Uob-FV-s6z" secondAttribute="bottom" constant="44" id="pVR-te-71u"/>
<constraint firstItem="Uob-FV-s6z" firstAttribute="centerX" secondItem="j5y-pY-6pp" secondAttribute="centerX" id="rcn-3A-ghJ"/>
<constraint firstItem="Uob-FV-s6z" firstAttribute="centerY" secondItem="jqH-qv-uUS" secondAttribute="centerY" multiplier="1.4" id="rpc-Bw-EIf"/>
</constraints>
</view>
</subviews>
......
Dolphins/Classes/Main/Base/BaseTabBarViewController.m
View file @ aaa5b56b
......@@ -177,7 +177,7 @@
- (void)uploadLog:(NSInteger)index{
NSArray * array = @[@"我关心的人", @"定位", @"我的"];
NSArray * array = @[@"tabbar_myconcern_person", @"tabbar_map", @"tabbar_my"];
NSMutableDictionary *dict = @{@"event": @"guazinovel", @"action": @"tab_imp", @"value": array[index]}.mutableCopy;
......
Dolphins/Info.plist
View file @ aaa5b56b
This diff is collapsed.
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