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

# Conflicts: # Podfile

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # Podfile
liushiyu
2 parents eed57490 196f8509
Showing 10 changed files with 135 additions and 20 deletions
Podfile
metaCode/Classes/Main/HomePage/ViewModel/CNLiveDownSlideViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShopConsoleViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShopDetailViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/GoodsManager/CNLiveShopGoodListViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/ShopClassify/CNLiveShopClassilyViewModel.swift
metaCode/Classes/Main/HomePage/ViewModel/ShopCoupon/CNLiveShopCouponViewModel.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Main/Util/CNLiveCommonManager.swift
@@ -53,9 +53,6 @@ target &#39;metaCode&#39; do
   pod 'ZFPlayer/ijkplayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
   #分享
   pod 'CNLiveShareToolKit'
-#  pod 'CNLiveTencentopenapi', :git => 'https://github.com/CNLiveiOSTeam/CNLiveTencentopenapi.git'
-#  pod 'CNLiveTencentopenapi'
-#  pod 'WechatOpenSDK'
   #网家家输入组件
   pod 'CNLiveCustomUI/CNLiveContentToolTextView'
   #业务工具库
@@ -28,6 +28,10 @@ class CNLiveDownSlideViewModel:NSObject{
         param.setValue(pageId, forKey: "pageId")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getPage", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -18,6 +18,10 @@ class CNLiveShopConsoleViewModel: NSObject {
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/isSellerNew", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -21,6 +21,10 @@ class CNLiveShopDetailViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/index", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -36,6 +36,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getGoodsList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -71,6 +75,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getGoodsList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -134,6 +142,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsAdd", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             let res = (result as! Dictionary<String, Any>)["code"] as! String
@@ -190,6 +202,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsEdit", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             let res = (result as! Dictionary<String, Any>)["code"] as! String
@@ -215,6 +231,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/goodsInfo", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -245,6 +265,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsEditAttr", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -267,6 +291,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/changeGoodsState", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -289,6 +317,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getGroup", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -318,6 +350,10 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/cateList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -26,6 +26,11 @@ class CNLiveShopClassilyViewModel: BaseModel{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/addCate", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -46,6 +51,11 @@ class CNLiveShopClassilyViewModel: BaseModel{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/cateList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -74,6 +84,11 @@ class CNLiveShopClassilyViewModel: BaseModel{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/editCate", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -94,6 +109,11 @@ class CNLiveShopClassilyViewModel: BaseModel{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/delCate", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -129,7 +129,11 @@ class CNLiveShopCouponViewModel:NSObject{
         param.setValue(receiveNum, forKey: "receive_number")
         param.setValue(totalNum, forKey: "num")
         param.setValue(goodsId, forKey: "goods_id")
-                
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
@@ -150,6 +154,11 @@ class CNLiveShopCouponViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/shopCouponList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -170,6 +179,11 @@ class CNLiveShopCouponViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/editCouponAttr", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -207,6 +221,11 @@ class CNLiveShopCouponViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/editCoupon", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -230,6 +249,11 @@ class CNLiveShopCouponViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/delCoupon", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -6,7 +6,7 @@
 //
 import Foundation
-
+import MJRefresh
 class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
     //下滑tableview背景颜色
@@ -62,9 +62,9 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     override func viewDidLoad() {
         super.viewDidLoad()
         self.view.backgroundColor = .white
-//        self.view.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         view.addSubview(tableView)
         tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-DownSlideBottomViewHeight-KStatusBarHeight)
+        self.addRefreshView()
         self.getHomePageConfigListApi()
     }
@@ -282,6 +282,11 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         return 0
     }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.getHomePageConfigListApi()
+        })
+    }
     //MARK: - 获取首页配置
     func getHomePageConfigListApi(){
         CNLiveHomePageViewModel.requestGetHomePageConfigList{ result, status in
@@ -317,6 +322,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                     //隐藏在追短剧cell
                     self.isHaveDuanJU = false
                 }
+                self.tableView.mj_header?.endRefreshing()
                 self.tableView.reloadData()
             }else{
@@ -343,7 +349,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                     }
                 }
                 self.dataArray.addObjects(from: newDataArray as! [Any])
-                
+                self.tableView.mj_header?.endRefreshing()
                 self.tableView.reloadData()
             }else if (status == .failed){
                 //                self.NetApiStatus = .apiError
@@ -15,6 +15,10 @@ class CNLiveHomePageViewModel:NSObject{
         let param = NSMutableDictionary()
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/commonApi/homePageConfigList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -41,6 +45,10 @@ class CNLiveHomePageViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseCMSUrl+"/contentApi/albumCollect", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -61,9 +69,12 @@ class CNLiveHomePageViewModel:NSObject{
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("\(page)", forKey: "page")
-
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/myAlbum", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -98,6 +109,10 @@ class CNLiveHomePageViewModel:NSObject{
 //        param.setValue("10", forKey: "pageSize")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getBlockContents", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -122,6 +137,11 @@ class CNLiveHomePageViewModel:NSObject{
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getAlbumMsg", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -149,6 +169,11 @@ class CNLiveHomePageViewModel:NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/ugcApi/albumList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -159,15 +184,6 @@ class CNLiveHomePageViewModel:NSObject{
                     let dataMdl = newDictionaryToModel(dataDic , CNLiveAlbumListBaseModel.self)
                     resultBlock(dataMdl,.success)
-//                    let dataDic = resp["data"] as! Dictionary<String, Any>
-//                    let dataList = dataDic["list"] as! Array<Any>
-//                    var listArr = Array<Any>()
-//                    for listDic in dataList{
-//                        let dataMdl = newDictionaryToModel(listDic as! [String : Any], CNLiveAlbumListModel.self)
-//                        listArr.append(dataMdl)
-//                    }
-//                    
-//                    resultBlock(listArr,.success)
                 }else{
                     resultBlock(NSNull(),.failed)
                 }
@@ -183,13 +199,13 @@ class CNLiveHomePageViewModel:NSObject{
         param.setValue(prdId, forKey: "prdId")
         param.setValue("apple", forKey: "frmId")
         param.setValue(CNLiveHomePageViewModel.getRandomOrderId(), forKey: "srvOrderId")
-        let customParam = NSMutableDictionary()
-        customParam.setValue(APPId, forKey: "appId")
-        customParam.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        let customParam = NSMutableDictionary()
+        customParam.setValue(APPId, forKey: "appId")
+        customParam.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setupCustomParam(customParam as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/pom/orderVideoByPoint", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
@@ -35,6 +35,10 @@ class CNLiveCommonManager: NSObject{
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/Api/Index3/get_time", param: nil, cacheType: .networkOnly) { task, result, error in
             if error == nil{
                 let res = (result as! NSDictionary)