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

Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop 

# Conflicts:
#	.DS_Store
#	Ifish.xcodeproj/project.pbxproj
This commit is contained in:
wbzhan_macbook 2019-03-20 09:35:23 +08:00
parent 79db335195 a1f9494a73
commit 3941cd475b
18 changed files with 97 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

2
Ifish.xcodeproj/project.pbxproj
View File

@ -17640,7 +17640,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "eeefa590-8286-4301-b6e5-f1eeee0de64f"; PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";

1
Ifish/AppDelegate.m
View File

@ -43,7 +43,6 @@
#define BMKMAP_APPKEY @"wYcF3YXqeepKfzruExLPn0eS" #define BMKMAP_APPKEY @"wYcF3YXqeepKfzruExLPn0eS"
//#import <BaiduMapAPI_Map/BMKMapComponent.h> //#import <BaiduMapAPI_Map/BMKMapComponent.h>
#import "Socketsingleton.h" #import "Socketsingleton.h"
#import "CenterViewController.h"
#import <UMCommunitySDK/UMCommunitySDK.h> #import <UMCommunitySDK/UMCommunitySDK.h>
#import <UMCommunitySDK/UMComSession.h> #import <UMCommunitySDK/UMComSession.h>
#import <UMSocialCore/UMSocialCore.h> #import <UMSocialCore/UMSocialCore.h>

6
Ifish/Info.plist
View File

@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>爱鱼奇</string> <string>爱鱼奇TEST</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>4.9.0</string> <string>4.9.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>531</string> <string>535</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

11
Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
View File

@ -98,12 +98,11 @@
[self creatTableView]; [self creatTableView];
[self initUI]; [self initUI];
[self fishTankData]; [self fishTankData];
[self creatMyindicaterView]; [self creatMyindicaterView];
[self notBindDeviceState]; [self notBindDeviceState];
[self creatRefreshView]; [self creatRefreshView];
} }
@ -637,7 +636,7 @@
if (self.tableView==nil) { if (self.tableView==nil) {
UITableView*table=[[UITableView alloc]init]; UITableView*table=[[UITableView alloc]init];
table.frame=CGRectMake(0,0, kScreenSize.width, kScreenSize.height ); table.frame=CGRectMake(0,0, kScreenSize.width, kScreenSize.height-TOP_HEIGHT);
table.dataSource=self; table.dataSource=self;
table.delegate=self; table.delegate=self;
table.separatorStyle=UITableViewCellSeparatorStyleSingleLine; table.separatorStyle=UITableViewCellSeparatorStyleSingleLine;
@ -660,9 +659,9 @@
return 0; return 0;
} }
-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
return nil; return nil;
} }

8
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
View File

@ -114,7 +114,7 @@
for (int i = 0; i < 3; i ++) { for (int i = 0; i < 3; i ++) {
self.button = [[UIButton alloc] init] ; self.button = [[UIButton alloc] init] ;
self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -10 - 10 , btnControlWith, btnControlWith +11); self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -(is_iPhone_X?40:20) , btnControlWith, btnControlWith +11);
[self.button setImage:[UIImage imageNamed:nameArr[i]] forState:UIControlStateNormal]; [self.button setImage:[UIImage imageNamed:nameArr[i]] forState:UIControlStateNormal];
//self.button.backgroundColor = [UIColor redColor]; //self.button.backgroundColor = [UIColor redColor];
@ -122,7 +122,7 @@
[self.button addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside]; [self.button addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside];
self.chName = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -20 + btnControlWith -5 , btnControlWith, btnControlPlace - 5)]; self.chName = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -20 + btnControlWith -5-(is_iPhone_X?20:0) , btnControlWith, btnControlPlace - 5)];
//textLbl.backgroundColor = [UIColor blackColor]; //textLbl.backgroundColor = [UIColor blackColor];
self.chName.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1]; self.chName.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1];
self.chName.textAlignment = NSTextAlignmentCenter; self.chName.textAlignment = NSTextAlignmentCenter;
@ -155,7 +155,7 @@
for (int i = 0; i < 3; i ++) { for (int i = 0; i < 3; i ++) {
self.button = [[UIButton alloc] init] ; self.button = [[UIButton alloc] init] ;
self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -25 -5 , btnControlWith, btnControlWith + 11); self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -(is_iPhone_X?50:30) , btnControlWith, btnControlWith + 11);
[self.button setImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal]; [self.button setImage:[UIImage imageNamed:nameArr[i+3]]forState:UIControlStateNormal];
@ -163,7 +163,7 @@
self.button.tag= 6003+i; self.button.tag= 6003+i;
[self.button addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside]; [self.button addTarget:self action:@selector(controlBtnCilck:) forControlEvents:UIControlEventTouchUpInside];
UILabel* textLbl = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -35 + btnControlWith, btnControlWith, btnControlPlace - 5)]; UILabel* textLbl = [[UILabel alloc] initWithFrame:CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith), kScreenSize.height - 2*btnControlPlace - btnControlWith -35 + btnControlWith-(is_iPhone_X?20:0), btnControlWith, btnControlPlace - 5)];
//textLbl.backgroundColor = [UIColor blackColor]; //textLbl.backgroundColor = [UIColor blackColor];
textLbl.textAlignment = NSTextAlignmentCenter; textLbl.textAlignment = NSTextAlignmentCenter;
textLbl.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1]; textLbl.textColor = [UIColor colorWithRed:250/255.0f green:255/255.0f blue:255/254.0f alpha:1];

