iOS Team / CNLiveMateCode · Commits

Commit b36ba646e99f544eeb75c186c1b0646f5deffa75

Authored by 张旭
1 parent 3c3a8430

积分显示为 x.xxW

Inline Side-by-side
Showing 3 changed files with 19 additions and 56 deletions
metaCode.xcodeproj/project.pbxproj
  View file @b36ba64
... ... @@ -2183,7 +2183,7 @@
2183 2183 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
2184 2184 CLANG_ENABLE_MODULES = YES;
2185 2185 CODE_SIGN_STYLE = Automatic;
2186   - CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
  2186 + CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
2187 2187 DEVELOPMENT_TEAM = 94X49GG3ZW;
2188 2188 EXCLUDED_ARCHS = "";
2189 2189 GENERATE_INFOPLIST_FILE = YES;
... ... @@ -2206,7 +2206,7 @@
2206 2206 "$(inherited)",
2207 2207 "@executable_path/Frameworks",
2208 2208 );
2209   - MARKETING_VERSION = 1.0.3;
  2209 + MARKETING_VERSION = 1.0.4;
2210 2210 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
2211 2211 PRODUCT_NAME = "$(TARGET_NAME)";
2212 2212 SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
... ... @@ -2228,7 +2228,7 @@
2228 2228 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
2229 2229 CLANG_ENABLE_MODULES = YES;
2230 2230 CODE_SIGN_STYLE = Automatic;
2231   - CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
  2231 + CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
2232 2232 DEVELOPMENT_TEAM = 94X49GG3ZW;
2233 2233 EXCLUDED_ARCHS = "";
2234 2234 GENERATE_INFOPLIST_FILE = YES;
... ... @@ -2251,7 +2251,7 @@
2251 2251 "$(inherited)",
2252 2252 "@executable_path/Frameworks",
2253 2253 );
2254   - MARKETING_VERSION = 1.0.3;
  2254 + MARKETING_VERSION = 1.0.4;
2255 2255 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
2256 2256 PRODUCT_NAME = "$(TARGET_NAME)";
2257 2257 SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
... ...
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
  View file @b36ba64
... ... @@ -209,7 +209,8 @@ class CNLiveIntegralAlertTool:NSObject{
209 209  
210 210 self.bottomBgView.addSubview(self.balanceIntegralLabel)
211 211  
212   - self.balanceIntegralLabel.text = String(format: "余额%d积分", self.point)
  212 + let pointStr = self.integralChangeW(pointCount: self.point)
  213 + self.balanceIntegralLabel.text = String(format: "余额%@积分", pointStr)
213 214  
214 215 self.bottomBgView.addSubview(self.payBtn)
215 216 self.payBtn.setTitle("确认支付", for: .normal)
... ... @@ -241,7 +242,8 @@ class CNLiveIntegralAlertTool:NSObject{
241 242 self.integralCountLabel.attributedText = priceAttri
242 243  
243 244 self.bottomBgView.addSubview(self.balanceIntegralLabel)
244   - self.balanceIntegralLabel.text = String(format: "余额%d积分 积分不足", self.point)
  245 + let pointStr = self.integralChangeW(pointCount: self.point)
  246 + self.balanceIntegralLabel.text = String(format: "余额%@积分 积分不足", pointStr)
245 247  
246 248 self.bottomBgView.addSubview(self.payBtn)
247 249 self.payBtn.setTitle("去赚积分", for: .normal)
... ... @@ -300,6 +302,17 @@ class CNLiveIntegralAlertTool:NSObject{
300 302 }
301 303 }
302 304  
  305 + //转换积分为xxx.W
  306 + func integralChangeW(pointCount:Int) -> String{
  307 + var pointStr = ""
  308 + if (pointCount >= 10000) {
  309 + pointStr = String(format: "%.2fW", CGFloat(pointCount)/10000.0)
  310 + }else{
  311 + pointStr = "\(pointCount)"
  312 + }
  313 + return pointStr
  314 + }
  315 +
303 316 // MARK: - BtnAction
304 317 @objc func bgBtnViewAction(){
305 318 self.hiddenIntegralAlert()
... ...
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
  View file @b36ba64
... ... @@ -109,56 +109,6 @@ class CNLiveAlbumCell:UITableViewCell{
109 109 }else{
110 110 aid = ""
111 111 }
112   -
113 112 navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
114   -
115   -// self.getAlbumList()
116 113 }
117   -
118   -// //获取专辑详情(简介等)
119   -// func getAlbumMsg(){
120   -// var aid = ""
121   -// if self.albumModel != nil{
122   -// aid = self.albumModel!.contentId
123   -// }else if self.albumMsgModel != nil{
124   -// aid = self.albumMsgModel!.albumId
125   -// }else{
126   -// aid = ""
127   -// }
128   -// CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
129   -// hiddenLoading()
130   -// if status == .success{
131   -// let model = result as! CNLiveAlbumMsgModel
132   -// for listModel in self.albumModelArr! {
133   -// listModel.albumMsgModel = model
134   -// }
135   -// navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
136   -// }else{
137   -//
138   -// }
139   -// }
140   -// }
141   -// //获取专辑视频列表详情(播放地址 ,点赞数等信息)
142   -// func getAlbumList(){
143   -// showLoading(message: "")
144   -// var aid = ""
145   -// if self.albumModel != nil{
146   -// aid = self.albumModel!.contentId
147   -// }else if self.albumMsgModel != nil{
148   -// aid = self.albumMsgModel!.albumId
149   -// }else{
150   -// aid = ""
151   -// }
152   -//
153   -// CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
154   -// hiddenLoading()
155   -// if status == .success{
156   -// let arr = result as! Array<CNLiveAlbumListModel>
157   -// self.albumModelArr = Array(arr)
158   -// self.getAlbumMsg()
159   -// }else{
160   -//
161   -// }
162   -// }
163   -// }
164 114 }
... ...