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/探索/IfishLive/IfishLivelist/IfishKanKanListViewController.h
+2 -2
View File
@@ -6,12 +6,12 @@
// Copyright © 2016年 lianxiang. All rights reserved.
//
#import "BaseVIewContorller.h"
#import "BaseViewController.h"
/*
*老界面已废弃
*/
@interface IfishKanKanListViewController : BaseVIewContorller
@interface IfishKanKanListViewController : BaseViewController
@end
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.h
+1 -1
View File
@@ -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"
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/IfishP2PLivePlayViewController.m
-30
View File
@@ -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(@"登录失败");
}
}];
}
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/ifishP2PShareVIew/P2PShareView1Cell.h
+2 -4
View File
@@ -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
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/ifishP2PShareVIew/P2PShareView1Cell.m
+29 -2
View File
@@ -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
{
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/ifishP2PShareVIew/P2PShareView1Cell.xib
+16 -56
View File
@@ -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>
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/ifishP2PShareVIew/P2PShareViewBootomView.h
-1
View File
@@ -18,7 +18,6 @@
#import "IfishCommentEditeView.h"
@protocol P2PShareViewBootomViewDelegate <NSObject>
@optional
-(void)chatBtnClickAction;
-(void)daShangSuccsess;
@end
Ifish/controllers/IfishTabControllers/探索/IfishLive/IfishLivelist/ifishP2PShareVIew/P2PShareViewBootomView.m
-7
View File
@@ -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 {