From: memory <496663675@qq.com> Date: Sun, 4 Jan 2026 06:11:54 +0000 (+0800) Subject: 去掉fspage X-Git-Tag: 1.0.2~10 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5bc8fe4cf2e4eb194c19b229980de23acd99d8d9;p=mirrors%2FShenYin.git 去掉fspage --- diff --git a/DeepChordsSdk_iOS/DeepChordsSdk/Example/DeepChordsSdk/DeepChordsAiSdk.swift b/DeepChordsSdk_iOS/DeepChordsSdk/Example/DeepChordsSdk/DeepChordsAiSdk.swift index 764d4ff..6fb1e27 100644 --- a/DeepChordsSdk_iOS/DeepChordsSdk/Example/DeepChordsSdk/DeepChordsAiSdk.swift +++ b/DeepChordsSdk_iOS/DeepChordsSdk/Example/DeepChordsSdk/DeepChordsAiSdk.swift @@ -12,6 +12,12 @@ public class DeepChordsAiSdk{ public var sdkLog:String{ return StarburstConfig.shared().logPath } + public var isDebug:Bool = false{ + didSet{ + StarburstConfig.shared().isDebug = true + DCLogger.isDebug = isDebug + } + } public func initSDK(){ diff --git a/ShenYin/Podfile.lock b/ShenYin/Podfile.lock index 41468f3..4142efd 100644 --- a/ShenYin/Podfile.lock +++ b/ShenYin/Podfile.lock @@ -3,7 +3,6 @@ PODS: - DeviceKit (5.4.0) - DGActivityIndicatorView (2.1.1) - FDFullscreenPopGesture (1.1) - - FSPagerView (0.8.3) - HandyJSON (5.0.2) - HorizonCalendar (2.0.0) - IQKeyboardCore (1.0.5) @@ -74,7 +73,6 @@ DEPENDENCIES: - DeviceKit (~> 5.4.0) - DGActivityIndicatorView - FDFullscreenPopGesture - - FSPagerView - HandyJSON - HorizonCalendar - IQKeyboardManagerSwift @@ -101,7 +99,6 @@ SPEC REPOS: - DeviceKit - DGActivityIndicatorView - FDFullscreenPopGesture - - FSPagerView - HandyJSON - HorizonCalendar - IQKeyboardCore @@ -134,7 +131,6 @@ SPEC CHECKSUMS: DeviceKit: bd34bb1766d926c3cc5a5f6e3e9a6dd10148b805 DGActivityIndicatorView: ff2c76073d79692f724863c8dd38685866a03cb6 FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0 - FSPagerView: 670405b2f18e2a87fa37f20b00de783e562c25a8 HandyJSON: 9e4e236f5d2dbefad5155a77417bbea438201c03 HorizonCalendar: 21e600058a8f4d407c79ef7848beda692c53a484 IQKeyboardCore: 28c8bf3bcd8ba5aa1570b318cbc4da94b861711e @@ -157,11 +153,11 @@ SPEC CHECKSUMS: SwiftHTTP: e94f1aa8cde58637dcc0100f6349de31a3337fde TabPageViewController: 8bd4104909754416b35a98f3b72a5b674ab20dd5 TZImagePickerController: 456f470b5dea97b37226ec7a694994a8663340b2 - WechatOpenSDK-XCFramework: b072030c9eeee91dfff1856a7846f70f7b9a88ed + WechatOpenSDK-XCFramework: ff342ae616bb86df3d236aca38059dfd4bc4a949 YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 YYText: 5c461d709e24d55a182d1441c41dc639a18a4849 ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966 -PODFILE CHECKSUM: 87954e486402a1632c7a36a7dd707cf603014401 +PODFILE CHECKSUM: 170365f9acea11a62fa72e8f7904f6acb237a166 COCOAPODS: 1.16.2 diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index 810b0f0..e2fdcbf 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -205,14 +205,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks.sh\"\n"; diff --git a/ShenYin/ShenYin/Api/LogManager.swift b/ShenYin/ShenYin/Api/LogManager.swift index 8735333..f61e054 100644 --- a/ShenYin/ShenYin/Api/LogManager.swift +++ b/ShenYin/ShenYin/Api/LogManager.swift @@ -9,7 +9,7 @@ import Foundation /// 日记管理 class Logger { - static var isDebug: Bool = true + static var isDebug: Bool = false fileprivate static let shared = Logger() private var fileHandle:FileHandle? diff --git a/ShenYin/ShenYin/Sdk/DcSdk/DcSdkManager.swift b/ShenYin/ShenYin/Sdk/DcSdk/DcSdkManager.swift index 134d673..f8266cc 100644 --- a/ShenYin/ShenYin/Sdk/DcSdk/DcSdkManager.swift +++ b/ShenYin/ShenYin/Sdk/DcSdk/DcSdkManager.swift @@ -13,6 +13,7 @@ class DcSdkManager{ func initSdk(){ DeepChordsAiSdk.shared.initSDK() + DeepChordsAiSdk.shared.isDebug = false DeepChordsAiSdk.shared.authCallback = {[weak self] (code,msg)in DCLogger.debug(code,msg) guard let self = self else{return} diff --git a/ShenYin/ShenYin/Sdk/DcSdk/DcStereo.swift b/ShenYin/ShenYin/Sdk/DcSdk/DcStereo.swift index cdef7de..7687035 100644 --- a/ShenYin/ShenYin/Sdk/DcSdk/DcStereo.swift +++ b/ShenYin/ShenYin/Sdk/DcSdk/DcStereo.swift @@ -45,7 +45,8 @@ class DcStereo:NSObject{ } DCCallRecord.shared.filePathCallBack = { [weak self] path in guard let self = self else{return} - if selfText.isEmpty || otherText.isEmpty { + Logger.debug("文件路径opus ==",path) + if selfText.isEmpty && otherText.isEmpty { return } guard let path = path,path.isNotEmpty else{ @@ -53,6 +54,7 @@ class DcStereo:NSObject{ } let path1 = OpusTool.opusFile(toWAVFile: path) guard let wavPath = DCFolder.recordFileResave(srcPath: path1) else{return} + Logger.debug("文件路径wav ==",wavPath) recordFinish?(wavPath) } diff --git a/ShenYin/ShenYin/UI/Mine/Root/MineBannerView.swift b/ShenYin/ShenYin/UI/Mine/Root/MineBannerView.swift index b2b3e13..90e1243 100644 --- a/ShenYin/ShenYin/UI/Mine/Root/MineBannerView.swift +++ b/ShenYin/ShenYin/UI/Mine/Root/MineBannerView.swift @@ -8,117 +8,118 @@ import Foundation import UIKit -import FSPagerView +//import FSPagerView final class MineBannerView: BaseView { private var dataArray = [BannerModel]() - private let pagerView = FSPagerView() - private let pageControl = FSPageControl() - + // private let pagerView = FSPagerView() + // private let pageControl = FSPageControl() + public func config(list:[BannerModel]) { self.dataArray = list - self.pageControl.numberOfPages = dataArray.count - self.pagerView.reloadData() - } - override func setupLayout() { - addSubview(pagerView) - addSubview(pageControl) - - pagerView.snp.makeConstraints { (m) in - m.top.bottom.equalToSuperview() - m.left.right.equalToSuperview() - } - pageControl.snp.makeConstraints { (m) in - m.width.equalToSuperview() - m.height.equalTo(25) - m.bottom.equalToSuperview() - m.centerX.equalToSuperview() - } - } - override func setupViews() { - backgroundColor = .clear - clipsToBounds = true - pagerView.do { v in - v.dataSource = self - v.delegate = self - v.interitemSpacing = 18 - v.bounces = false - v.isInfinite = true - v.automaticSlidingInterval = 4 - v.itemSize = CGSize(width: kScreenWid - 36 , height: 126) - v.register(PictureViewCell.self, forCellWithReuseIdentifier: "PictureViewCell") - } - - pageControl.do { v in - v.contentHorizontalAlignment = .center - v.hidesForSinglePage = true - v.setFillColor(UIColor.white.withAlphaComponent(0.4), for: .normal) - v.setFillColor(.white, for: .selected) - } - config(list: BannerCache.shared.get()) +// self.pageControl.numberOfPages = dataArray.count +// self.pagerView.reloadData() } } - -extension MineBannerView: FSPagerViewDataSource, FSPagerViewDelegate { - func numberOfItems(in pagerView: FSPagerView) -> Int { - return dataArray.count - } - - func pagerView(_ pagerView: FSPagerView, cellForItemAt index: Int) -> FSPagerViewCell { - let cell = pagerView.dequeueReusableCell(withReuseIdentifier: "PictureViewCell", at: index) as! PictureViewCell - let model = dataArray[index] - cell.picture.kf.setImage(with: model.cover.yc.asUrl) - return cell - } - - func pagerViewWillEndDragging(_ pagerView: FSPagerView, targetIndex: Int) { - self.pageControl.currentPage = targetIndex - } - func pagerViewDidEndScrollAnimation(_ pagerView: FSPagerView) { - self.pageControl.currentPage = pagerView.currentIndex - } - - func pagerView(_ pagerView: FSPagerView, didSelectItemAt index: Int){ - let model = dataArray[index] -// if model.jumpType == 0 { -// if let url = model.jumpValue.fragmentUrl { -// let request = URLRequest(url: url) -// let params = BaseWebViewParams(request:request) -// let vc = BaseWebViewController(initData: params) -// UIViewController.yc.currentNav?.pushViewController(vc, animated: true) -// } //UIApplication.shared.canOpenURL(URL(string: )) +// override func setupLayout() { +// addSubview(pagerView) +// addSubview(pageControl) +// +// pagerView.snp.makeConstraints { (m) in +// m.top.bottom.equalToSuperview() +// m.left.right.equalToSuperview() // } - HttpClient.request(.bannerClick(bannerId: model.id)) { (model:BannerModelRoot,res) in - } - - guard let url = model.url.yc.asUrl else{ - return - } - UIApplication.shared.open(url) - } -} - +// pageControl.snp.makeConstraints { (m) in +// m.width.equalToSuperview() +// m.height.equalTo(25) +// m.bottom.equalToSuperview() +// m.centerX.equalToSuperview() +// } +// } +// override func setupViews() { +// backgroundColor = .clear +// clipsToBounds = true +// pagerView.do { v in +// v.dataSource = self +// v.delegate = self +// v.interitemSpacing = 18 +// v.bounces = false +// v.isInfinite = true +// v.automaticSlidingInterval = 4 +// v.itemSize = CGSize(width: kScreenWid - 36 , height: 126) +// v.register(PictureViewCell.self, forCellWithReuseIdentifier: "PictureViewCell") +// } +// +// pageControl.do { v in +// v.contentHorizontalAlignment = .center +// v.hidesForSinglePage = true +// v.setFillColor(UIColor.white.withAlphaComponent(0.4), for: .normal) +// v.setFillColor(.white, for: .selected) +// } +// config(list: BannerCache.shared.get()) +// } +//} +// +//extension MineBannerView: FSPagerViewDataSource, FSPagerViewDelegate { +// func numberOfItems(in pagerView: FSPagerView) -> Int { +// return dataArray.count +// } +// +// func pagerView(_ pagerView: FSPagerView, cellForItemAt index: Int) -> FSPagerViewCell { +// let cell = pagerView.dequeueReusableCell(withReuseIdentifier: "PictureViewCell", at: index) as! PictureViewCell +// let model = dataArray[index] +// cell.picture.kf.setImage(with: model.cover.yc.asUrl) +// return cell +// } +// +// func pagerViewWillEndDragging(_ pagerView: FSPagerView, targetIndex: Int) { +// self.pageControl.currentPage = targetIndex +// } +// func pagerViewDidEndScrollAnimation(_ pagerView: FSPagerView) { +// self.pageControl.currentPage = pagerView.currentIndex +// } +// +// func pagerView(_ pagerView: FSPagerView, didSelectItemAt index: Int){ +// let model = dataArray[index] +//// if model.jumpType == 0 { +//// if let url = model.jumpValue.fragmentUrl { +//// let request = URLRequest(url: url) +//// let params = BaseWebViewParams(request:request) +//// let vc = BaseWebViewController(initData: params) +//// UIViewController.yc.currentNav?.pushViewController(vc, animated: true) +//// } //UIApplication.shared.canOpenURL(URL(string: )) +//// } +// HttpClient.request(.bannerClick(bannerId: model.id)) { (model:BannerModelRoot,res) in +// } +// +// guard let url = model.url.yc.asUrl else{ +// return +// } +// UIApplication.shared.open(url) +// } +//} -fileprivate class PictureViewCell: FSPagerViewCell { - let picture = UIImageView() - - override init(frame: CGRect) { - super.init(frame: frame) - - addSubview(picture) - - picture.snp.makeConstraints { (m) in - m.edges.equalToSuperview() - } - - picture.do { (v) in - v.yc.setCornerRadius(8) - } -// picture.backgroundColor = .lightGray - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } -} +// +//fileprivate class PictureViewCell: FSPagerViewCell { +// let picture = UIImageView() +// +// override init(frame: CGRect) { +// super.init(frame: frame) +// +// addSubview(picture) +// +// picture.snp.makeConstraints { (m) in +// m.edges.equalToSuperview() +// } +// +// picture.do { (v) in +// v.yc.setCornerRadius(8) +// } +//// picture.backgroundColor = .lightGray +// } +// +// required init?(coder aDecoder: NSCoder) { +// fatalError("init(coder:) has not been implemented") +// } +//} diff --git a/ShenYin/podfile b/ShenYin/podfile index c8a160c..8ffa418 100644 --- a/ShenYin/podfile +++ b/ShenYin/podfile @@ -20,7 +20,7 @@ target 'ShenYin' do pod 'SVProgressHUD'#蒙版 pod 'MBProgressHUD'#蒙版 pod 'Kingfisher', '~> 6.0'#图片下载K - pod 'FSPagerView' +# pod 'FSPagerView' pod "TabPageViewController" #tabpage pod 'JXSegmentedView' pod 'JXPagingView/Paging'