Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8742a27

Browse files
移除 App 内购嫌疑的 UI
1 parent 65b4ddf commit 8742a27

File tree

5 files changed

+43
-27
lines changed

5 files changed

+43
-27
lines changed

‎Coding_iOS/Coding_Enterprise_iOS-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dict>
2929
</array>
3030
<key>CFBundleVersion</key>
31-
<string>2.9.5.201806221600</string>
31+
<string>2.9.5.201806271000</string>
3232
<key>ITSAppUsesNonExemptEncryption</key>
3333
<false/>
3434
<key>LSApplicationQueriesSchemes</key>

‎Coding_iOS/Coding_iOS-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</dict>
3838
</array>
3939
<key>CFBundleVersion</key>
40-
<string>5.4.201806221600.1</string>
40+
<string>5.4.201806271100.1</string>
4141
<key>ITSAppUsesNonExemptEncryption</key>
4242
<false/>
4343
<key>LSApplicationQueriesSchemes</key>

‎Coding_iOS/Controllers/AboutPointViewController.xib

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
@@ -24,27 +24,21 @@
2424
<rect key="frame" x="-0.5" y="0.0" width="375" height="667"/>
2525
<subviews>
2626
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hbv-LB-ftj">
27-
<rect key="frame" x="0.0" y="0.0" width="375" height="429.5"/>
27+
<rect key="frame" x="0.0" y="0.0" width="375" height="262.5"/>
2828
<subviews>
2929
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DW9-r9-Zd3">
30-
<rect key="frame" x="15" y="30" width="345" height="384.5"/>
31-
<mutableString key="text">什么是码币
30+
<rect key="frame" x="15" y="30" width="345" height="217.5"/>
31+
<string key="text">码币的用途
3232

33-
码币是 Coding 平台推出的线上虚拟货币,可通过在 Coding 上进行冒泡、完善个人信息等操作免费获取。也可以使用人民币进行兑换,码币与人民币的兑换标准是 1 码币 = 50 元人民币(0.1 码币起购买),支持支付宝及微信付款。
34-
35-
码币的用途
36-
37-
使用码币购买 Shop 页面所列 Coding 定制等商品:如洋葱猴抱枕、Coding 毛巾、T恤、短裤、Coding 定制拖鞋等
38-
购买 Coding 推出的会员升级服务
33+
使用码币兑换 Shop 页面所列 Coding 定制等商品:如洋葱猴抱枕、Coding 毛巾、T恤、短裤、Coding 定制拖鞋等
3934

4035
如何获取码币
4136

42-
- 使用人民币购买码币
4337
- 过生日赠送 0.1mb
4438
- App 首次登录,奖励 0.1mb
4539
- Coding 不定时举办的码币活动
4640
- 给 Coding 博客 投稿 奖励 1-2mb
47-
- 冒泡被管理员推荐上广场,奖励 0.01mb</mutableString>
41+
- 冒泡被管理员推荐上广场,奖励 0.01mb</string>
4842
<fontDescription key="fontDescription" type="system" pointSize="14"/>
4943
<color key="textColor" red="0.25882352941176467" green="0.31372549019607843" blue="0.38823529411764707" alpha="1" colorSpace="calibratedRGB"/>
5044
<nil key="highlightedColor"/>

‎Coding_iOS/Controllers/RootControllers/Me_RootViewController.m

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#import "PointRecordsViewController.h"
1919
#import "AboutViewController.h"
2020
#import "HelpViewController.h"
21+
#import "EditTopicViewController.h"
2122

2223
#import "RDVTabBarController.h"
2324
#import "RDVTabBarItem.h"
@@ -38,6 +39,7 @@
3839
#import "TeamViewController.h"
3940

4041

42+
4143
#ifdef Target_Enterprise
4244

4345
@interface Me_RootViewController ()<UITableViewDataSource, UITableViewDelegate>
@@ -426,7 +428,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
426428
(indexPath.section == 1? (indexPath.row == 0? [cell setTitle:@"我的码币" icon:@"user_info_point"]:
427429
[cell setTitle:@"商城" icon:@"user_info_shop"]):
428430
indexPath.row == 0? [cell setTitle:@"本地文件" icon:@"user_info_file"]:
429-
indexPath.row == 1? [cell setTitle:@"帮助与反馈" icon:@"user_info_help"]:
431+
// indexPath.row == 1? [cell setTitle:@"帮助与反馈" icon:@"user_info_help"]:
432+
indexPath.row == 1? [cell setTitle:@"意见反馈" icon:@"user_info_help"]:
430433
indexPath.row == 2? [cell setTitle:@"设置" icon:@"user_info_setup"]:
431434
[cell setTitle:@"关于我们" icon:@"user_info_about"]);
432435