9
Ifish/controllers/IfishTabControllers/我的/IfishMineGold/ViewControlller/IfishMineGoldViewController.m
View File

@ -35,6 +35,15 @@
[self loadRightData]; [self loadRightData];
} }
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
self.navigationController.navigationBar.translucent = YES;
}
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
self.navigationController.navigationBar.translucent = NO;
}
-(void)creatSubViews -(void)creatSubViews
{ {

19
Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastDetailViewController.m
View File

@ -26,7 +26,7 @@
-(void)creatTab{ -(void)creatTab{
self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped]; self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain];
self.tableView.delegate = self; self.tableView.delegate = self;
self.tableView.dataSource = self; self.tableView.dataSource = self;
self.tableView.scrollEnabled = YES; self.tableView.scrollEnabled = YES;
@ -37,7 +37,7 @@
[self.view addSubview:self.tableView]; [self.view addSubview:self.tableView];
UIButton *duiHuanBtn=[UIButton buttonWithType:UIButtonTypeCustom]; UIButton *duiHuanBtn=[UIButton buttonWithType:UIButtonTypeCustom];
duiHuanBtn.frame = CGRectMake(0, self.view.frame.size.height -49, self.view.frame.size.width, 49); duiHuanBtn.frame = CGRectMake(0, 0, self.view.frame.size.width, 49);
[duiHuanBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [duiHuanBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithString:@"立即兑换"]; NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithString:@"立即兑换"];
@ -47,9 +47,7 @@
[duiHuanBtn setAttributedTitle:title forState:UIControlStateNormal]; [duiHuanBtn setAttributedTitle:title forState:UIControlStateNormal];
[duiHuanBtn setBackgroundColor:RGB(67, 186, 255)]; [duiHuanBtn setBackgroundColor:RGB(67, 186, 255)];
[duiHuanBtn addTarget:self action:@selector(duihuanBtnClick) forControlEvents:UIControlEventTouchUpInside]; [duiHuanBtn addTarget:self action:@selector(duihuanBtnClick) forControlEvents:UIControlEventTouchUpInside];
self.tableView.tableFooterView = duiHuanBtn;
[self.view addSubview:duiHuanBtn];
} }
@ -87,17 +85,6 @@
return 470; return 470;
} }
-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
return 0.1;
}
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
return 10;
}
#pragma mark -金币兑换 #pragma mark -金币兑换
-(void)duihuanBtnClick{ -(void)duihuanBtnClick{

24
Ifish/controllers/IfishTabControllers/探索/GoldCoast/ViewControlller/IfishGoldCoastViewController.m
View File

@ -15,6 +15,7 @@
@property(nonatomic,strong)UITableView *tableView; @property(nonatomic,strong)UITableView *tableView;
@property(nonatomic,strong)NSMutableArray *dataArr; @property(nonatomic,strong)NSMutableArray *dataArr;
@property (nonatomic) NSIndexPath *selectIndexPath; @property (nonatomic) NSIndexPath *selectIndexPath;
@property(nonatomic,strong) UIView *sectionHeaderView;
@property (nonatomic) BOOL isChage; @property (nonatomic) BOOL isChage;
@end @end
@ -57,7 +58,7 @@
-(void)creatTab{ -(void)creatTab{
self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain];
self.tableView.delegate = self; self.tableView.delegate = self;
self.tableView.dataSource = self; self.tableView.dataSource = self;
self.tableView.scrollEnabled = YES; self.tableView.scrollEnabled = YES;
@ -99,13 +100,26 @@
-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
return 0.1; return CGFLOAT_MIN;
}
-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
return nil;
} }
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
return 10;
return 0.1; }
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
return self.sectionHeaderView;
}
-(UIView *)sectionHeaderView {
if (!_sectionHeaderView) {
_sectionHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
}
return _sectionHeaderView;
} }
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{

28
Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/ViewControlller/IfishUsersActivityListController.m
View File

@ -17,6 +17,7 @@ const float ActivityPageSize = 20;
@property (nonatomic,strong) UITableView *tableView; @property (nonatomic,strong) UITableView *tableView;
@property (nonatomic,strong) NSMutableArray *dataArr; @property (nonatomic,strong) NSMutableArray *dataArr;
@property (nonatomic,strong) NSMutableArray *activTypes; @property (nonatomic,strong) NSMutableArray *activTypes;
@property (nonatomic,strong) UIView *sectionHeaderView;
@property (nonatomic) NSInteger firstResult; @property (nonatomic) NSInteger firstResult;
@property(nonatomic,copy) NSString* total; @property(nonatomic,copy) NSString* total;
@property(nonatomic)BOOL isLoadMore; @property(nonatomic)BOOL isLoadMore;
@ -87,7 +88,7 @@ const float ActivityPageSize = 20;
-(void)creatTab{ -(void)creatTab{
self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStylePlain];
self.tableView.delegate = self; self.tableView.delegate = self;
self.tableView.dataSource = self; self.tableView.dataSource = self;
self.tableView.scrollEnabled = YES; self.tableView.scrollEnabled = YES;
@ -127,18 +128,27 @@ const float ActivityPageSize = 20;
} }
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
return 10;
if (section==0) { }
return 0.01;
}else{ -(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
return self.sectionHeaderView;
return 10;
}
} }
-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
return 0.01; return CGFLOAT_MIN;
}
-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
return nil;
}
-(UIView *)sectionHeaderView{
if (!_sectionHeaderView) {
_sectionHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
}
return _sectionHeaderView;
} }
-(void)creatReatRefreshView{ -(void)creatReatRefreshView{

19
Ifish/controllers/IfishTabControllers/探索/IfishUsersActivity/view/IFishUserActivityListCell.xib
View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
@ -16,18 +15,18 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="124"/> <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <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"> <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="123"/> <rect key="frame" x="0.0" y="0.0" width="320" height="123.5"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yCp-Pc-niT"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yCp-Pc-niT">
<rect key="frame" x="15" y="19" width="43" height="43"/> <rect key="frame" x="23" y="22" width="43" height="43"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="43" id="K1h-6R-dgq"/> <constraint firstAttribute="height" constant="43" id="K1h-6R-dgq"/>
<constraint firstAttribute="width" constant="43" id="utS-Lc-5nb"/> <constraint firstAttribute="width" constant="43" id="utS-Lc-5nb"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MC2-dj-tQV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MC2-dj-tQV">
<rect key="frame" x="15" y="70" width="43" height="21"/> <rect key="frame" x="23" y="73" width="43" height="21"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="43" id="O0H-Fu-MQP"/> <constraint firstAttribute="width" constant="43" id="O0H-Fu-MQP"/>
<constraint firstAttribute="height" constant="21" id="spG-aM-uyY"/> <constraint firstAttribute="height" constant="21" id="spG-aM-uyY"/>
@ -44,7 +43,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4H-3i-r5P"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j4H-3i-r5P">
<rect key="frame" x="66" y="19" width="44" height="21"/> <rect key="frame" x="74" y="22" width="44" height="21"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="21" id="E4g-ow-Bbo"/> <constraint firstAttribute="height" constant="21" id="E4g-ow-Bbo"/>
</constraints> </constraints>
@ -53,7 +52,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o4z-Rh-bJE"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o4z-Rh-bJE">
<rect key="frame" x="66" y="44" width="31" height="15"/> <rect key="frame" x="74" y="47" width="31" height="15"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="15" id="ehn-eA-OyR"/> <constraint firstAttribute="height" constant="15" id="ehn-eA-OyR"/>
</constraints> </constraints>
@ -62,14 +61,14 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rvn-dY-yD4" customClass="IFishActivityCateView"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rvn-dY-yD4" customClass="IFishActivityCateView">
<rect key="frame" x="207" y="13" width="113" height="18"/> <rect key="frame" x="199" y="15.5" width="113" height="18"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="113" id="prU-qW-zDS"/> <constraint firstAttribute="width" constant="113" id="prU-qW-zDS"/>
<constraint firstAttribute="height" constant="18" id="zt9-Kb-dri"/> <constraint firstAttribute="height" constant="18" id="zt9-Kb-dri"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ncX-Ol-5UJ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ncX-Ol-5UJ">
<rect key="frame" x="66" y="75" width="230" height="16"/> <rect key="frame" x="74" y="78" width="214" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>

3
Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
View File

@ -41,7 +41,6 @@
#import "IfishAlibcWebViewController.h" #import "IfishAlibcWebViewController.h"
#import "MBProgressHUD.h" #import "MBProgressHUD.h"
#import "NTESSessionListViewController.h" #import "NTESSessionListViewController.h"
#import "RunSun84biteCenterViewController.h"
#import "RunSunChangeNameViewController.h" #import "RunSunChangeNameViewController.h"
@interface IfishDeviceViewController ()<UITableViewDelegate,UITableViewDataSource,LxPopViewDelegate,ShopTtemListDelegate,NIMSystemNotificationManagerDelegate,NIMConversationManagerDelegate> @interface IfishDeviceViewController ()<UITableViewDelegate,UITableViewDataSource,LxPopViewDelegate,ShopTtemListDelegate,NIMSystemNotificationManagerDelegate,NIMConversationManagerDelegate>
@ -675,7 +674,7 @@
[self.tableView registerNib:[UINib nibWithNibName:@"TabBarDeviceShouYeCell" bundle:nil] forCellReuseIdentifier:@"TabBarDeviceShouYeCell"]; [self.tableView registerNib:[UINib nibWithNibName:@"TabBarDeviceShouYeCell" bundle:nil] forCellReuseIdentifier:@"TabBarDeviceShouYeCell"];
[self.tableView registerNib:[UINib nibWithNibName:@"TabbarDeiceSecdCell" bundle:nil] forCellReuseIdentifier:@"TabbarDeiceSecdCell"]; [self.tableView registerNib:[UINib nibWithNibName:@"TabbarDeiceSecdCell" bundle:nil] forCellReuseIdentifier:@"TabbarDeiceSecdCell"];
//CGFloat sapce=TabContentHeaght*0.011;//20/1776 //CGFloat sapce=TabContentHeaght*0.011;//20/1776
self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height-TOP_HEIGHT) style:UITableViewStyleGrouped]; self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped];
self.tableView.delegate = self; self.tableView.delegate = self;
self.tableView.dataSource = self; self.tableView.dataSource = self;

4
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
View File

@ -499,7 +499,7 @@
//显示监控画面的载体canvasView //显示监控画面的载体canvasView
CGFloat canvasView_h = [UIScreen mainScreen].bounds.size.width * 9/16; CGFloat canvasView_h = [UIScreen mainScreen].bounds.size.width * 9/16;
UIView *canvasView = [[UIView alloc] initWithFrame:CGRectMake(0, 64, width, canvasView_h)]; UIView *canvasView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, canvasView_h)];
canvasView.backgroundColor = [UIColor blackColor]; canvasView.backgroundColor = [UIColor blackColor];
[self.view addSubview:canvasView]; [self.view addSubview:canvasView];
self.canvasView = canvasView; self.canvasView = canvasView;
@ -1074,7 +1074,7 @@
CGFloat height = rect.size.height; CGFloat height = rect.size.height;
if (!_fishControlView) { if (!_fishControlView) {
_fishControlView=[[MonitorBootmView alloc] initWithFrame:CGRectMake(0,0, width, height-CGRectGetMaxY(self.segControl.frame) -15)]; _fishControlView=[[MonitorBootmView alloc] initWithFrame:CGRectMake(0,0, width, height-CGRectGetMaxY(self.segControl.frame) -15-TOP_HEIGHT)];
_fishControlView.cameraId = self.contact.cameraId; _fishControlView.cameraId = self.contact.cameraId;
_fishControlView.MonitorBottomDelegate=self; _fishControlView.MonitorBottomDelegate=self;
[self.bottomFishHView addSubview:_fishControlView]; [self.bottomFishHView addSubview:_fishControlView];

19
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
View File

@ -948,13 +948,13 @@ withFilterContext:(id)filterContext
return; return;
} }
BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text]; // BOOL isRight =[dataContorl isIncludeSpecialCharact:self.wifiSecFiled.text];
//
if (!isRight) { // if (!isRight) {
[self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"]; // [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
//
return; // return;
} // }
if (!self.wifiName) { if (!self.wifiName) {
@ -1054,7 +1054,10 @@ withFilterContext:(id)filterContext
self.sBtn.hidden = YES; self.sBtn.hidden = YES;
self.nodImg.hidden = YES; self.nodImg.hidden = YES;
self.redTipLable.hidden=YES; self.redTipLable.hidden=YES;
NSString *ssidName = [self.wifiName substringWithRange:NSMakeRange(self.wifiName.length-2, 2)];
if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:@"", nil];
}
} }
-(void)wifiviewkeyboardWillHide:(NSNotification *)notify{ -(void)wifiviewkeyboardWillHide:(NSNotification *)notify{

18
Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
View File

@ -253,6 +253,10 @@ extern BOOL isfromCameraView;
self.shareButton.hidden = YES; self.shareButton.hidden = YES;
self.nodImg.hidden = YES; self.nodImg.hidden = YES;
self.redTextLable.hidden=YES; self.redTextLable.hidden=YES;
NSString *ssidName = [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:@"", nil];
}
} }
@ -397,13 +401,13 @@ extern BOOL isfromCameraView;
[_wifiTextFiled resignFirstResponder]; [_wifiTextFiled resignFirstResponder];
BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text]; // BOOL isRight =[dataContorl isIncludeSpecialCharact:_wifiTextFiled.text];
//
if (!isRight) { // if (!isRight) {
[self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"]; // [self.view makeToast:@"Wifi密码不能包含特殊字符，只能为数字字母下划线"];
//
return; // return;
} // }
[self savePassw]; [self savePassw];
[self tapConfirmForResults]; [self tapConfirmForResults];

1
Ifish/controllers/leftcontrollers/SelectDeviceViewController.m
View File

@ -9,7 +9,6 @@
#import "SelectDeviceViewController.h" #import "SelectDeviceViewController.h"
#import "FirstConnectWifiController.h" #import "FirstConnectWifiController.h"
#import "LeftViewController.h" #import "LeftViewController.h"
#import "CenterViewController.h"
#import "ICSDrawerController.h" #import "ICSDrawerController.h"
#import "YooseConnectFirstViewController.h" #import "YooseConnectFirstViewController.h"
#import "IfishMianTabViewController.h" #import "IfishMianTabViewController.h"

1
Ifish/controllers/leftcontrollers/SetViewController.m
View File

@ -17,7 +17,6 @@
#import "ChangeSecretCodeController.h" #import "ChangeSecretCodeController.h"
#import "AboutUsViewController.h" #import "AboutUsViewController.h"
//#import "LeftViewController.h" //#import "LeftViewController.h"
//#import "CenterViewController.h"
#import "RegistViewController.h" #import "RegistViewController.h"
#import "AppDelegate.h" #import "AppDelegate.h"
#import "LogInViewController.h" #import "LogInViewController.h"

1
Ifish/controllers/logAddRegistController/RegistViewController.mm
View File

@ -13,7 +13,6 @@
#import "AFNetworking.h" #import "AFNetworking.h"
#import "MyMD5.h" #import "MyMD5.h"
#import "LeftViewController.h" #import "LeftViewController.h"
#import "CenterViewController.h"
#import "RightViewController.h" #import "RightViewController.h"
#import "AgreementViewController.h" #import "AgreementViewController.h"
#import "MyIntroductionViewController.h" #import "MyIntroductionViewController.h"