1、变更推送为阿里云推，清除云信IM以及推送内容；
2、消息页面全新改版； 3、部分微小Bug修复
This commit is contained in:
wbzhan
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface AIyuYanXuanViewController : BaseVIewContorller
|
||||
@interface AIyuYanXuanViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface FishDoctorViewController : BaseVIewContorller
|
||||
@interface FishDoctorViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,9 +6,9 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface CoastRecordViewController : BaseVIewContorller
|
||||
@interface CoastRecordViewController : BaseViewController
|
||||
|
||||
@property (nonatomic) BOOL fromDetailVC;
|
||||
|
||||
|
||||
+2
-2
@@ -6,9 +6,9 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "DiscountCoupon.h"
|
||||
@interface IfishGoldCoastDetailViewController : BaseVIewContorller
|
||||
@interface IfishGoldCoastDetailViewController : BaseViewController
|
||||
@property(nonatomic,strong) DiscountCoupon *convert;
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface IfishGoldCoastViewController : BaseVIewContorller
|
||||
@interface IfishGoldCoastViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#import "CertificationShopModel.h"
|
||||
#import "ShopCertifyStausModel.h"
|
||||
#import "IfishKanHuServiceViewController.h"
|
||||
#import "WorkbechViewController.h"
|
||||
#import "MineKanHuViewController.h"
|
||||
//#import "IfishKanKanListViewController.h"
|
||||
#import "LoveFishLiveListBaseViewController.h"
|
||||
|
||||
+2
-2
@@ -6,12 +6,12 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
/*
|
||||
*老界面已废弃
|
||||
*/
|
||||
|
||||
@interface IfishKanKanListViewController : BaseVIewContorller
|
||||
@interface IfishKanKanListViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "ShopKanHuP2PViewController.h"
|
||||
#import "IfishKankanListModel.h"
|
||||
#import "P2PShareViewBootomView.h"
|
||||
|
||||
-30
@@ -8,7 +8,6 @@
|
||||
|
||||
#import "IfishP2PLivePlayViewController.h"
|
||||
#import "IfishP2PVideoPlayView.h"
|
||||
#import "IfishSessionViewController.h"
|
||||
|
||||
@interface IfishP2PLivePlayViewController ()<P2PShareViewBootomViewDelegate>
|
||||
|
||||
@@ -118,35 +117,6 @@
|
||||
//聊天
|
||||
-(void)chatBtnClickAction
|
||||
{
|
||||
UserModel*model=[dataContorl getUserInfo];
|
||||
|
||||
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
|
||||
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",self.listRoomInfo.userId];
|
||||
if ([myAcount isEqualToString:tarGetAcount]) {
|
||||
|
||||
[self.view makeToast:@"不能和自己聊天哦"];
|
||||
return;
|
||||
}
|
||||
|
||||
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
|
||||
if (!error) {
|
||||
NSLog(@"登录成功");
|
||||
//创建session
|
||||
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
|
||||
//创建聊天页，这个页面继承自 NIMKit 中的组件 NIMSessionViewController
|
||||
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
|
||||
//vc.targetChatname = listmodel.nickName;
|
||||
[self stopP2PPlayingGLViewVideo];
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
|
||||
|
||||
}else{
|
||||
NSLog(@"登录失败");
|
||||
}
|
||||
}];
|
||||
|
||||
}
|
||||
|
||||
|
||||
+2
-4
@@ -11,14 +11,12 @@
|
||||
@interface P2PShareView1Cell : UITableViewCell
|
||||
@property (weak, nonatomic) IBOutlet UIImageView *roomOwnerImg;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIButton *chatBtn;
|
||||
|
||||
-(void)loaDataWith:(IfishKankanListModel*)model;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UILabel *roomUserName;
|
||||
@property (weak, nonatomic) IBOutlet UIImageView *renzhengImg;
|
||||
@property (weak, nonatomic) IBOutlet UIButton *zanBtn;
|
||||
@property (weak, nonatomic) IBOutlet UIButton *daShangBtn;
|
||||
Strong UIButton *zanBtn;
|
||||
Strong UIButton *daShangBtn;
|
||||
@property (weak, nonatomic) IBOutlet UILabel *levelLabel;
|
||||
|
||||
@end
|
||||
|
||||
+29
-2
@@ -13,11 +13,38 @@
|
||||
- (void)awakeFromNib {
|
||||
[super awakeFromNib];
|
||||
// Initialization code
|
||||
self.chatBtn.layer.masksToBounds = YES;
|
||||
self.chatBtn.layer.cornerRadius = 5;
|
||||
[self.contentView addSubview:self.zanBtn];
|
||||
[self.contentView addSubview:self.daShangBtn];
|
||||
|
||||
[self.zanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.mas_equalTo(self.roomOwnerImg);
|
||||
make.width.mas_equalTo(68);
|
||||
make.height.mas_equalTo(27);
|
||||
make.right.mas_equalTo(self.contentView).offset(-18);
|
||||
}];
|
||||
[self.daShangBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.bottom.mas_equalTo(self.roomOwnerImg);
|
||||
make.width.mas_equalTo(68);
|
||||
make.height.mas_equalTo(27);
|
||||
make.right.mas_equalTo(self.contentView).offset(-18);
|
||||
}];
|
||||
self.roomOwnerImg.layer.masksToBounds = YES;
|
||||
self.roomOwnerImg.layer.cornerRadius = 2;
|
||||
}
|
||||
-(UIButton *)zanBtn{
|
||||
if (!_zanBtn) {
|
||||
_zanBtn = InitObject(UIButton);
|
||||
[_zanBtn setBackgroundImage:IMAGEBYENAME(@"live_botton_like") forState:UIControlStateNormal];
|
||||
}
|
||||
return _zanBtn;
|
||||
}
|
||||
-(UIButton *)daShangBtn{
|
||||
if (!_daShangBtn) {
|
||||
_daShangBtn = InitObject(UIButton);
|
||||
[_daShangBtn setBackgroundImage:IMAGEBYENAME(@"live_botton_exceptional") forState:UIControlStateNormal];
|
||||
}
|
||||
return _daShangBtn;
|
||||
}
|
||||
-(void)loaDataWith:(IfishKankanListModel*)model
|
||||
{
|
||||
|
||||
|
||||
+16
-56
@@ -1,12 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina5_5" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
|
||||
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
@@ -16,11 +15,11 @@
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
|
||||
<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="84"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="83.666666666666671"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="k8y-Xx-OXi">
|
||||
<rect key="frame" x="15" y="11" width="60" height="60"/>
|
||||
<rect key="frame" x="15" y="12" width="60" height="60"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="60" id="ia0-G0-X1J"/>
|
||||
<constraint firstAttribute="width" constant="60" id="lRy-w4-dhc"/>
|
||||
@@ -32,42 +31,14 @@
|
||||
<color key="backgroundColor" red="0.9137254901960784" green="0.9137254901960784" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
|
||||
</view>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_label_v.png" translatesAutoresizingMaskIntoConstraints="NO" id="hTM-h8-mp0">
|
||||
<rect key="frame" x="56" y="55" width="19" height="16"/>
|
||||
<rect key="frame" x="56" y="56" width="19" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="19" id="PTp-XD-dcN"/>
|
||||
<constraint firstAttribute="height" constant="16" id="zVK-Pt-hRL"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e3s-Oh-KIo">
|
||||
<rect key="frame" x="83" y="18" width="43" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="16" id="Z4Q-L2-TZQ"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HtB-76-hbb">
|
||||
<rect key="frame" x="83" y="44" width="68" height="27"/>
|
||||
<color key="backgroundColor" red="0.1215686275" green="0.66274509800000003" blue="0.91372549020000005" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="27" id="lNO-kf-uSj"/>
|
||||
<constraint firstAttribute="width" constant="68" id="w9c-ZE-aLF"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="15"/>
|
||||
<inset key="imageEdgeInsets" minX="-10" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<state key="normal" title="私聊" image="live_sharechat_iocn.png"/>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3IN-fl-Exf">
|
||||
<rect key="frame" x="244" y="44" width="68" height="27"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="68" id="dju-Wj-8Dv"/>
|
||||
<constraint firstAttribute="height" constant="27" id="eKn-Mh-R6q"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="live_botton_exceptional.png"/>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" preservesSuperviewLayoutMargins="YES" text="等级" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zHc-Gp-EDS">
|
||||
<rect key="frame" x="140" y="18" width="29" height="16"/>
|
||||
<rect key="frame" x="146" y="34" width="29" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="16" id="Pli-e0-Tht"/>
|
||||
</constraints>
|
||||
@@ -75,48 +46,37 @@
|
||||
<color key="textColor" red="0.98823529409999999" green="0.85098039219999999" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ORC-xS-F3u">
|
||||
<rect key="frame" x="168" y="44" width="68" height="27"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e3s-Oh-KIo">
|
||||
<rect key="frame" x="83" y="34" width="43" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="27" id="6Fv-N5-fAE"/>
|
||||
<constraint firstAttribute="width" constant="68" id="qPo-iu-BbX"/>
|
||||
<constraint firstAttribute="height" constant="16" id="Z4Q-L2-TZQ"/>
|
||||
</constraints>
|
||||
<state key="normal" backgroundImage="live_botton_like.png"/>
|
||||
</button>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="ORC-xS-F3u" firstAttribute="centerY" secondItem="HtB-76-hbb" secondAttribute="centerY" id="6E1-oC-2ct"/>
|
||||
<constraint firstItem="3IN-fl-Exf" firstAttribute="leading" secondItem="ORC-xS-F3u" secondAttribute="trailing" constant="8" id="CY3-c2-fFQ"/>
|
||||
<constraint firstItem="hTM-h8-mp0" firstAttribute="bottom" secondItem="k8y-Xx-OXi" secondAttribute="bottom" id="DH5-zy-27r"/>
|
||||
<constraint firstAttribute="trailingMargin" secondItem="3IN-fl-Exf" secondAttribute="trailing" id="FXx-MM-eBm"/>
|
||||
<constraint firstItem="zHc-Gp-EDS" firstAttribute="leading" secondItem="e3s-Oh-KIo" secondAttribute="trailing" constant="14" id="IVp-QS-6qi"/>
|
||||
<constraint firstItem="zHc-Gp-EDS" firstAttribute="leading" secondItem="e3s-Oh-KIo" secondAttribute="trailing" constant="20" id="IVp-QS-6qi"/>
|
||||
<constraint firstItem="k8y-Xx-OXi" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="LFn-aL-yDR"/>
|
||||
<constraint firstItem="k8y-Xx-OXi" firstAttribute="top" secondItem="e3s-Oh-KIo" secondAttribute="bottom" constant="-23" id="MyI-IA-fou"/>
|
||||
<constraint firstItem="3IN-fl-Exf" firstAttribute="centerY" secondItem="ORC-xS-F3u" secondAttribute="centerY" id="S0b-cS-qTp"/>
|
||||
<constraint firstItem="k8y-Xx-OXi" firstAttribute="top" secondItem="e3s-Oh-KIo" secondAttribute="bottom" constant="-38" id="MyI-IA-fou"/>
|
||||
<constraint firstItem="hTM-h8-mp0" firstAttribute="trailing" secondItem="k8y-Xx-OXi" secondAttribute="trailing" id="Ttp-DS-CKm"/>
|
||||
<constraint firstItem="e3s-Oh-KIo" firstAttribute="leading" secondItem="k8y-Xx-OXi" secondAttribute="trailing" constant="8" id="bXf-Sl-SZE"/>
|
||||
<constraint firstItem="HtB-76-hbb" firstAttribute="bottom" secondItem="k8y-Xx-OXi" secondAttribute="bottom" id="fs5-1W-87x"/>
|
||||
<constraint firstItem="zHc-Gp-EDS" firstAttribute="centerY" secondItem="e3s-Oh-KIo" secondAttribute="centerY" id="g9I-9i-yuV"/>
|
||||
<constraint firstItem="HtB-76-hbb" firstAttribute="leading" secondItem="k8y-Xx-OXi" secondAttribute="trailing" constant="8" id="pwz-La-yK7"/>
|
||||
<constraint firstItem="k8y-Xx-OXi" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="zgc-ug-DJe"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="chatBtn" destination="HtB-76-hbb" id="1Ie-GO-awa"/>
|
||||
<outlet property="daShangBtn" destination="3IN-fl-Exf" id="BJe-gm-Fvk"/>
|
||||
<outlet property="levelLabel" destination="zHc-Gp-EDS" id="Qu6-wi-k2r"/>
|
||||
<outlet property="renzhengImg" destination="hTM-h8-mp0" id="b0f-Ko-L34"/>
|
||||
<outlet property="roomOwnerImg" destination="k8y-Xx-OXi" id="seT-cP-K9d"/>
|
||||
<outlet property="roomUserName" destination="e3s-Oh-KIo" id="iVQ-ni-gdk"/>
|
||||
<outlet property="zanBtn" destination="ORC-xS-F3u" id="nPp-Ty-U2s"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-147" y="49"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="live_botton_exceptional.png" width="57" height="22"/>
|
||||
<image name="live_botton_like.png" width="57" height="22"/>
|
||||
<image name="live_label_v.png" width="19" height="15"/>
|
||||
<image name="live_sharechat_iocn.png" width="11" height="11"/>
|
||||
<image name="live_label_v.png" width="19" height="15.666666984558105"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
||||
-1
@@ -18,7 +18,6 @@
|
||||
#import "IfishCommentEditeView.h"
|
||||
@protocol P2PShareViewBootomViewDelegate <NSObject>
|
||||
@optional
|
||||
-(void)chatBtnClickAction;
|
||||
-(void)daShangSuccsess;
|
||||
|
||||
@end
|
||||
|
||||
-7
@@ -188,7 +188,6 @@
|
||||
[cell loaDataWith:self.roomModel];
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
//cell.backgroundColor = TABLE_BACKGROUD_COLOR;
|
||||
[cell.chatBtn addTarget:self action:@selector(chatBtnAction) forControlEvents:UIControlEventTouchUpInside];
|
||||
[cell.zanBtn addTarget:self action:@selector(zanBtnClick:) forControlEvents:UIControlEventTouchUpInside];
|
||||
[cell.daShangBtn addTarget:self action:@selector(daShangBtnClick:) forControlEvents:UIControlEventTouchUpInside];
|
||||
|
||||
@@ -358,12 +357,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark-chatBtnAction
|
||||
-(void)chatBtnAction{
|
||||
|
||||
[self.delegate chatBtnClickAction];
|
||||
|
||||
}
|
||||
|
||||
#pragma mark Configure Cell Data
|
||||
- (void)configureCell:(P2PShareViewFeedMessageCell *)cell atIndexPath:(NSIndexPath *)indexPath {
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface LoveFishLiveListBaseViewController : BaseVIewContorller
|
||||
@interface LoveFishLiveListBaseViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface MineKankanEditViewController : BaseVIewContorller
|
||||
@interface MineKankanEditViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,9 +6,9 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface WoDeKanKanViewController : BaseVIewContorller
|
||||
@interface WoDeKanKanViewController : BaseViewController
|
||||
|
||||
|
||||
|
||||
|
||||
-29
@@ -20,7 +20,6 @@
|
||||
#define CELLTAGATINDEX 9990111
|
||||
#import "ChinaPlckerView.h"
|
||||
#import "KebordExternAddTextInputView.h"
|
||||
#import "IfishSessionViewController.h"
|
||||
@interface MemberDetailViewController ()<UITableViewDelegate,UITableViewDataSource,MBProgressHUDDelegate,ChinaPlckerViewDelegate,UIActionSheetDelegate>
|
||||
@property (nonatomic,strong) UITableView *tableView;
|
||||
@property (nonatomic,strong) ShopUserDatailData *userInfo;
|
||||
@@ -319,34 +318,6 @@
|
||||
#pragma mark - chatBtnClick和会员聊天
|
||||
-(void)chatBtnClick{
|
||||
|
||||
|
||||
UserModel*model=[dataContorl getUserInfo];
|
||||
|
||||
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
|
||||
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",self.userInfo.userId];
|
||||
if ([myAcount isEqualToString:tarGetAcount]) {
|
||||
|
||||
[self.view makeToast:@"不能和自己聊天哦"];
|
||||
return;
|
||||
}
|
||||
|
||||
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
|
||||
if (!error) {
|
||||
NSLog(@"登录成功");
|
||||
//创建session
|
||||
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
|
||||
//创建聊天页，这个页面继承自 NIMKit 中的组件 NIMSessionViewController
|
||||
|
||||
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
|
||||
//导航颜色
|
||||
vc.navState = 1;
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
|
||||
}else{
|
||||
NSLog(@"登录失败");
|
||||
}
|
||||
}];
|
||||
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
//
|
||||
|
||||
#import "WhiteNavBaseViewController.h"
|
||||
//同老版看护工作台 WorkbechViewController
|
||||
#import "CertificationShopModel.h"
|
||||
@interface IfishKanHuGuanLiViewController : WhiteNavBaseViewController
|
||||
@property(nonatomic,strong) CertificationShopModel *shopsInfo;
|
||||
|
||||
-28
@@ -9,8 +9,6 @@
|
||||
#import "IfishKanHuGuanLiViewController.h"
|
||||
#import "JHRefresh.h"
|
||||
#import "ShopKanHuP2PViewController.h"
|
||||
#import "NIMKit.h"
|
||||
#import "IfishSessionViewController.h"
|
||||
#import "KanHuGuanLi1ViewCell.h"
|
||||
#import "KanHuGuanLiPictureViewCell.h"
|
||||
|
||||
@@ -331,32 +329,6 @@
|
||||
|
||||
-(void)chatBtnAction:(UIButton *)btn{
|
||||
|
||||
KanHuListModel *listmodel = self.kanHuListArr[btn.tag];
|
||||
|
||||
UserModel*model=[dataContorl getUserInfo];
|
||||
|
||||
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
|
||||
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",listmodel.userId];
|
||||
|
||||
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
|
||||
if (!error) {
|
||||
NSLog(@"登录成功");
|
||||
//创建session
|
||||
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
|
||||
//创建聊天页，这个页面继承自 NIMKit 中的组件 NIMSessionViewController
|
||||
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
|
||||
//vc.targetChatname = listmodel.nickName;
|
||||
vc.navState = 1;
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
|
||||
|
||||
}else{
|
||||
NSLog(@"登录失败");
|
||||
}
|
||||
}];
|
||||
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -6,7 +6,7 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "ShopCertifyStausModel.h"
|
||||
typedef NS_ENUM(NSInteger, ShopCerProgressType){
|
||||
ShopCerProgressTypeStart = 0,
|
||||
@@ -14,7 +14,7 @@ typedef NS_ENUM(NSInteger, ShopCerProgressType){
|
||||
ShopCerProgressTypeDone = 2
|
||||
|
||||
};
|
||||
@interface IfishShopCerNewViewController : BaseVIewContorller
|
||||
@interface IfishShopCerNewViewController : BaseViewController
|
||||
|
||||
@property(nonatomic) ShopCerProgressType cerProgressType;
|
||||
@property (nonatomic,strong) ShopCertifyStausModel *statusM;
|
||||
|
||||
-2
@@ -17,7 +17,6 @@
|
||||
#import "IfishShopDetailViewController.h"
|
||||
#import "ShopEditViewController.h"
|
||||
#import "IfishShopEditeNewViewController.h"
|
||||
#import "WorkbechViewController.h"
|
||||
#import "IfishKanHuGuanLiViewController.h"
|
||||
#import "ShopCertificationIntroduceController.h"
|
||||
#import "MemberManageViewController.h"
|
||||
@@ -279,7 +278,6 @@
|
||||
[self.view makeToast:@"此商户已被禁用"];
|
||||
return;
|
||||
}
|
||||
// WorkbechViewController *workVC=[[WorkbechViewController alloc] init];
|
||||
IfishKanHuGuanLiViewController *workVC = [[IfishKanHuGuanLiViewController alloc] init];
|
||||
workVC.shopsInfo = self.ShopsInfo;
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface IfishUsersActivityListController : BaseVIewContorller
|
||||
@interface IfishUsersActivityListController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface IfishKanHuServiceViewController : BaseVIewContorller
|
||||
@interface IfishKanHuServiceViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,10 +6,10 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "IfishShopInfo.h"
|
||||
|
||||
@interface IfishShopDetailViewController : BaseVIewContorller
|
||||
@interface IfishShopDetailViewController : BaseViewController
|
||||
@property (nonatomic,strong) IfishShopInfo *shopInfo;
|
||||
|
||||
@end
|
||||
|
||||
-27
@@ -10,7 +10,6 @@
|
||||
#import "ShopDetailViewfirstCell.h"
|
||||
#import "ShopDetailThredViewCell.h"
|
||||
#import "ShopDetailCodeFirstCell.h"
|
||||
#import "IfishSessionViewController.h"
|
||||
#import "MineKanHuViewController.h"
|
||||
#import "GoNetShopViewCell.h"
|
||||
#import "ShopInfosViewCell.h"
|
||||
@@ -312,32 +311,6 @@
|
||||
-(void)ziXunBtnAction
|
||||
{
|
||||
|
||||
UserModel*model=[dataContorl getUserInfo];
|
||||
|
||||
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
|
||||
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",self.shopInfo.userId];
|
||||
if ([myAcount isEqualToString:tarGetAcount]) {
|
||||
|
||||
[self.view makeToast:@"不能和自己聊天哦"];
|
||||
return;
|
||||
}
|
||||
|
||||
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
|
||||
if (!error) {
|
||||
NSLog(@"登录成功");
|
||||
//创建session
|
||||
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
|
||||
//创建聊天页，这个页面继承自 NIMKit 中的组件 NIMSessionViewController
|
||||
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
|
||||
}else{
|
||||
NSLog(@"登录失败");
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - 看护action
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface KanHuFuWuViewController : BaseVIewContorller
|
||||
@interface KanHuFuWuViewController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "CertificationShopModel.h"
|
||||
@interface MineKanHuViewController : BaseVIewContorller
|
||||
@interface MineKanHuViewController : BaseViewController
|
||||
|
||||
@property (nonatomic,strong) CertificationShopModel *xinXiModel;
|
||||
|
||||
|
||||
+12
-51
@@ -17,13 +17,7 @@
|
||||
#import "IfishCameraModel.h"
|
||||
#define CELL_KANHURAG1 555
|
||||
#import "UIImageView+WebCache.h"
|
||||
#import "NIMKit.h"
|
||||
|
||||
//自定义
|
||||
|
||||
#import "IfishSessionViewController.h"
|
||||
//抽离demo
|
||||
#import "NIMSessionViewController.h"
|
||||
|
||||
@interface MineKanHuViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,UIActionSheetDelegate>
|
||||
@property(nonatomic,strong) UITableView *tableView;
|
||||
@@ -70,15 +64,14 @@
|
||||
|
||||
-(void)initUI{
|
||||
|
||||
//self.rightItem = [[UIBarButtonItem alloc] initWithTitle:@"管理" style:UIBarButtonItemStylePlain target:self action:@selector(guanliActon)];
|
||||
UIBarButtonItem*rightItem= [[UIBarButtonItem alloc] initWithTitle:@"管理" style:UIBarButtonItemStyleDone target:self action:@selector(guanliActon)];
|
||||
|
||||
self.navigationItem.rightBarButtonItem= rightItem;
|
||||
self.navigationItem.rightBarButtonItem.tintColor = [UIColor whiteColor];
|
||||
|
||||
CGFloat BtnH = self.view.frame.size.width * 0.12;
|
||||
CGFloat BtnH = 50;
|
||||
self.tableView = [[UITableView alloc] init ];
|
||||
self.tableView.frame =CGRectMake(0,0, self.view.frame.size.width,self.view.frame.size.height - BtnH);
|
||||
|
||||
self.tableView.delegate = self;
|
||||
self.tableView.dataSource = self;
|
||||
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
||||
@@ -86,6 +79,11 @@
|
||||
self.tableView.backgroundColor = TABLE_BACKGROUD_COLOR;
|
||||
[self.view addSubview:self.tableView];
|
||||
|
||||
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.left.width.mas_equalTo(self.view);
|
||||
make.bottom.mas_equalTo(-BtnH);
|
||||
}];
|
||||
|
||||
NSString *str= @" 打给TA";
|
||||
NSMutableAttributedString *attri = [[NSMutableAttributedString alloc] initWithString:str];
|
||||
NSTextAttachment *attch = [[NSTextAttachment alloc] init];
|
||||
@@ -95,7 +93,7 @@
|
||||
[attri insertAttributedString:attristr atIndex:0];
|
||||
UIButton *tel =[UIButton buttonWithType:UIButtonTypeCustom];
|
||||
[tel setAttributedTitle:attri forState:UIControlStateNormal];
|
||||
tel.frame = CGRectMake(0,CGRectGetMaxY(self.tableView.frame),self.view.frame.size.width/2, BtnH);
|
||||
tel.frame = CGRectMake(0,CGRectGetMaxY(self.tableView.frame),self.view.frame.size.width, BtnH);
|
||||
tel.backgroundColor = RGB(0, 180,239);
|
||||
[attri addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0,str.length+1)];
|
||||
[attri addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:15] range:NSMakeRange(0,str.length+1)];
|
||||
@@ -103,22 +101,10 @@
|
||||
|
||||
[self.view addSubview:tel];
|
||||
|
||||
NSString *str2= @" 咨询TA";
|
||||
NSMutableAttributedString *attri2 = [[NSMutableAttributedString alloc] initWithString:str2];
|
||||
NSTextAttachment *attch2 = [[NSTextAttachment alloc] init];
|
||||
attch2.image = [UIImage imageNamed:@"businesslistings_comments"];
|
||||
attch2.bounds = CGRectMake(0,-4,17,16);;//35*33
|
||||
NSAttributedString *attristr2=[NSAttributedString attributedStringWithAttachment:attch2];
|
||||
[attri2 insertAttributedString:attristr2 atIndex:0];
|
||||
UIButton *zixunbtn =[UIButton buttonWithType:UIButtonTypeCustom];
|
||||
[zixunbtn setAttributedTitle:attri2 forState:UIControlStateNormal];
|
||||
zixunbtn.frame = CGRectMake(CGRectGetMaxX(tel.frame),CGRectGetMinY(tel.frame), self.view.frame.size.width/2, BtnH);
|
||||
zixunbtn.backgroundColor = RGB(255, 115, 92);
|
||||
[attri2 addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0,str2.length+1)];
|
||||
[attri2 addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:15] range:NSMakeRange(0,str2.length+1)];
|
||||
[zixunbtn addTarget:self action:@selector(chatBtnAction:) forControlEvents:UIControlEventTouchUpInside];
|
||||
[self.view addSubview:zixunbtn];
|
||||
|
||||
[tel mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.mas_equalTo(self.tableView.mas_bottom);
|
||||
make.left.width.bottom.mas_equalTo(self.view);
|
||||
}];
|
||||
|
||||
}
|
||||
|
||||
@@ -518,32 +504,7 @@
|
||||
|
||||
-(void)chatBtnAction:(UIButton *)btn{
|
||||
|
||||
UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
|
||||
|
||||
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
|
||||
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",self.xinXiModel.userId];
|
||||
|
||||
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
|
||||
if (!error) {
|
||||
|
||||
NSLog(@"登录成功");
|
||||
//创建session
|
||||
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
|
||||
//创建聊天页，这个页面继承自 NIMKit 中的组件 NIMSessionViewController
|
||||
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
|
||||
//vc.targetChatname = self.xinXiModel.userName;
|
||||
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
// NIMSessionViewController *vc = [[NIMSessionViewController alloc] initWithSession:session];
|
||||
// [self.navigationController pushViewController:vc animated:YES];
|
||||
|
||||
}else{
|
||||
NSLog(@"登录失败");
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - guanliActon
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2017年 lianlian. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface MinekanHuNotSelectShopController : BaseVIewContorller
|
||||
@interface MinekanHuNotSelectShopController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+2
-2
@@ -6,12 +6,12 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "KanHuBaoGaoModel.h"
|
||||
#import "KanHuListModel.h"
|
||||
|
||||
|
||||
@interface LookAfterReportViewController : BaseVIewContorller
|
||||
@interface LookAfterReportViewController : BaseViewController
|
||||
@property (nonatomic,strong) KanHuBaoGaoModel *baGaoMod;
|
||||
@property (nonatomic,strong) KanHuListModel *listModel;
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "CertificationShopModel.h"
|
||||
@interface ShopEditViewController : BaseVIewContorller
|
||||
@interface ShopEditViewController : BaseViewController
|
||||
|
||||
@property(nonatomic,strong) CertificationShopModel *shopInfo;
|
||||
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@
|
||||
|
||||
#import "KanHuBaoGaoView.h"
|
||||
|
||||
@interface ShopKanHuP2PViewController : BaseVIewContorller <AVCaptureVideoDataOutputSampleBufferDelegate, UIGestureRecognizerDelegate,
|
||||
@interface ShopKanHuP2PViewController : BaseViewController <AVCaptureVideoDataOutputSampleBufferDelegate, UIGestureRecognizerDelegate,
|
||||
TouchButtonDelegate,
|
||||
OpenGLViewDelegate,
|
||||
UIScrollViewDelegate,
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
//
|
||||
// WorkbechViewController.h
|
||||
// ；
|
||||
//
|
||||
// Created by imac on 16/8/24.
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "CertificationShopModel.h"
|
||||
@interface WorkbechViewController : BaseVIewContorller
|
||||
|
||||
@property(nonatomic,strong) CertificationShopModel *shopsInfo;
|
||||
|
||||
@end
|
||||
@@ -1,486 +0,0 @@
|
||||
//
|
||||
// WorkbechViewController.m
|
||||
// Ifish
|
||||
//
|
||||
// Created by imac on 16/8/24.
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "WorkbechViewController.h"
|
||||
#import "KanHuWorkViewFirstCell.h"
|
||||
#import "KanHuWorkViewSecondCell.h"
|
||||
#import "KanHuWorkHeaderViewCell.h"
|
||||
#import "ShopEditViewController.h"
|
||||
#import "KanHuListModel.h"
|
||||
#import "shopNoCumtomerViewCell.h"
|
||||
#import "JHRefresh.h"
|
||||
#import "ShopKanHuP2PViewController.h"
|
||||
#import "KanHuViewLastCell.h"
|
||||
#import "NIMKit.h"
|
||||
#import "IfishSessionViewController.h"
|
||||
@interface WorkbechViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
|
||||
{
|
||||
BOOL _isRefreshing;
|
||||
BOOL _isLoadMore;
|
||||
NSIndexPath * _chatSelectIndex;
|
||||
}
|
||||
@property(nonatomic,strong)UITableView *tableView;
|
||||
|
||||
@property(nonatomic,strong) NSArray *myCameraArr;
|
||||
|
||||
@property(nonatomic,copy) NSString* total;
|
||||
|
||||
@property(nonatomic,strong) NSMutableArray *kanHuListArr;
|
||||
|
||||
@property(nonatomic)BOOL isRefreshing;
|
||||
|
||||
@property(nonatomic)BOOL isLoadMore;
|
||||
@property(nonatomic) int page;
|
||||
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@implementation WorkbechViewController
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
// Do any additional setup after loading the view.
|
||||
self.kanHuListArr = [[NSMutableArray alloc] init];
|
||||
//self.title = @"看护工作台";
|
||||
[self addTitleViewWithTitle:@"看护工作台"];
|
||||
[self setUI];
|
||||
[self creatReatRefreshView];
|
||||
[self getKanHuList];
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
-(void)viewWillAppear:(BOOL)animated{
|
||||
|
||||
self.shopsInfo = [[DataCenter defaultDtacenter] valueForKeyPath:@"ShopsInfo"];
|
||||
[self.tableView reloadData];
|
||||
|
||||
|
||||
}
|
||||
//重写返回事件 此界面 可能认证成功进入(老版本入口在主页新版不需要)
|
||||
|
||||
-(void)goBackAction{
|
||||
|
||||
[self.navigationController popToRootViewControllerAnimated:YES];
|
||||
}
|
||||
|
||||
- (void)didReceiveMemoryWarning {
|
||||
[super didReceiveMemoryWarning];
|
||||
// Dispose of any resources that can be recreated.
|
||||
}
|
||||
|
||||
-(void)setUI{
|
||||
|
||||
self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStylePlain];
|
||||
self.tableView.delegate = self;
|
||||
self.tableView.dataSource = self;
|
||||
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
|
||||
self.tableView.showsVerticalScrollIndicator = NO;
|
||||
self.tableView.backgroundColor = TABLE_BACKGROUD_COLOR;
|
||||
[self.view addSubview:self.tableView];
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
|
||||
|
||||
if (self.kanHuListArr.count!=0) {
|
||||
|
||||
return 2 + self.kanHuListArr.count + 1;
|
||||
}
|
||||
|
||||
return 3;
|
||||
|
||||
}
|
||||
|
||||
-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||
|
||||
if (indexPath.row == 0) {
|
||||
|
||||
KanHuWorkViewFirstCell *cell = [tableView dequeueReusableCellWithIdentifier:@"KanHuWorkViewFirstCell"];
|
||||
if (!cell) {
|
||||
cell = [[[NSBundle mainBundle]loadNibNamed:@"KanHuWorkViewFirstCell" owner:self options:nil]lastObject];
|
||||
|
||||
}
|
||||
|
||||
[cell.bianJIBtn addTarget:self action:@selector(bianJiBtnAction:) forControlEvents:UIControlEventTouchUpInside];
|
||||
|
||||
|
||||
[cell cellsetshopsInfoWith:self.shopsInfo];
|
||||
|
||||
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
return cell;
|
||||
|
||||
|
||||
}else if (indexPath.row == 1){
|
||||
|
||||
|
||||
KanHuWorkHeaderViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"KanHuWorkHeaderViewCell"];
|
||||
if (!cell) {
|
||||
cell = [[[NSBundle mainBundle]loadNibNamed:@"KanHuWorkHeaderViewCell" owner:self options:nil]lastObject];
|
||||
|
||||
|
||||
}
|
||||
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
|
||||
return cell;
|
||||
|
||||
|
||||
}else{
|
||||
|
||||
|
||||
if (self.kanHuListArr.count!=0) {
|
||||
|
||||
|
||||
if (indexPath.row == self.kanHuListArr.count + 1 + 1) {
|
||||
//最后一个cellKanHuViewLastCell
|
||||
|
||||
KanHuViewLastCell *cell = [tableView dequeueReusableCellWithIdentifier:@"KanHuViewLastCell"];
|
||||
if (!cell) {
|
||||
cell = [[[NSBundle mainBundle]loadNibNamed:@"KanHuViewLastCell" owner:self options:nil]lastObject];
|
||||
|
||||
}
|
||||
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
|
||||
return cell;
|
||||
|
||||
}else{
|
||||
|
||||
|
||||
KanHuWorkViewSecondCell *cell = [tableView dequeueReusableCellWithIdentifier:@"KanHuWorkViewSecondCell"];
|
||||
if (!cell) {
|
||||
cell = [[[NSBundle mainBundle]loadNibNamed:@"KanHuWorkViewSecondCell" owner:self options:nil]lastObject];
|
||||
|
||||
}
|
||||
|
||||
KanHuListModel *kanHuCamera= self.kanHuListArr[indexPath.row - 2];
|
||||
|
||||
NSString *filePath = [Utils getHeaderFilePathWithId:kanHuCamera.cameraId];
|
||||
UIImage *headImg = [UIImage imageWithContentsOfFile:filePath];
|
||||
if(headImg==nil){
|
||||
cell.CameraHoldImg.image = LXImageWithImageName(@"ic_header.png");
|
||||
|
||||
}else{
|
||||
cell.CameraHoldImg.image = headImg;
|
||||
|
||||
}
|
||||
|
||||
cell.guKeMing.text = kanHuCamera.nickName;
|
||||
|
||||
//cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
|
||||
[cell.chatBtn addTarget:self action:@selector(chatBtnAction:) forControlEvents:UIControlEventTouchUpInside];
|
||||
|
||||
cell.chatBtn.tag = indexPath.row;
|
||||
|
||||
|
||||
|
||||
return cell;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}else{
|
||||
|
||||
shopNoCumtomerViewCell *customerNoneCell = [tableView dequeueReusableCellWithIdentifier:@"shopNoCumtomerViewCell"];
|
||||
|
||||
if (!customerNoneCell) {
|
||||
customerNoneCell = [[[NSBundle mainBundle]loadNibNamed:@"shopNoCumtomerViewCell" owner:self options:nil]lastObject];
|
||||
|
||||
}
|
||||
|
||||
[customerNoneCell cellSetnoGuKeBackViewCorner];
|
||||
customerNoneCell.userInteractionEnabled = NO;
|
||||
|
||||
return customerNoneCell;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||
|
||||
|
||||
|
||||
if (indexPath.row ==0) {
|
||||
|
||||
return 175;
|
||||
|
||||
}else if (indexPath.row ==1){
|
||||
|
||||
return 61;
|
||||
|
||||
}else if (indexPath.row == self.kanHuListArr.count + 1 + 1){
|
||||
|
||||
// return kScreenSize.width/320 * 212;
|
||||
return 48;
|
||||
}else{
|
||||
|
||||
return 280;
|
||||
}
|
||||
|
||||
//return UITableViewAutomaticDimension;
|
||||
|
||||
}
|
||||
|
||||
//- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
|
||||
//
|
||||
// return 0;
|
||||
//}
|
||||
//- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
|
||||
//
|
||||
// return 0;
|
||||
//}
|
||||
//
|
||||
//- (CGFloat)tableView:(UITableView *)tableView estimatedHeightForRowAtIndexPath:(NSIndexPath *)indexPath
|
||||
//{
|
||||
// return UITableViewAutomaticDimension;
|
||||
//
|
||||
//}
|
||||
|
||||
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
|
||||
|
||||
[tableView deselectRowAtIndexPath:indexPath animated:YES];
|
||||
|
||||
if (indexPath.row ==0 || indexPath.row == 1) {
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (self.kanHuListArr.count == 0) {
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
//最后一个空cell return掉
|
||||
if (indexPath.row == self.kanHuListArr.count + 1 + 1 ) {
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
KanHuListModel *kanHuCamera= self.kanHuListArr[indexPath.row - 2];
|
||||
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
|
||||
ShopKanHuP2PViewController *shopP2pVC=[[ShopKanHuP2PViewController alloc]init];
|
||||
|
||||
shopP2pVC.kanHuCamera = kanHuCamera;
|
||||
|
||||
[self.navigationController pushViewController:shopP2pVC animated:YES];
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
#pragma mark - 获取看护列表
|
||||
|
||||
-(void)getKanHuList{
|
||||
|
||||
[self.kanHuListArr removeAllObjects];
|
||||
|
||||
UserModel*umodel=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
|
||||
|
||||
NSString*userId=[NSString stringWithFormat:@"%@",umodel.userId];
|
||||
[AFNOHeaderHttpTool getKanHuListWithShopsId:userId firstResult:@"0" pageSize:@"10" success:^(id response) {
|
||||
|
||||
|
||||
NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
|
||||
|
||||
NSLog(@"*-*-*--*总共的条数%@",resultDic[@"total"]);
|
||||
_total = resultDic[@"total"];
|
||||
|
||||
NSArray *arr = resultDic[@"data"];
|
||||
|
||||
for (NSDictionary *dict in arr) {
|
||||
KanHuListModel *listmodel = [[KanHuListModel alloc] init];
|
||||
listmodel.userId = dict[@"userId"];
|
||||
listmodel.nickName = dict[@"nickName"];
|
||||
listmodel.cameraId = dict[@"cameraId"];
|
||||
|
||||
[self.kanHuListArr addObject:listmodel];
|
||||
|
||||
}
|
||||
[self.tableView reloadData];
|
||||
|
||||
|
||||
} failure:^(NSError *err) {
|
||||
|
||||
|
||||
|
||||
}];
|
||||
}
|
||||
|
||||
-(void)creatReatRefreshView{
|
||||
__weak typeof (self)weskSelf=self;
|
||||
// 下拉刷新
|
||||
|
||||
[weskSelf.tableView addRefreshHeaderViewWithAniViewClass:[JHRefreshAmazingAniView class] beginRefresh:^{
|
||||
if (weskSelf.isRefreshing) {
|
||||
return ;
|
||||
}
|
||||
weskSelf.isRefreshing=YES;
|
||||
|
||||
|
||||
_page=0;
|
||||
|
||||
|
||||
|
||||
[weskSelf addTaskWithFirst:@"0" addpageSize:@"10" isRefresh:YES];
|
||||
|
||||
|
||||
|
||||
}];
|
||||
//上拉加载更多
|
||||
|
||||
[weskSelf.tableView addRefreshFooterViewWithAniViewClass:[JHRefreshCommonAniView class] beginRefresh:^{
|
||||
if (weskSelf.isLoadMore) {
|
||||
return ;
|
||||
}
|
||||
weskSelf.isLoadMore=YES;
|
||||
|
||||
NSInteger pagecount =[_total integerValue]/10+1;
|
||||
if (_page<pagecount-1) {
|
||||
_page++;
|
||||
|
||||
NSInteger first=(NSInteger)_page*10;
|
||||
NSString *firsStr=[NSString stringWithFormat:@"%ld",(long)first];
|
||||
|
||||
[weskSelf addTaskWithFirst:firsStr addpageSize:@"10" isRefresh:NO];
|
||||
|
||||
|
||||
|
||||
}else{
|
||||
|
||||
[self endRefreshing];
|
||||
|
||||
[self.view makeToast:@"没有了"];
|
||||
|
||||
}
|
||||
|
||||
|
||||
}];
|
||||
|
||||
|
||||
}
|
||||
|
||||
-(void)endRefreshing{
|
||||
if (self.isRefreshing) {
|
||||
self.isRefreshing=NO;
|
||||
[self.tableView headerEndRefreshingWithResult:JHRefreshResultNone];
|
||||
}
|
||||
|
||||
if (self.isLoadMore) {
|
||||
self.isLoadMore=NO;
|
||||
[self.tableView footerEndRefreshing];
|
||||
}
|
||||
}
|
||||
|
||||
-(void)addTaskWithFirst:(NSString *)firstrRsult addpageSize:(NSString *)pageSiaze isRefresh:(BOOL)isRefresh{
|
||||
|
||||
if (isRefresh) {
|
||||
[self.kanHuListArr removeAllObjects];
|
||||
}
|
||||
|
||||
[AFNOHeaderHttpTool getKanHuListWithShopsId:self.shopsInfo.userId firstResult:firstrRsult pageSize:pageSiaze success:^(id response) {
|
||||
|
||||
|
||||
|
||||
NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
|
||||
|
||||
NSLog(@"*-*-*--*总共的条数%@",resultDic[@"total"]);
|
||||
_total = resultDic[@"total"];
|
||||
|
||||
NSArray *arr = resultDic[@"data"];
|
||||
|
||||
for (NSDictionary *dict in arr) {
|
||||
KanHuListModel *listmodel = [[KanHuListModel alloc] init];
|
||||
listmodel.userId = dict[@"userId"];
|
||||
listmodel.nickName = dict[@"nickName"];
|
||||
listmodel.cameraId = dict[@"cameraId"];
|
||||
[self.kanHuListArr addObject:listmodel];
|
||||
|
||||
|
||||
}
|
||||
[self.tableView reloadData];
|
||||
[self endRefreshing];
|
||||
|
||||
|
||||
} failure:^(NSError *err) {
|
||||
|
||||
[self endRefreshing];
|
||||
|
||||
}];
|
||||
|
||||
}
|
||||
|
||||
#pragma mark-编辑
|
||||
|
||||
-(void)bianJiBtnAction:(UIButton *)btn{
|
||||
|
||||
ShopEditViewController *editVC=[[ShopEditViewController alloc] init];
|
||||
editVC.shopInfo = self.shopsInfo;
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
[self.navigationController pushViewController:editVC animated:YES];
|
||||
|
||||
|
||||
}
|
||||
|
||||
#pragma mark -和客户聊天
|
||||
|
||||
-(void)chatBtnAction:(UIButton *)btn{
|
||||
|
||||
KanHuListModel *listmodel = self.kanHuListArr[btn.tag - 2];
|
||||
|
||||
UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
|
||||
|
||||
NSString *myAcount = [NSString stringWithFormat:@"%@",model.userId];
|
||||
|
||||
NSString *tarGetAcount = [NSString stringWithFormat:@"%@",listmodel.userId];
|
||||
|
||||
[[NIMSDK sharedSDK].loginManager login:myAcount token:model.neteaseToken completion:^(NSError *error) {
|
||||
if (!error) {
|
||||
NSLog(@"登录成功");
|
||||
//创建session
|
||||
NIMSession *session = [NIMSession session:tarGetAcount type:NIMSessionTypeP2P];
|
||||
//创建聊天页，这个页面继承自 NIMKit 中的组件 NIMSessionViewController
|
||||
|
||||
self.hidesBottomBarWhenPushed = YES;
|
||||
IfishSessionViewController *vc = [[IfishSessionViewController alloc] initWithSession:session];
|
||||
//vc.targetChatname = listmodel.nickName;
|
||||
|
||||
[self.navigationController pushViewController:vc animated:YES];
|
||||
|
||||
|
||||
}else{
|
||||
NSLog(@"登录失败");
|
||||
}
|
||||
}];
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
@interface ShopCertificationHtmlController : BaseVIewContorller
|
||||
@interface ShopCertificationHtmlController : BaseViewController
|
||||
|
||||
@end
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "WhiteNavBaseViewController.h"
|
||||
@interface ShopCertificationIntroduceController : WhiteNavBaseViewController
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
|
||||
#import "WhiteNavBaseViewController.h"
|
||||
//v4.4 后更改UI 此界面废弃
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
// Copyright © 2016年 lianxiang. All rights reserved.
|
||||
//
|
||||
|
||||
#import "BaseVIewContorller.h"
|
||||
#import "BaseViewController.h"
|
||||
#import "WhiteNavBaseViewController.h"
|
||||
#import "ShopCertifyStausModel.h"
|
||||
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
//
|
||||
|
||||
#import "ShopCertifySucssesViewController.h"
|
||||
//#import "WorkbechViewController.h"
|
||||
#import "IfishKanHuGuanLiViewController.h"
|
||||
#import "UINavigationBar+Background.h"
|
||||
@interface ShopCertifySucssesViewController ()
|
||||
|
||||
Reference in New Issue
Block a user