Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit ecbfc465 by pierce
Options

修改域名

parent 412a90e8
Inline Side-by-side
Showing with 92 additions and 77 deletions
LocalPodSpec/GDRouter/GDRouter/Classes/Service/Module/GDLoginAndRegistRouter.swift
......@@ -13,10 +13,10 @@ import GDToolBox
public struct GDLoginWebPublicUrl {
/// 隐私政策
public static let userPrivacyAggrement = "https://yabolive.com/other/text/guodongTips.html"
public static let userPrivacyAggrement = "https://xiuse.ishuaji.cn/other/text/xsTips.html"
// 用户使用协议
public static let userAgreement = "http://zhibo.yazhai.co/agreement/comm.html"
public static let userAgreement = "https://xiuse.ishuaji.cn/other/text/comm.html"
}
public struct GDLoginAndRegistPublicUDKey {
......
LocalPodSpec/GDRouter/GDRouter/Classes/Service/Module/GDMyModuleRouter.swift
......@@ -104,7 +104,8 @@ public final class GDPersonalAuthModel: BaseModel, NetworkArrType {
public static func createArrFrom(_ json: JSON) -> [GDPersonalAuthModel] {
return json["result"].arrayValue
.map { GDPersonalAuthModel.createFrom($0) }
.filter { $0.key != .unknown }
.filter { $0.key != .unknown && $0.key != .wechat }
//TODO:添加微信认证: added By Pidan
}
public static func createFrom(_ json: JSON) -> GDPersonalAuthModel {
......
LocalPodSpec/GDToolBox/GDToolBox/Classes/Base/ImagePicker/Browser/GDImageBrowserController.swift
......@@ -67,7 +67,7 @@ public class GDImageBrowserController: BaseViewController {
}
/// 展示图片的 CollectionView
let collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
let collectionView = UICollectionView(frame: .init(x: 0, y: 0, width: GDScreen.width, height: GDScreen.height), collectionViewLayout: UICollectionViewFlowLayout())
/// 顶部 View
let topView = UIView(frame: .zero)
/// 返回按钮
......
LocalPodSpec/GDToolBox/GDToolBox/Classes/GDConfiguration.swift
......@@ -66,7 +66,7 @@ public struct GDAppConfig {
/// 货币名
public static let gd_goldName = "钻石"
/// 小券名
public static let gd_coinName = "果券"
public static let gd_coinName = "小券"
/// 魅力值名
public static let gd_charmName = "魅力"
/// 富豪值名
......
LocalPodSpec/GDToolBox/GDToolBox/Classes/Tool/UI/Extension/UIImageView.swift
......@@ -67,6 +67,11 @@ public extension UIImageView
completion?(.success(WebImageSuccess(image: self.image, cacheType: .disk, ImageUrl: URL(string: ""))))
return
}
if url.contains("/res/d37cbd95-c4d7-4fd4-ab14-d07580a0cba4.png") {
self.image = UIImage.appIcon
completion?(.success(WebImageSuccess(image: self.image, cacheType: .disk, ImageUrl: URL(string: ""))))
return
}
// 构建进度闭包
var kfProgress : DownloadProgressBlock?
......
Module/GDBaseBussiness/GDBaseBussiness.xcodeproj/project.pbxproj
......@@ -417,7 +417,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
......@@ -477,7 +477,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
......@@ -524,7 +524,7 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_INCLUDE_PATHS = "\"$(SRCROOT)/GDBaseBussiness/Module\"";
SWIFT_INCLUDE_PATHS = "\"$(SRCROOT)/GDBaseBussiness/Module\"/**";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
......@@ -559,14 +559,16 @@
PRODUCT_BUNDLE_IDENTIFIER = com.qs.live.ios.GDBaseBussiness;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
STRIP_STYLE = all;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_INCLUDE_PATHS = "\"$(SRCROOT)/GDBaseBussiness/Module\"";
SWIFT_INCLUDE_PATHS = "\"$(SRCROOT)/GDBaseBussiness/Module\"/**";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = NO;
};
name = Release;
};
......
Module/GDBaseBussiness/GDBaseBussiness/Network/GDBaseBussinessAPI.swift
......@@ -24,7 +24,7 @@ extension GDBaseBussinessAPI: TargetType {
var baseURL: URL {
switch self {
case .verifyVersionCode:
return URL(string: "http://openapi.lvdou66.com")!
return URL(string: "http://openapi.cxylive.top")!
default:
return URL(string: GDRouter.HostRouter?.apiAddress ?? "") ?? URL(fileURLWithPath: "")
}
......
Module/GDChatMessage/GDChatMessage/Features/InternalPushCenter/GDInternalPushCenter.swift
......@@ -43,7 +43,7 @@ class GDInternalPushCenter: BaseViewModel {
// GDWebView.cleanCache()
//
// let model = GDInternalPushMessageModel()
// model.content = "http://test.ybact.ishuaji.cn/eggplant/notice/index.html"
// model.content = "http://test.ybact.ygfhkj.cn/xs/notice/index.html"
// model.showTime = 300000
// model.extraMap = "{\"msg\":\"喔喔喔喔喔喔:开播了，我就像可乐一样，把你甜的冒泡\"}"
// self.pushMessage(message: model)
......
Module/GDChatMessage/GDChatMessage/Features/Message/Service/GDServiceController.swift
......@@ -42,12 +42,13 @@ class GDServiceController: BaseViewController {
super.makeUI()
self.title = "我的客服"
_ = self.setupNavigationButton(on: .right, title: "帮助", image: nil) {[weak self] in
guard let self = self else { return }
let helpVC = GDWebViewController(url: GDPersonalPublicWebURL.help)
helpVC.showShare = true
self.navigationController?.pushViewController(helpVC, animated: true)
}
// _ = self.setupNavigationButton(on: .right, title: "帮助", image: nil) {[weak self] in
// guard let self = self else { return }
// let helpVC = GDWebViewController(url: GDPersonalPublicWebURL.help)
// helpVC.showShare = true
// self.navigationController?.pushViewController(helpVC, animated: true)
// }
makeChatTableView()
......
Module/GDFriend/GDFriend/Features/GDFriendsCenter.swift
......@@ -223,7 +223,7 @@ class GDFriendsCenter: BaseViewModel {
FTIndicator.showProgress(withMessage: nil)
GDFriendHttpHelper.shared.checkFriendApply(for: fid).subscribe { model in
FTIndicator.dismissProgress()
if model.isreachbonds {
if model.isreachbonds || GDRouter.BaseBusinessRouter?.isCurrentVersionVerified.value == false {
// 达到要求，不需要送礼
let applyVC = GDFriendApplyViewController(with: fid, gid: nil)
vc.navigationController?.pushViewController(applyVC, animated: true)
......
Module/GDPayment/GDPayment/Feature/GDPaymentWebURL.swift
......@@ -11,11 +11,11 @@ import GDToolBox
struct GDPaymentWebURL {
/// 充值记录
static var rechargeRecord: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/eggplant/expenses/recharge.html") }
static var rechargeRecord: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/xs/expenses/recharge.html") }
/// 消费记录
static var consumeRecord: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/eggplant/expenses/trade.html") }
static var consumeRecord: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/xs/expenses/trade.html") }
/// 充值认证页面
static var rechargeRealNameAuth: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/eggplant/verification/index.html") }
static var rechargeRealNameAuth: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/xs/verification/index.html") }
}
Module/GDPersonalModule/GDPersonalModule/Features/Follower/GDMyPageFollowerController.swift
......@@ -91,26 +91,26 @@ class GDMyPageFollowerController: BaseViewController {
makeTableView()
makeEmptyView()
if viewModel.isMyFollow.value == true {
_ = self.setupNavigationButton(on: .right, title: nil, image: GDPersonalBundle.imageNamed("zone_right_more_black_icon")) {[weak self] in
_ = GDAlertView.showActionSheet(viewController: self, title: nil, message: nil, sheetTitles: ["全选", "取消全选"], cancleTitle: "取消") {/*[weak self]*/ index in
//TODO:Live: added By Pidan
// if index == 0 {
// self?.viewModel.setupAnchorLivePushNotification(open: true)
// } else if index == 1 {
// self?.viewModel.setupAnchorLivePushNotification(open: false)
// }
} cancleAction: {
}
}
}
//TODO:Live: added By Pidan
// if viewModel.isMyFollow.value == true {
// _ = self.setupNavigationButton(on: .right, title: nil, image: GDPersonalBundle.imageNamed("zone_right_more_black_icon")) {[weak self] in
//
// _ = GDAlertView.showActionSheet(viewController: self, title: nil, message: nil, sheetTitles: ["全选", "取消全选"], cancleTitle: "取消") {/*[weak self]*/ index in
//
// //TODO:Live: added By Pidan
//// if index == 0 {
//// self?.viewModel.setupAnchorLivePushNotification(open: true)
//// } else if index == 1 {
//// self?.viewModel.setupAnchorLivePushNotification(open: false)
//// }
//
// } cancleAction: {
//
// }
//
//
// }
// }
}
......
Module/GDPersonalModule/GDPersonalModule/GDPersonalConfigs.swift
......@@ -11,13 +11,13 @@ import GDToolBox
struct GDPersonalWebURL {
// 我的收益页面
static var webMyIncomeUrl: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/eggplant/couponDetails/index2.html") }
static var webMyIncomeUrl: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/xs/couponDetails/index2.html") }
// 绑定手机号码
static var bindPhone: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/eggplant/replacePhone/bindPhone.html") }
static var bindPhone: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/xs/replacePhone/bindPhone.html") }
/// 更换手机号码
static var changePhone: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/eggplant/replacePhone/index.html") }
static var changePhone: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/xs/replacePhone/index.html") }
// 注销账号页面
static var accountCancel: String { GDToolBoxPlugins.shared.apiPlugin.WEBH5("/sudoke/Logout.html") }
......
Module/GDTest/GDTest/Features/EnvConfig/GDEnvViewModel.swift
......@@ -71,7 +71,7 @@ class GDEnvViewModel: BaseViewModel, ViewModelType {
GDRouter.ChatRoom?.changeSDKKey(appKey: GDSDK.gd_hyphenateKey)
case .test:
UserDefaults.standard.setValue("http://test.api.lvdou66.com", forKey: GDHostManagerStore.Custom.apiAddress)
UserDefaults.standard.setValue("http://test.api.cxylive.top", forKey: GDHostManagerStore.Custom.apiAddress)
GDRouter.HostRouter?.checkCurrentDNSAdress()
......@@ -80,7 +80,7 @@ class GDEnvViewModel: BaseViewModel, ViewModelType {
GDRouter.ChatRoom?.changeSDKKey(appKey: GDSDK.gd_hyphenateTestKey)
case .preproduct:
UserDefaults.standard.setValue("https://zhibo.lvdou66.com/87server", forKey: GDHostManagerStore.Custom.apiAddress)
UserDefaults.standard.setValue("https://zhibo.cxylive.top/87server", forKey: GDHostManagerStore.Custom.apiAddress)
GDRouter.HostRouter?.checkCurrentDNSAdress()
......
Module/GDUserZoneModule/GDUserZoneModule/Feature/Zone/Main/View/InfoView/Info/ZoneInfoTableView/Cell/GDZoneInfoAuthCell.swift
......@@ -62,7 +62,8 @@ class GDZoneInfoAuthCell: UITableViewCell {
/// 隔线
private let lineView = UIView(frame: .zero)
/// 认证状态
private var authState = BehaviorRelay<[GDPersonalAuthType: Bool]>(value: [.idCard: false, .phone: false, .wechat: false])
//TODO:添加微信认证: added By Pidan
private var authState = BehaviorRelay<[GDPersonalAuthType: Bool]>(value: [.idCard: false, .phone: false])
private func makeTitleLabel() {
titleLabel.font = .gd_default(14)
......
Module/HostManager/HostManager/GDHostManager.swift
......@@ -48,14 +48,14 @@ public class GDHostManager {
// 是否允许自定义Api
if DevConfig.enableEditableAPI {
GDHostManager.apiAddress = userDefaults.string(forKey: GDHostManagerStore.Custom.apiAddress) ?? "https://zhibo.ishuaji.cn"
GDHostManager.imageDownUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.imageDownUrl) ?? "https://zhibocdn.ishuaji.cn/comm"
GDHostManager.accountsUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.accountsUrl) ?? "https://accounts.ishuaji.cn"
GDHostManager.webUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.webUrl) ?? "https://zhiboweb.lvdou66.com"
// GDHostManager.redPacketUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.redPacketUrl) ?? "http://money.lvdou66.com"
GDHostManager.payUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.payUrl) ?? "https://pay.ishuaji.cn"
GDHostManager.h5Url = userDefaults.string(forKey: GDHostManagerStore.Custom.h5Url) ?? "https://activity.ishuaji.cn"
GDHostManager.openapi = userDefaults.string(forKey: GDHostManagerStore.Custom.openapiUrl) ?? "https://openapi.lvdou66.com"
GDHostManager.apiAddress = userDefaults.string(forKey: GDHostManagerStore.Custom.apiAddress) ?? "https://zhibo.ygfhkj.cn"
GDHostManager.imageDownUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.imageDownUrl) ?? "https://zhibocdn.ygfhkj.cn/comm"
GDHostManager.accountsUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.accountsUrl) ?? "https://accounts.ygfhkj.cn"
GDHostManager.webUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.webUrl) ?? "https://zhiboweb.cxylive.top"
// GDHostManager.redPacketUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.redPacketUrl) ?? "http://money.cxylive.top"
GDHostManager.payUrl = userDefaults.string(forKey: GDHostManagerStore.Custom.payUrl) ?? "https://pay.ygfhkj.cn"
GDHostManager.h5Url = userDefaults.string(forKey: GDHostManagerStore.Custom.h5Url) ?? "https://activity.ygfhkj.cn"
GDHostManager.openapi = userDefaults.string(forKey: GDHostManagerStore.Custom.openapiUrl) ?? "https://openapi.cxylive.top"
// 如果有自定义API，那么返回
if let apiAddress : String = userDefaults.string(forKey: GDHostManagerStore.Custom.apiAddress) {
......@@ -89,10 +89,10 @@ public class GDHostManager {
if cdn != "" {
GDHostManager.imageDownUrl = "\(cdn)/comm"
} else {
GDHostManager.imageDownUrl = "https://zhibocdn.lvdou66.com/comm"
GDHostManager.imageDownUrl = "https://zhibocdn.cxylive.top/comm"
}
} else {
GDHostManager.imageDownUrl = "https://zhibocdn.lvdou66.com/comm"
GDHostManager.imageDownUrl = "https://zhibocdn.cxylive.top/comm"
}
if let lvdou : String = currentApiDic["lvdou"] as? String {
......@@ -148,24 +148,24 @@ public class GDHostManager {
if apiArray.count == 0 {
// 如果有API数据，那么加载数据
var basicServer1 = Dictionary<String, Any>()
basicServer1["api"] = "https://zhibo.lvdou66.com"
basicServer1["cdn"] = "https://zhibocdn.lvdou66.com"
basicServer1["pay"] = "https://pay.lvdou66.com"
basicServer1["web"] = "https://zhiboweb.lvdou66.com"
basicServer1["redpacket"] = "http://money.lvdou66.com"
basicServer1["lvdou"] = "https://accounts.lvdou66.com"
basicServer1["h5"] = "https://activity.ishuaji.cn"
basicServer1["openapi"] = "https://openapi.lvdou66.com"
basicServer1["api"] = "https://zhibo.cxylive.top"
basicServer1["cdn"] = "https://zhibocdn.cxylive.top"
basicServer1["pay"] = "https://pay.cxylive.top"
basicServer1["web"] = "https://zhiboweb.cxylive.top"
basicServer1["redpacket"] = "http://money.cxylive.top"
basicServer1["lvdou"] = "https://accounts.cxylive.top"
basicServer1["h5"] = "https://activity.ygfhkj.cn"
basicServer1["openapi"] = "https://openapi.cxylive.top"
var basicServer2 = Dictionary<String, Any>()
basicServer2["api"] = "https://zhibo.ishuaji.cn"
basicServer2["api"] = "https://zhibo.ygfhkj.cn"
basicServer2["cdn"] = "https://bpgs1.yabolive.co"
basicServer2["pay"] = "https://pay.ishuaji.com"
basicServer2["web"] = "https://zhiboweb.ishuaji.com"
basicServer2["redpacket"] = "http://money.ishuaji.com"
basicServer2["lvdou"] = "https://accounts.ishuaji.com"
basicServer2["h5"] = "https://activity.ishuaji.cn"
basicServer2["openapi"] = "https://openapi.lvdou66.com"
basicServer2["pay"] = "https://pay.cxylive.top"
basicServer2["web"] = "https://zhiboweb.cxylive.top"
basicServer2["redpacket"] = "http://money.cxylive.top"
basicServer2["lvdou"] = "https://accounts.cxylive.top"
basicServer2["h5"] = "https://activity.ygfhkj.cn"
basicServer2["openapi"] = "https://openapi.cxylive.top"
GDHostManager.apiArray = [basicServer1, basicServer2]
......@@ -212,10 +212,10 @@ public class GDHostManager {
if cdn != "" {
currentimageDownUrl = "\(cdn)/comm"
} else {
currentimageDownUrl = "https://zhibocdn.lvdou66.com/comm"
currentimageDownUrl = "https://zhibocdn.cxylive.top/comm"
}
} else {
currentimageDownUrl = "https://zhibocdn.lvdou66.com/comm"
currentimageDownUrl = "https://zhibocdn.cxylive.top/comm"
}
if let lvdou : String = currentApiDic["lvdou"] as? String {
......@@ -288,10 +288,10 @@ public class GDHostManager {
if cdn != "" {
GDHostManager.imageDownUrl = "\(cdn)/comm"
} else {
GDHostManager.imageDownUrl = "https://zhibocdn.lvdou66.com/comm"
GDHostManager.imageDownUrl = "https://zhibocdn.cxylive.top/comm"
}
} else {
GDHostManager.imageDownUrl = "https://zhibocdn.lvdou66.com/comm"
GDHostManager.imageDownUrl = "https://zhibocdn.cxylive.top/comm"
}
if let lvdou : String = currentApiDic["lvdou"] as? String {
......
Pods/SwiftyJSON/Source/SwiftyJSON/SwiftyJSON.swift
......@@ -789,7 +789,12 @@ extension JSON {
public var stringValue: String {
get {
switch type {
case .string: return object as? String ?? ""
case .string:
var result = (object as? String) ?? ""
result = result.replacingOccurrences(of: "果冻", with: "羞涩")
result = result.replacingOccurrences(of: "果券", with: "小券")
result = result.replacingOccurrences(of: "直播", with: "")
return result as? String ?? ""
case .number: return rawNumber.stringValue
case .bool: return (object as? Bool).map { String($0) } ?? ""
default: return ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment