Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

# Conflicts: # metaCode.xcodeproj/project.pbxproj # metaCode/Classes/Other/AppDelegate.swift

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode.xcodeproj/project.pbxproj # metaCode/Classes/Other/AppDelegate.swift
liushiyu
2 parents 5870efa8 24ecf2bb
Showing 8 changed files with 192 additions and 74 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNCollectMoneyCodeView.swift → metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/CNTopCollectMoneyRemindView.swift → metaCode/Classes/Main/HomePage/View/CNDownSlideViewRemindView.swift
metaCode/Classes/Main/HomePage/View/CNPayMoneyCodeView.swift → metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
metaCode/Classes/Main/HomePage/View/CNBottomPayMoneyRemindView.swift → metaCode/Classes/Main/HomePage/View/CNUpSlideViewRemindView.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -49,6 +49,7 @@
 		79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
 		7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */; };
 		7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */; };
+		7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */; };
 		7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
 		7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */; };
 		7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */; };
@@ -56,11 +57,11 @@
 		7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
 		7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */; };
 		7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
-		7CD6753C2A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift */; };
+		7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */; };
 		7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
-		7CD6753E2A2740B0008354C1 /* CNPayMoneyCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675392A2740B0008354C1 /* CNPayMoneyCodeView.swift */; };
-		7CD6753F2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD6753A2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift */; };
-		7CD675402A2740B0008354C1 /* CNCollectMoneyCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD6753B2A2740B0008354C1 /* CNCollectMoneyCodeView.swift */; };
+		7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675392A2740B0008354C1 /* CNUpSlideView.swift */; };
+		7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */; };
+		7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */; };
 		7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */; };
 		7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675442A274167008354C1 /* NewPagedFlowView.m */; };
 		7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675462A274167008354C1 /* PGIndexBannerSubiew.m */; };
@@ -138,6 +139,7 @@
 		79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoAlertView.swift; sourceTree = "<group>"; };
 		7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNCertificationView.swift; sourceTree = "<group>"; };
 		7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGlobalBlock.swift; sourceTree = "<group>"; };
+		7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveEnvironment.swift; sourceTree = "<group>"; };
 		7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
 		7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBar+CNBadge.swift"; sourceTree = "<group>"; };
 		7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageBackgroupView.swift; sourceTree = "<group>"; };
@@ -147,11 +149,11 @@
 		7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
 		7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
 		7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
-		7CD675372A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNBottomPayMoneyRemindView.swift; sourceTree = "<group>"; };
+		7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNUpSlideViewRemindView.swift; sourceTree = "<group>"; };
 		7CD675382A2740B0008354C1 /* CNMainView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNMainView.swift; sourceTree = "<group>"; };
-		7CD675392A2740B0008354C1 /* CNPayMoneyCodeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNPayMoneyCodeView.swift; sourceTree = "<group>"; };
-		7CD6753A2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNTopCollectMoneyRemindView.swift; sourceTree = "<group>"; };
-		7CD6753B2A2740B0008354C1 /* CNCollectMoneyCodeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNCollectMoneyCodeView.swift; sourceTree = "<group>"; };
+		7CD675392A2740B0008354C1 /* CNUpSlideView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNUpSlideView.swift; sourceTree = "<group>"; };
+		7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNDownSlideViewRemindView.swift; sourceTree = "<group>"; };
+		7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNDownSlideView.swift; sourceTree = "<group>"; };
 		7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNCustomIndexView.swift; sourceTree = "<group>"; };
 		7CD675432A274167008354C1 /* PGIndexBannerSubiew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PGIndexBannerSubiew.h; sourceTree = "<group>"; };
 		7CD675442A274167008354C1 /* NewPagedFlowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewPagedFlowView.m; sourceTree = "<group>"; };
@@ -308,6 +310,7 @@
 		7963988A2A260B3300D045EB /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				7C2703342A3AFD130061EC50 /* Environment */,
 				7C2703312A36CC430061EC50 /* GlobalBlock */,
 				798A44F32A3077ED00815935 /* CustomView */,
 				790D01832A2D89E100C5978D /* Extensions */,
@@ -441,6 +444,14 @@
 			path = GlobalBlock;
 			sourceTree = "<group>";
 		};
+		7C2703342A3AFD130061EC50 /* Environment */ = {
+			isa = PBXGroup;
+			children = (
+				7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */,
+			);
+			path = Environment;
+			sourceTree = "<group>";
+		};
 		7CD675212A26F844008354C1 /* HomePage */ = {
 			isa = PBXGroup;
 			children = (
@@ -453,11 +464,11 @@
 		7CD675232A26F8F8008354C1 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				7CD675372A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift */,
-				7CD6753B2A2740B0008354C1 /* CNCollectMoneyCodeView.swift */,
+				7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */,
+				7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */,
 				7CD675382A2740B0008354C1 /* CNMainView.swift */,
-				7CD675392A2740B0008354C1 /* CNPayMoneyCodeView.swift */,
-				7CD6753A2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift */,
+				7CD675392A2740B0008354C1 /* CNUpSlideView.swift */,
+				7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */,
 				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
 				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
 				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
@@ -807,6 +818,9 @@
 				7CD6753E2A2740B0008354C1 /* CNPayMoneyCodeView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNCollectMoneyCodeView.swift in Sources */,
 				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
+				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
+				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
+				7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
 				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
@@ -834,8 +848,8 @@
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
 				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
-				7CD6753F2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift in Sources */,
-				7CD6753C2A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift in Sources */,
+				7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */,
+				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
 				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
+//
+//  CNLiveEnvironment.swift
+//  metaCode
+//
+//  Created by daojian on 2023/6/15.
+//
+
+import Foundation
+
+///当前应用的APPID
+let APPId: String  = CNLiveEnvironmentManager.shared.appId
+///当前应用的APPKey
+let APPKey: String = CNLiveEnvironmentManager.shared.appKey
+///当前应用的网络请求域名
+let APPBaseUrl: String! = CNLiveEnvironmentManager.shared.baseUrl
+
+
+///当前APP的环境
+let APPCurrentEnvironment: CNLiveEnvironment = CNLiveEnvironmentManager.shared.currentEnvironment
+
+///是否是开发环境
+let IsDevEnvironment: Bool = (CNLiveEnvironmentManager.shared.currentEnvironment == .development)
+///是否是testFlight 环境
+let IsTestFlightEnvironment: Bool = (CNLiveEnvironmentManager.shared.currentEnvironment == .testFlight)
+///是否是线上环境
+let IsProductionEnvironment: Bool = (CNLiveEnvironmentManager.shared.currentEnvironment == .production)
+
+///APP 环境类型
+enum CNLiveEnvironment {
+    ///开发环境
+    case development
+    ///testFlight 环境
+    case testFlight
+    ///线上环境
+    case production
+    
+}
+
+class CNLiveEnvironmentManager: NSObject{
+    
+    //单例类
+    static let shared = CNLiveEnvironmentManager()
+    
+    var appId: String
+    var appKey: String
+    var baseUrl: String
+    
+    ///当前环境
+    var currentEnvironment: CNLiveEnvironment
+    
+    //重新init方法为私有,不让外部调用
+    private override init() {
+        self.appId = ""
+        self.appKey = ""
+        self.baseUrl = ""
+        self.currentEnvironment = .development
+    }
+    //重新copy 和 mutableCopy 方法
+    override func copy() -> Any {
+        return self
+    }
+    
+    override func mutableCopy() -> Any {
+        return self
+    }
+    
+    //配置环境
+    func setupEnvironment(environment: CNLiveEnvironment){
+        
+        self.currentEnvironment = environment
+        
+        switch environment {
+        case .development:
+            self.developmentEnvironment()
+        case .testFlight:
+            self.testFlightEnvironment()
+        case .production:
+            self.productionEnvironment()
+        }
+    }
+    
+    //开发环境配置
+    func developmentEnvironment(){
+        self.appId = "802_li40qhp922"
+        self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
+        self.baseUrl = "https://api.cnlive.com"
+    }
+    //testFlight 环境配置
+    func testFlightEnvironment(){
+        self.appId = "802_li40qhp922"
+        self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
+        self.baseUrl = "https://api.cnlive.com"
+    }
+    //production 生产环境配置
+    func productionEnvironment(){
+        self.appId = "802_li40qhp922"
+        self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
+        self.baseUrl = "https://api.cnlive.com"
+    }
+    
+}
@@ -136,9 +136,9 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         return mainView
     }()
-    ///收钱view
-    lazy var collectMoneyCodeView: CNCollectMoneyCodeView = {
-        let collectionView = CNCollectMoneyCodeView.init(frame: CGRectMake(-25, 0, self.frame.size.width + 50, self.frame.size.height))
+    ///下滑显示的VIew
+    lazy var downSlideView: CNDownSlideView = {
+        let collectionView = CNDownSlideView.init(frame: CGRectMake(-25, 0, self.frame.size.width + 50, self.frame.size.height))
         collectionView.backAction = {[weak self] in
             self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
             self?.superScrollView?.isScrollEnabled = true
@@ -146,33 +146,33 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             let time = DispatchTime.now() + 0.5
             DispatchQueue.main.asyncAfter(deadline:time, execute: DispatchWorkItem(block: {
                 //下滑提醒View回到初始位置
-                self?.topCollectMoneyRemindView.top = -((self?.topCollectMoneyRemindView.height)! + 50)
+                self?.downSlideViewRemindView.top = -((self?.downSlideViewRemindView.height)! + 50)
             }))
         }
         return collectionView
     }()
-    ///付钱view
-    lazy var payMoneyCodeView : CNPayMoneyCodeView = {
-        let payMoneyCodeView = CNPayMoneyCodeView(frame: CGRectMake(-25, self.frame.size.height*2 + 120,self.frame.size.width+50, self.frame.size.height - 120))
+    ///上滑显示的View
+    lazy var upSlideView : CNUpSlideView = {
+        let upSlideView = CNUpSlideView(frame: CGRectMake(-25, self.frame.size.height*2 + 120,self.frame.size.width+50, self.frame.size.height - 120))
-        return payMoneyCodeView
+        return upSlideView
     }()
-    ///上滑付钱提醒view
-    lazy var bottomPayMoneyRemindView: CNBottomPayMoneyRemindView = {
+    ///上滑提醒view
+    lazy var upSlideViewRemindView: CNUpSlideViewRemindView = {
         let W: CGFloat = UIScreen.main.bounds.width-100
         let H: CGFloat = W/2
-        let bottomView = CNBottomPayMoneyRemindView.init(frame: CGRectMake(25, self.height, W,H))
+        let bottomView = CNUpSlideViewRemindView.init(frame: CGRectMake(25, self.height, W,H))
         bottomView.backgroundColor = UIColor.clear 
         return bottomView
     }()
-    /// 下滑收钱提醒view
-    lazy var topCollectMoneyRemindView:CNTopCollectMoneyRemindView = {
+    /// 下滑提醒view
+    lazy var downSlideViewRemindView:CNDownSlideViewRemindView = {
         let W: CGFloat = UIScreen.main.bounds.width-100
         let H: CGFloat = W/2
-        let topView = CNTopCollectMoneyRemindView.init(frame: CGRectMake(25, -H - 50, W,H))
+        let topView = CNDownSlideViewRemindView.init(frame: CGRectMake(25, -H - 50, W,H))
         topView.backgroundColor = .clear
         return topView
@@ -184,6 +184,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         topNavView.alpha = 0
         topNavView.closeAction = { [weak self ] in
             self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true)
+            self?.superScrollView?.isScrollEnabled = true
         }
         return topNavView
     }()
@@ -200,22 +201,21 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     // MARK: - 添加UI
     func initUI(){
-        self.addSubview(self.bottomPayMoneyRemindView)
-        self.addSubview(self.topCollectMoneyRemindView)
+        self.addSubview(self.upSlideViewRemindView)
+        self.addSubview(self.downSlideViewRemindView)
         self.addSubview(self.baseScrollView)
         self.addSubview(self.topNavView)
         self.topNavView.setTitleString(title: "志愿者")
-        self.baseScrollView.addSubview(self.collectMoneyCodeView)
+        self.baseScrollView.addSubview(self.downSlideView)
         self.baseScrollView.addSubview(self.mainView)
-        self.baseScrollView.addSubview(self.payMoneyCodeView)
+        self.baseScrollView.addSubview(self.upSlideView)
         //默认偏移到中间
         self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: false)
     }
-//    // MARK: - 手势
 //    func addCustomGestureRecognizer(){
 //        let singleTap: UITapGestureRecognizer = UITapGestureRecognizer.init(target: self, action: #selector(singleCellTapAction))
 //
@@ -272,36 +272,36 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         //当self.baseScrollView的偏移量大于 self.baseScrollView.height时,显示上滑提醒view
         if(currentOffset > self.baseScrollView.height){
-            self.bottomPayMoneyRemindView.top =  self.height - (currentOffset - self.baseScrollView.height)*1.5
+            self.upSlideViewRemindView.top =  self.height - (currentOffset - self.baseScrollView.height)*1.5
         }
-        //上滑滑动到临近值,让bottomPayMoneyRemindView位置一直停留在底部,并慢慢消失
-        if (self.bottomPayMoneyRemindView.top < self.height - self.bottomPayMoneyRemindView.height) {
-            /**让bottomPayMoneyRemindView位置一直停留在底部*/
-            self.bottomPayMoneyRemindView.top = self.height - self.bottomPayMoneyRemindView.height
+        //上滑滑动到临近值,让upSlideViewRemindView位置一直停留在底部,并慢慢消失
+        if (self.upSlideViewRemindView.top < self.height - self.upSlideViewRemindView.height) {
+            /**让upSlideViewRemindView位置一直停留在底部*/
+            self.upSlideViewRemindView.top = self.height - self.upSlideViewRemindView.height
-            /**渐渐隐藏bottomPayMoneyRemindView,缓冲距离为20*/
-            let bottomPayMoneyRemindViewMaxOffset: CGFloat = self.baseScrollView.height+self.bottomPayMoneyRemindView.height
-            self.bottomPayMoneyRemindView.alpha = (20-(currentOffset - bottomPayMoneyRemindViewMaxOffset))/20.00
+            /**渐渐隐藏upSlideViewRemindView,缓冲距离为20*/
+            let upSlideViewRemindViewMaxOffset: CGFloat = self.baseScrollView.height+self.upSlideViewRemindView.height
+            self.upSlideViewRemindView.alpha = (20-(currentOffset - upSlideViewRemindViewMaxOffset))/20.00
         }
         //当self.baseScrollView的偏移量小于 self.baseScrollView.height时,显示下滑提醒view
         if(currentOffset < self.baseScrollView.height){
-            self.topCollectMoneyRemindView.bottom = (self.baseScrollView.height - currentOffset)*1.5
+            self.downSlideViewRemindView.bottom = (self.baseScrollView.height - currentOffset)*1.5
         }
-        //下滑滑动到临近值,让topCollectMoneyRemindView位置一直停留在顶部,并慢慢消失
-        if (self.topCollectMoneyRemindView.bottom > self.topCollectMoneyRemindView.height) {
+        //下滑滑动到临近值,让downSlideViewRemindView位置一直停留在顶部,并慢慢消失
+        if (self.downSlideViewRemindView.bottom > self.downSlideViewRemindView.height) {
-            /**让topCollectMoneyRemindView位置一直停留在底部*/
-            self.topCollectMoneyRemindView.bottom = self.topCollectMoneyRemindView.height
+            /**让downSlideViewRemindView位置一直停留在底部*/
+            self.downSlideViewRemindView.bottom = self.downSlideViewRemindView.height
-            /**渐渐隐藏topCollectMoneyRemindView,缓冲距离为20*/
-            let topCollectMoneyRemindViewMinOffset: CGFloat = self.baseScrollView.height-self.topCollectMoneyRemindView.height
-            self.topCollectMoneyRemindView.alpha = (20-(topCollectMoneyRemindViewMinOffset - currentOffset))/20.00
+            /**渐渐隐藏downSlideViewRemindView,缓冲距离为20*/
+            let downSlideViewRemindViewMinOffset: CGFloat = self.baseScrollView.height-self.downSlideViewRemindView.height
+            self.downSlideViewRemindView.alpha = (20-(downSlideViewRemindViewMinOffset - currentOffset))/20.00
-            //让系统及时更新topCollectMoneyRemindView
-//            self.topCollectMoneyRemindView.setNeedsLayout()
-//            self.topCollectMoneyRemindView.layoutIfNeeded()
+            //让系统及时更新downSlideViewRemindView
+//            self.downSlideViewRemindView.setNeedsLayout()
+//            self.downSlideViewRemindView.layoutIfNeeded()
         }
@@ -331,10 +331,10 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             self.topNavView.alpha = 0
         }
-        //隐藏collectMoneyCodeView的bottomView
+        //隐藏downSlideView的bottomView
         if scrollView.contentOffset.y > 10{
-            self.collectMoneyCodeView.bottomView.isHidden = true
-            self.collectMoneyCodeView.contentView.backgroundColor = .clear
+            self.downSlideView.bottomView.isHidden = true
+            self.downSlideView.contentView.backgroundColor = .clear
         }
         delegate?.customIndexViewDidScroll(scrollView: self.baseScrollView)
@@ -360,9 +360,9 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         if scrollView.contentOffset.y == 0{
-            //滚动到第一页,显示collectMoneyCodeView的底部view
-            self.collectMoneyCodeView.bottomView.isHidden = false
-            self.collectMoneyCodeView.contentView.backgroundColor = KVCBackgroupColor
+            //滚动到第一页,显示downSlideView的底部view
+            self.downSlideView.bottomView.isHidden = false
+            self.downSlideView.contentView.backgroundColor = KVCBackgroupColor
         }
@@ -370,7 +370,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         self.bringSubviewToFront(self.topNavView)
         //下滑提醒View回到初始位置
-        self.topCollectMoneyRemindView.top = -(self.topCollectMoneyRemindView.height + 50)
+        self.downSlideViewRemindView.top = -(self.downSlideViewRemindView.height + 50)
         //外部代理
         self.delegate?.customIndexViewDidEndScroll(scrollView: scrollView)
 //
-//  CNCollectMoneyCodeView.swift
+//  CNDownSlideView.swift
 //  metaCode
 //
 //  Created by daojian on 2023/5/30.
@@ -11,8 +11,8 @@ import YYCategories
 typealias backBlock = ()->Void;
-///收钱码View
-class CNCollectMoneyCodeView:UIView{
+///下滑显示的View
+class CNDownSlideView:UIView{
     //返回首页
     var backAction:backBlock?
 //
-//  CNTopCollectMoneyRemindView.swift
+//  CNDownSlideViewRemindView.swift
 //  metaCode
 //
 //  Created by daojian on 2023/5/31.
@@ -8,8 +8,8 @@
 import Foundation
 import YYCategories
-///收钱下拉显示提醒View
-class CNTopCollectMoneyRemindView : UIView{
+///下滑显示提醒View
+class CNDownSlideViewRemindView : UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.initUI()
 //
-//  CNPayMoneyCodeView.swift
+//  CNUpSlideView.swift
 //  metaCode
 //
 //  Created by daojian on 2023/5/31.
@@ -9,8 +9,8 @@ import Foundation
 import YYCategories
 import WebKit
-///付钱码view
-class CNPayMoneyCodeView:UIView{
+///上滑显示的VIew
+class CNUpSlideView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.initUI()
 //
-//  CNBottomPayMoneyRemindView.swift
+//  CNUpSlideViewRemindView.swift
 //  metaCode
 //
 //  Created by daojian on 2023/5/31.
@@ -8,8 +8,8 @@
 import Foundation
 import YYCategories
-/// 底部付钱上拉显示提醒View
-class CNBottomPayMoneyRemindView:UIView{
+/// 上拉显示提醒View
+class CNUpSlideViewRemindView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -18,6 +18,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Override point for customization after application launch.
+        //设置APP环境
+        CNLiveEnvironmentManager.shared.setupEnvironment(environment: .development)
+        
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = KVCBackgroupColor
         let is_login = UserDefaults.standard.bool(forKey: "is_login")
@@ -48,13 +51,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let kAppBundleID = Bundle.main.bundleIdentifier ?? ""
         let uuid : String = UIDevice.current.identifierForVendor?.uuidString.replacingOccurrences(of: "-", with: "") ?? ""
         let ver : String = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
-        let p : Dictionary = ["platform_id":kAppBundleID,"uuid":uuid,"plat":"i","ver":ver,"appId":"802_li40qhp922","timestamp":String(NSNumber(floatLiteral: Date().timeIntervalSince1970).intValue),"clientPlat":"i","frmId":"ios"]
+        let p : Dictionary = ["platform_id":kAppBundleID,"uuid":uuid,"plat":"i","ver":ver,"appId":APPId,"timestamp":String(NSNumber(floatLiteral: Date().timeIntervalSince1970).intValue),"clientPlat":"i","frmId":"ios"]
         CNLiveNetworking.setupDefaultParam(p)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupSignKey("ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac")
+        CNLiveNetworking.setupSignKey(APPKey)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setResponseSerializerType(.JSON)
-        CNLiveNetworking.setupBaseURL("https://api.cnlive.com")
+        CNLiveNetworking.setupBaseURL(APPBaseUrl)
     }