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

fix

Browse Source
This commit is contained in:
lianxiang
2018-09-27 00:20:01 +08:00
parent d0230f55ed
commit cb0accdb66
60 changed files with 1063 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GIGA/Modules/Me/Controller/GIGaChangePassVC.m
+1 -1
View File
@@ -64,7 +64,7 @@
}
if (self.reNewPassFiled.text != self.xinPassFiled.text) {
if (![self.reNewPassFiled.text isEqualToString:self.xinPassFiled.text]) {
GIGA_ShowToast(@"两次输入密码不一致!");
return;
}
GIGA/Modules/Me/Controller/GIGaChangePassVC.xib
+8 -8
View File
@@ -30,9 +30,9 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入旧密码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="7cM-MG-zEY">
<rect key="frame" x="106" y="49" width="245" height="36"/>
<rect key="frame" x="106" y="48" width="245" height="37"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="BPG-0j-gO5"/>
<constraint firstAttribute="height" constant="37" id="BPG-0j-gO5"/>
</constraints>
<color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
@@ -49,16 +49,16 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入新密码(6～20位数字、字母、符号)" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="kms-0e-gzX">
<rect key="frame" x="106" y="101" width="244" height="31"/>
<rect key="frame" x="106" y="104" width="244" height="28"/>
<constraints>
<constraint firstAttribute="height" constant="31" id="zZ8-hZ-S7v"/>
<constraint firstAttribute="height" constant="28" id="zZ8-hZ-S7v"/>
</constraints>
<color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<textInputTraits key="textInputTraits" keyboardType="namePhonePad" secureTextEntry="YES"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HhF-Qv-2wC">
<rect key="frame" x="29" y="157" width="70" height="20"/>
<rect key="frame" x="29" y="156.5" width="70" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="cjc-Ev-bqF"/>
<constraint firstAttribute="height" constant="20" id="qZq-xq-gJb"/>
@@ -75,14 +75,14 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OLf-js-1si">
<rect key="frame" x="25" y="142" width="326" height="1"/>
<rect key="frame" x="25" y="141.5" width="326" height="1"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="cgb-hm-l73"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jn6-n7-ZUF">
<rect key="frame" x="29" y="194" width="322" height="1"/>
<rect key="frame" x="29" y="193.5" width="322" height="1"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ifN-m4-Ink"/>
@@ -118,7 +118,7 @@
<constraint firstItem="HhF-Qv-2wC" firstAttribute="top" secondItem="OLf-js-1si" secondAttribute="bottom" constant="14" id="Ru5-Fq-vEj"/>
<constraint firstAttribute="trailing" secondItem="OLf-js-1si" secondAttribute="trailing" constant="24" id="Tnh-gv-meP"/>
<constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="ADk-hR-ecA" secondAttribute="trailing" constant="23" id="bMN-9l-hsL"/>
<constraint firstItem="kms-0e-gzX" firstAttribute="centerY" secondItem="rCk-5f-1L2" secondAttribute="centerY" constant="-1" id="f3v-vS-DMg"/>
<constraint firstItem="kms-0e-gzX" firstAttribute="centerY" secondItem="rCk-5f-1L2" secondAttribute="centerY" constant="1" id="f3v-vS-DMg"/>
<constraint firstItem="kms-0e-gzX" firstAttribute="leading" secondItem="rCk-5f-1L2" secondAttribute="trailing" constant="35" id="kNx-dP-EGV"/>
<constraint firstItem="rCk-5f-1L2" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="29" id="n8e-7g-uhd"/>
<constraint firstItem="Jn6-n7-ZUF" firstAttribute="top" secondItem="ADk-hR-ecA" secondAttribute="bottom" constant="10" id="qez-p1-06i"/>
GIGA/Modules/Me/Controller/GiGaUserViewController.m
+2 -3
View File
@@ -306,7 +306,7 @@
self.user.nickName = @"";
}
int leng = [GiGaHelper convertToInt: self.user.nickName];
if ( self.user.nickName.length >40 ) {
GIGA_ShowToast(@"用户名1-40字符长度")
return;
@@ -498,8 +498,7 @@
[self.view makeToastActivity:CSToastPositionCenter];
NSString *url = [NSString stringWithFormat:@"%@%@",[GiGaServerConfig getMainUrl],kUploadAvator];
//NSString *userID = [GiGaUserDefault getCurentUserId];
//UIImage *avator =[GIGaFileManager getUserAvatorWith:userID];
NSData*imageData=UIImageJPEGRepresentation(image,1.0f);
[GiGaNetManager uploadImage:url imgData:imageData parms:@{@"file":@"file"} responseBlock:^(NSDictionary *responseDict, NSDictionary *responseHeaderFields, NSError *error) {
GIGA/Modules/Me/Controller/GiMaskTimeHistoryVC.m
+30 -3
View File
@@ -13,6 +13,8 @@
#import "MaskHistryRecord.h"
#import <MJRefresh/MJRefresh.h>
#import "GiGaWebViewController.h"
#import "HistoryNoDataViewCell.h"
@interface GiMaskTimeHistoryVC ()<UITableViewDelegate,UITableViewDataSource>
@property(nonatomic,strong) NSMutableArray *dataArr;
@@ -23,7 +25,7 @@
//@property(nonatomic,strong) MaskHistryRecordlist *record;
@property(nonatomic,copy) NSString * guizeUrl;
@property(nonatomic) BOOL isFreshing;
@property(nonatomic,copy) NSString *exquisitePercent;
@end
@@ -55,20 +57,39 @@
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
if (self.dataArr.count == 0) {
return 1;
}
return 2;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
if (self.dataArr.count ==0) {
HistoryNoDataViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"HistoryNoDataViewCell"];
if(!cell){
cell = [[[NSBundle mainBundle] loadNibNamed:@"HistoryNoDataViewCell" owner:self options:nil] lastObject];
}
[cell.mianmoBtn addTarget:self action:@selector(mianmoBtnAction) forControlEvents:UIControlEventTouchUpInside];
return cell;
}
if(indexPath.section ==0){
MasHistoryFirstViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MasHistoryFirstViewCell"];
if(!cell){
cell = [[[NSBundle mainBundle] loadNibNamed:@"MasHistoryFirstViewCell" owner:self options:nil] lastObject];
}
cell.timeLabe.text = [NSString stringWithFormat:@"%ld",(long)self.totalMinute];
cell.rankLabe.text = [NSString stringWithFormat:@"全国排行榜第%ld名",(long)self.ranking];
if (self.exquisitePercent) {
cell.rankLabe.text = [NSString stringWithFormat:@"本月超过%@用户",self.exquisitePercent];
}
[cell.guizeBtn addTarget:self action:@selector(guizeShow) forControlEvents:UIControlEventTouchUpInside];
return cell;
}
@@ -127,9 +148,9 @@
self.ranking = [[reDic valueForKey:@"ranking"] integerValue];
self.totalMinute = [[reDic valueForKey:@"totalMinute"] integerValue] ;
self.exquisitePercent = [reDic valueForKey:@"exquisitePercent"];
self.guizeUrl = [reDic valueForKey:@"ruleUrl"];
NSDictionary *pageDic = reDic[@"page"];
//self.currentPage = [pageDic valueForKey:@"currPage"];
@@ -213,5 +234,11 @@
}
}
-(void)mianmoBtnAction{
[self.navigationController popToRootViewControllerAnimated:YES];
}
@end