积分显示为 x.xxW

张旭
1 parent 3c3a8430
Showing 3 changed files with 19 additions and 56 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
@@ -2183,7 +2183,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2206,7 +2206,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2228,7 +2228,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2251,7 +2251,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -209,7 +209,8 @@ class CNLiveIntegralAlertTool:NSObject{
             self.bottomBgView.addSubview(self.balanceIntegralLabel)
-            self.balanceIntegralLabel.text = String(format: "余额%d积分", self.point)
+            let pointStr = self.integralChangeW(pointCount: self.point)
+            self.balanceIntegralLabel.text = String(format: "余额%@积分", pointStr)
             self.bottomBgView.addSubview(self.payBtn)
             self.payBtn.setTitle("确认支付", for: .normal)
@@ -241,7 +242,8 @@ class CNLiveIntegralAlertTool:NSObject{
             self.integralCountLabel.attributedText = priceAttri
             self.bottomBgView.addSubview(self.balanceIntegralLabel)
-            self.balanceIntegralLabel.text = String(format: "余额%d积分   积分不足", self.point)
+            let pointStr = self.integralChangeW(pointCount: self.point)
+            self.balanceIntegralLabel.text = String(format: "余额%@积分   积分不足", pointStr)
             self.bottomBgView.addSubview(self.payBtn)
             self.payBtn.setTitle("去赚积分", for: .normal)
@@ -300,6 +302,17 @@ class CNLiveIntegralAlertTool:NSObject{
         }
     }
+    //转换积分为xxx.W
+    func integralChangeW(pointCount:Int) -> String{
+        var pointStr = ""
+        if (pointCount >= 10000) {
+            pointStr = String(format: "%.2fW", CGFloat(pointCount)/10000.0)
+        }else{
+            pointStr = "\(pointCount)"
+        }
+        return pointStr
+    }
+    
     // MARK: - BtnAction
     @objc func bgBtnViewAction(){
         self.hiddenIntegralAlert()
@@ -109,56 +109,6 @@ class CNLiveAlbumCell:UITableViewCell{
         }else{
             aid = ""
         }
-
         navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
-
-//        self.getAlbumList()
     }
-    
-//    //获取专辑详情(简介等)
-//    func getAlbumMsg(){
-//        var aid = ""
-//        if self.albumModel != nil{
-//            aid = self.albumModel!.contentId
-//        }else if self.albumMsgModel != nil{
-//            aid = self.albumMsgModel!.albumId
-//        }else{
-//            aid = ""
-//        }
-//        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
-//            hiddenLoading()
-//            if status == .success{
-//                let model = result as! CNLiveAlbumMsgModel
-//                for listModel in self.albumModelArr! {
-//                    listModel.albumMsgModel = model
-//                }
-//                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
-//            }else{
-//                
-//            }
-//        }
-//    }
-//    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
-//    func getAlbumList(){
-//        showLoading(message: "")
-//        var aid = ""
-//        if self.albumModel != nil{
-//            aid = self.albumModel!.contentId
-//        }else if self.albumMsgModel != nil{
-//            aid = self.albumMsgModel!.albumId
-//        }else{
-//            aid = ""
-//        }
-//        
-//        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
-//            hiddenLoading()
-//            if status == .success{
-//                let arr = result as! Array<CNLiveAlbumListModel>
-//                self.albumModelArr = Array(arr)
-//                self.getAlbumMsg()
-//            }else{
-//                
-//            }
-//        }
-//    }
 }