root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、变更推送为阿里云推，清除云信IM以及推送内容；

Browse Source 
2、消息页面全新改版；
3、部分微小Bug修复
This commit is contained in:
wbzhan
2019-05-24 19:21:31 +08:00
parent c586949438
commit 25c051d5f1
1544 changed files with 17136 additions and 78376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishConnectUsViewController.h
+17
View File
@@ -0,0 +1,17 @@
//
// IfishConnectUsViewController.h
// Ifish
//
// Created by wbzhan on 2019/5/23.
// Copyright © 2019 lianlian. All rights reserved.
//
#import "BaseViewController.h"
NS_ASSUME_NONNULL_BEGIN
@interface IfishConnectUsViewController : BaseViewController
@end
NS_ASSUME_NONNULL_END
Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishConnectUsViewController.m
+82
View File
@@ -0,0 +1,82 @@
//
// IfishConnectUsViewController.m
// Ifish
//
// Created by wbzhan on 2019/5/23.
// Copyright © 2019 lianlian. All rights reserved.
//
#import "IfishConnectUsViewController.h"
@interface IfishConnectUsViewController ()
Strong UIImageView *codeImage;//二维码
Strong UIButton *telBtn;
@end
@implementation IfishConnectUsViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.titleString = @"联系我们";
[self.view addSubview:self.codeImage];
[self.view addSubview:self.telBtn];
[self.codeImage mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(kSizeFrom750(128));
make.width.mas_equalTo(kSizeFrom750(578));
make.height.mas_equalTo(kSizeFrom750(770));
make.centerX.mas_equalTo(self.view);
}];
[self.telBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.centerX.mas_equalTo(self.codeImage);
make.top.mas_equalTo(self.codeImage.mas_bottom).offset(kSizeFrom750(70));
make.height.mas_equalTo(kSizeFrom750(70));
}];
// Do any additional setup after loading the view.
}
-(UIButton *)telBtn{
if (!_telBtn) {
_telBtn = InitObject(UIButton);
_telBtn.titleLabel.font = SYSTEMSIZE(34);
[_telBtn setTitle:@"服务热线：18667812003" forState:UIControlStateNormal];
[_telBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
[_telBtn addTarget:self action:@selector(telBtnClick:) forControlEvents:UIControlEventTouchUpInside];
}
return _telBtn;
}
-(UIImageView *)codeImage
{
if (!_codeImage) {
_codeImage = InitObject(UIImageView);
[_codeImage setImage:[UIImage imageNamed:@"code_wechat_us.jpeg"]];
}
return _codeImage;
}
-(void)telBtnClick:(UIButton *)sender{
NSURL *url=[NSURL URLWithString:@"tel://18667812003"];
BOOL canOpen = [[UIApplication sharedApplication] canOpenURL:url];
if (canOpen) {
if (@available(iOS 10.0, *)) {
/// 大于等于10.0系统使用此openURL方法
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
}else{
[[UIApplication sharedApplication] openURL:url];
}
}
}
/*
#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
Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m
+8 -41
View File
@@ -36,17 +36,15 @@
#import "ICSDrawerController.h"
#import "UIView+ZYDraggable.h"
#import "UIAlertView+NTESBlock.h"
#import "PushMasssageWebViewController.h"
#import "IfishUserDefaultHelper.h"
#import "UINavigationBar+Background.h"
#import "MineKanHuViewController.h"
#import "MinekanHuNotSelectShopController.h"
#import "IfishSessionViewController.h"
#import "IfishUserObsever.h"
#import "QianDaoGiftView.h"
#import "IfishGoldAndExpTostView.h"
#import "MineHeaderNewItemsCell.h"
//#import "MineHeaderNewItemsCell.h"
#import "IfishMineGoldViewController.h"
#import "IifshMineDJViewController.h"
#import "WoDeRenWuViewController.h"
@@ -57,6 +55,7 @@
#import "IfishDatabaseManager.h"
#import <UMSocialCore/UMSocialCore.h>
#import "IfishSetViewController.h"
#import "IfishConnectUsViewController.h"
@interface IfishMeViewController ()<UITableViewDelegate,UITableViewDataSource,UIAlertViewDelegate,MineHeaderItemsDelegate>
@property(nonatomic,strong)UITableView *tableView;
@end
@@ -521,17 +520,14 @@
// webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);
// [self.navigationController pushViewController:webVC animated:YES];
// self.hidesBottomBarWhenPushed = NO;
[[UIApplication sharedApplication]openURL:[NSURL URLWithString:IFISH_DEVCEITROURL]];
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:IFISH_DEVCEITROURL]];
}else if (indexPath.section == 3 && indexPath.row == 2){
//联系爱鱼奇
[self connectIfish];
//app 自用问题反馈接口已弃用， 使用云信IM
//self.hidesBottomBarWhenPushed = YES;
//SaySomethingViewController*sayVc=[[SaySomethingViewController alloc]init];
//[self.navigationController pushViewController:sayVc animated:YES];
//self.hidesBottomBarWhenPushed = NO;
//联系我们
self.hidesBottomBarWhenPushed = YES;
IfishConnectUsViewController *vc = InitObject(IfishConnectUsViewController);
[self.navigationController pushViewController:vc animated:YES];
self.hidesBottomBarWhenPushed = NO;
}else if (indexPath.section == 3 && indexPath.row == 0){
@@ -589,35 +585,6 @@
// _tableView.bounces = YES;
}
#pragma mark - 联系爱鱼奇
-(void)connectIfish{
UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
NSString *tarGetAcount = @"1";
__weak typeof(self) weakself = self;
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
if (!error) {
NSLog(@"登录成功");
//创建session
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
//创建聊天页，这个页面继承自 NIMKit 中的组件 NIMSessionViewController
weakself.hidesBottomBarWhenPushed = YES;
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
vc.targetChatname = @"爱鱼奇官方";
[weakself.navigationController pushViewController:vc animated:YES];
weakself.hidesBottomBarWhenPushed = NO;
}else{
NSLog(@"登录失败");
}
}];
}
#pragma mark - mineHeaderItemsDelegate
//等级
-(void)tapDengjiAction{
Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.h
+2 -2
View File
@@ -6,8 +6,8 @@
// Copyright © 2017年 lianlian. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface IfishSetViewController : BaseVIewContorller
@interface IfishSetViewController : BaseViewController
@end
Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m
+1 -9
View File
@@ -145,15 +145,7 @@ extern BOOL firstLogIn;
[IfishUserDefaultHelper clearUserWhenUserChange];
//首次广告
[IfishUserDefaultHelper showAdview:NO];
//云信推出登陆
[[[NIMSDK sharedSDK] loginManager] logout:^(NSError *error)
{
// extern NSString *NTESNotificationLogout;
// [[NSNotificationCenter defaultCenter] postNotificationName:NTESNotificationLogout object:nil];
}];
LogInViewController*logIn=[[LogInViewController alloc]init];
UINavigationController*nav=[[UINavigationController alloc]initWithRootViewController:logIn];
[nav.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoViewController.h
+2 -2
View File
@@ -8,8 +8,8 @@
#import <UIKit/UIKit.h>
#import "MBProgressHUD.h"
#import "BaseVIewContorller.h"
@interface InfoViewController : BaseVIewContorller<UITextViewDelegate,UITableViewDataSource,UITableViewDelegate>
#import "BaseViewController.h"
@interface InfoViewController : BaseViewController<UITextViewDelegate,UITableViewDataSource,UITableViewDelegate>
@property (weak, nonatomic) IBOutlet UITableView *infoTab;
Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoViewController.m
-51
View File
@@ -20,11 +20,7 @@
#define XINGBIECELL_TAG 12341
#define QIANMINGCELL_TAG 12342
#import "infoSureBtnCell.h"
#import "UIImage+NTES.h"
#import "NTESFileLocationHelper.h"
#import "SVProgressHUD.h"
//#import "NIMWebImageManager.h"
#import "Toast+UIView.h"
#import "IfishUserDefaultHelper.h"
@@ -56,7 +52,6 @@
self.navigationItem.title=@"我的信息";
self.view.backgroundColor = COLOR_MIAN;
self.navigationItem.titleView.backgroundColor=[UIColor redColor];
[self.navigationController.navigationBar setTitleTextAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18],NSForegroundColorAttributeName:[UIColor whiteColor]}];
@@ -703,12 +698,6 @@
[self.backImg setImage:[saveImage applyBlurWithRadius:28 tintColor:[UIColor colorWithWhite:2 alpha:0.5] saturationDeltaFactor:3.0 maskImage:nil]];
});
//传入云信sdk 头像信息
NSString*fullpath=[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"]stringByAppendingPathComponent:@"avatar.png"];
UIImage*IMImage=[[UIImage alloc]initWithContentsOfFile:fullpath];
[self uploadImagetoIM:IMImage];
//改头像加金币
[self changeUserIcon];
@@ -734,46 +723,6 @@
}
#pragma mark - 上传云信头像
-(void)uploadImagetoIM:(UIImage *)image
{
UIImage *imageForAvatarUpload = [image imageForAvatarUpload];
NSString *fileName = [NTESFileLocationHelper genFilenameWithExt:@"jpg"];
NSString *filePath = [[NTESFileLocationHelper getAppDocumentPath] stringByAppendingPathComponent:fileName];
NSData *data = UIImageJPEGRepresentation(imageForAvatarUpload, 1.0);
BOOL success = data && [data writeToFile:filePath atomically:YES];
__weak typeof(self) wself = self;
if (success) {
[SVProgressHUD show];
[[NIMSDK sharedSDK].resourceManager upload:filePath progress:nil completion:^(NSString *urlString, NSError *error) {
[SVProgressHUD dismiss];
if (!error && wself) {
[[NIMSDK sharedSDK].userManager updateMyUserInfo:@{@(NIMUserInfoUpdateTagAvatar):urlString} completion:^(NSError *error) {
if (!error) {
[[SDWebImageManager sharedManager] saveImageToCache:imageForAvatarUpload forURL:[NSURL URLWithString:urlString]];
}else{
[wself.view makeToast:@"设置IM头像失败，请重试"
];
}
}];
}else{
[wself.view makeToast:@"IM图片上传失败，请重试"
];
}
}];
}else{
[self.view makeToast:@"IM图片保存失败，请重试"
];
}
}
#pragma mark--按取消按钮调用方法
-(void)imagePickerControllerDidCancel:(UIImagePickerController *)picker{
[self dismissViewControllerAnimated:YES completion:nil];
Ifish/controllers/IfishTabControllers/我的/mineControllers/SettingResetViewController.h
+2 -2
View File
@@ -6,8 +6,8 @@
// Copyright © 2018年 lianlian. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface SettingResetViewController : BaseVIewContorller
@interface SettingResetViewController : BaseViewController
@end
Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.h
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2015年 imac. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface AboutUsViewController : BaseVIewContorller
@interface AboutUsViewController : BaseViewController
@property (weak, nonatomic) IBOutlet UILabel *versionLabel;
@property (weak, nonatomic) IBOutlet UIImageView *logoImg;
Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.h
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2015年 imac. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface ChangeMobleController : BaseVIewContorller
@interface ChangeMobleController : BaseViewController
@property (weak, nonatomic) IBOutlet UITextField *sureTextFiled;
Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeModelDoneController.h
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2015年 imac. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface ChangeModelDoneController : BaseVIewContorller
@interface ChangeModelDoneController : BaseViewController
{
BOOL _isSetVC;
}
Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeSecretCodeController.h
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2015年 imac. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface ChangeSecretCodeController : BaseVIewContorller
@interface ChangeSecretCodeController : BaseViewController
@property (weak, nonatomic) IBOutlet UITextField *oldSecretCode;
@property (weak, nonatomic) IBOutlet UITextField *secretCodeNew;
@property (weak, nonatomic) IBOutlet UITextField *repeadNewCode;
Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/DownLoadViewController.h
+2 -2
View File
@@ -6,9 +6,9 @@
// Copyright © 2015年 imac. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
@interface DownLoadViewController : BaseVIewContorller
@interface DownLoadViewController : BaseViewController
@property(nonatomic)BOOL fromsetView;
@property(nonatomic,copy)NSString*downAddress;
@property(nonatomic)BOOL ismust;