@@ -495,7 +498,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
495498
if (indexPath.row == 0) {//本地文件
496499
[self goToLocalFolders];
497500
}else if (indexPath.row == 1){//帮助与反馈
498-
[self goToHelp];
501+
// [self goToHelp];
502+
[self goToFeedBack];
499503
}else if (indexPath.row == 2){//设置
500504
[self goToSetting];
501505
}else{//关于我们
@@ -540,6 +544,14 @@ - (void)goToHelp{
540544
[self.navigationController pushViewController:[HelpViewController vcWithHelpStr] animated:YES];
541545
}
542546

547+
- (void)goToFeedBack{
548+
EditTopicViewController *vc = [[EditTopicViewController alloc] init];
549+
vc.curProTopic = [ProjectTopic feedbackTopic];
550+
vc.type = TopicEditTypeFeedBack;
551+
vc.topicChangedBlock = nil;
552+
[self.navigationController pushViewController:vc animated:YES];
553+
}
554+
543555
- (void)goToAbout{
544556
[self.navigationController pushViewController:[AboutViewController new] animated:YES];
545557
}

‎Coding_iOS/Views/Cell/MeRootUserCell.m

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ + (CGFloat)cellHeight{
7272

7373
@interface MeRootUserCell ()
7474
@property (strong, nonatomic) UIImageView *userV, *vipV;
75-
@property (strong, nonatomic) UILabel *userL, *vipL, *expirationL;
75+
@property (strong, nonatomic) UILabel *userL, *vipL, *expirationL, *gkL;
7676
@end
7777

7878
@implementation MeRootUserCell
@@ -86,6 +86,10 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
8686
[_userV doBorderWidth:0.5 color:nil cornerRadius:25];
8787
[self.contentView addSubview:_userV];
8888
}
89+
if (!_gkL) {
90+
_gkL = [UILabel labelWithFont:[UIFont systemFontOfSize:13] textColor:[UIColor colorWithHexString:@"0x1E2D42" andAlpha:0.6]];
91+
[self.contentView addSubview:_gkL];
92+
}
8993
if (!_vipV) {
9094
_vipV = [UIImageView new];
9195
[self.contentView addSubview:_vipV];
@@ -133,7 +137,11 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
133137
make.left.equalTo(_vipL.mas_right).offset(8);
134138
make.right.equalTo(_userL);
135139
}];
136-
140+
[_gkL mas_makeConstraints:^(MASConstraintMaker *make) {
141+
make.top.equalTo(_userL.mas_bottom).offset(10);
142+
make.left.right.equalTo(_userL);
143+
make.height.mas_equalTo(20);
144+
}];
137145
}
138146
return self;
139147
}
@@ -143,15 +151,17 @@ - (void)setCurUser:(User *)curUser{
143151

144152
[_userV sd_setImageWithURL:[_curUser.avatar urlImageWithCodePathResize:50* 2]];
145153
_userL.text = _curUser.name;
146-
_vipV.image = [UIImage imageNamed:[NSString stringWithFormat:@"vip_%@_45", _curUser.vip]];
147-
_vipL.text = _curUser.vipName;
148-
NSString *expirationStr = [_curUser.vip_expired_at string_yyyy_MM_dd];
149-
150-
if (_curUser.vip.integerValue > 2) {
151-
[_expirationL setAttrStrWithStr:[NSString stringWithFormat:@"到期时间:%@",expirationStr] diffColorStr:expirationStr diffColor:_curUser.willExpired? [UIColor colorWithHexString:@"0xF23524"]: kColorDark7];
152-
}else{
153-
_expirationL.hidden = YES;
154-
}
154+
_gkL.text = [NSString stringWithFormat:@"用户名:%@", _curUser.global_key];
155+
_vipL.hidden = _vipV.hidden = _expirationL.hidden = YES;
156+
// _vipV.image = [UIImage imageNamed:[NSString stringWithFormat:@"vip_%@_45", _curUser.vip]];
157+
// _vipL.text = _curUser.vipName;
158+
// NSString *expirationStr = [_curUser.vip_expired_at string_yyyy_MM_dd];
159+
//
160+
// if (_curUser.vip.integerValue > 2) {
161+
// [_expirationL setAttrStrWithStr:[NSString stringWithFormat:@"到期时间:%@",expirationStr] diffColorStr:expirationStr diffColor:_curUser.willExpired? [UIColor colorWithHexString:@"0xF23524"]: kColorDark7];
162+
// }else{
163+
// _expirationL.hidden = YES;
164+
// }
155165
}
156166

157167
+ (CGFloat)cellHeight{

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /