Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit 0eec0b2f by pierce
Options

fixed bugs

parent b80ef0b8
Inline Side-by-side
Showing with 53 additions and 21 deletions
LocalPodSpec/GDToolBox/GDToolBox/Classes/Tool/UI/Refresh/GDRefreshFooter.h
......@@ -5,7 +5,7 @@
// Created by pierce on 2024/1/17.
//
#import <MJRefresh/MJRefreshBackFooter.h>
#import <MJRefresh/MJRefresh.h>
NS_ASSUME_NONNULL_BEGIN
......
LocalPodSpec/GDToolBox/GDToolBox/Classes/Tool/UI/Refresh/MJRefresh.swift
......@@ -8,10 +8,60 @@
import RxSwift
import RxCocoa
import MJRefresh
//对MJRefreshComponent增加rx扩展
public extension Reactive where Base: MJRefreshComponent {
public extension Reactive where Base: GDRefreshHeader {
/// 正在刷新事件
public var refreshing: ControlEvent<Void> {
let source: Observable<Void> = Observable.create {
[weak control = self.base] observer in
if let control = control {
control.refreshingBlock = {
observer.on(.next(()))
}
}
return Disposables.create()
}
return ControlEvent(events: source)
}
/// 停止刷新
public var endRefreshing: Binder<Bool> {
return Binder(base) { refresh, isEnd in
if isEnd {
refresh.endRefreshing()
}
}
}
/// MJRefreshComponent 状态
public var state : ControlProperty<MJRefreshState> {
let observable : Observable<MJRefreshState> = Observable.create { [weak refresh = base] observer in
guard let refresh = refresh else {
observer.on(.completed)
return Disposables.create()
}
observer.on(.next(refresh.state))
refresh.refreshingBlock = {
observer.on(.next(refresh.state))
}
return Disposables.create()
}
let bindingObserver : Binder<MJRefreshState> = Binder(base) { (refresh, state) in
refresh.state = state
}
return ControlProperty<MJRefreshState>(values: observable, valueSink: bindingObserver)
}
}
//对MJRefreshComponent增加rx扩展
public extension Reactive where Base: GDRefreshFooter {
/// 正在刷新事件
public var refreshing: ControlEvent<Void> {
......
Module/GDBaseBussiness/GDBaseBussiness.xcodeproj/project.pbxproj
......@@ -19,7 +19,6 @@
BEDB6DE02B4FEED0000B2451 /* GDBaseBussinessProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDB6DDD2B4FEED0000B2451 /* GDBaseBussinessProvider.swift */; };
BEDB6DE12B4FEED0000B2451 /* GDBaseBussinessAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDB6DDE2B4FEED0000B2451 /* GDBaseBussinessAPI.swift */; };
BEE4709C2B5FC78400940BF5 /* GDWebviewPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEE4709B2B5FC78400940BF5 /* GDWebviewPlugin.swift */; };
BEFB6A6A2BCE957300292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A692BCE957300292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -236,7 +235,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A6A2BCE957300292741 /* Info.plist in Resources */,
BE83C5712B8F3A2E00C040E0 /* BaseBussiness.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDChatMessage/GDChatMessage.xcodeproj/project.pbxproj
......@@ -95,7 +95,6 @@
BEC738FE2B63A896006391D3 /* GDInternalPushSingleChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC738FB2B63A895006391D3 /* GDInternalPushSingleChatView.swift */; };
BEC739002B63B2B9006391D3 /* GDChatMessageNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC738FF2B63B2B9006391D3 /* GDChatMessageNotification.swift */; };
BECDD3D42B63C17900EE3649 /* GDChatMessageSocketSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECDD3D32B63C17900EE3649 /* GDChatMessageSocketSender.swift */; };
BEFB6A5E2BCE951B00292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A5D2BCE951B00292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -996,7 +995,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A5E2BCE951B00292741 /* Info.plist in Resources */,
BEC7381A2B627D5B006391D3 /* GDChatMessage.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDFriend/GDFriend.xcodeproj/project.pbxproj
......@@ -31,7 +31,6 @@
BEE4710A2B611ADF00940BF5 /* GDFriendApplyGiftCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEE470F92B611ADF00940BF5 /* GDFriendApplyGiftCell.swift */; };
BEE4710B2B611ADF00940BF5 /* GDFriendApplyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEE470FA2B611ADF00940BF5 /* GDFriendApplyViewController.swift */; };
BEE471162B61211C00940BF5 /* GDFriend.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BEE471152B61211C00940BF5 /* GDFriend.xcassets */; };
BEFB6A602BCE952B00292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A5F2BCE952B00292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -420,7 +419,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A602BCE952B00292741 /* Info.plist in Resources */,
BEE471162B61211C00940BF5 /* GDFriend.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDLoginAndRegistModule/GDLoginAndRegistModule.xcodeproj/project.pbxproj
......@@ -39,7 +39,6 @@
BED30A3A2B5527A80044EA1A /* LoginAndRegist.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BED30A392B5527A80044EA1A /* LoginAndRegist.xcassets */; };
BED30A3C2B5535AE0044EA1A /* GDLoginBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = BED30A3B2B5535AE0044EA1A /* GDLoginBundle.swift */; };
BEDB6DD82B4FE395000B2451 /* GDQuickVerifyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDB6DD72B4FE395000B2451 /* GDQuickVerifyHelper.swift */; };
BEFB6A6C2BCE959100292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A6B2BCE959100292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -493,7 +492,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A6C2BCE959100292741 /* Info.plist in Resources */,
BED30A3A2B5527A80044EA1A /* LoginAndRegist.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDMoment/GDMoment.xcodeproj/project.pbxproj
......@@ -56,7 +56,6 @@
BEFB6A582BCE70F600292741 /* GDPostMomentTopicSelectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEFB6A472BCE70F500292741 /* GDPostMomentTopicSelectCell.swift */; };
BEFB6A592BCE70F600292741 /* GDPostMomentTopicSelectController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEFB6A492BCE70F500292741 /* GDPostMomentTopicSelectController.swift */; };
BEFB6A5A2BCE70F600292741 /* GDPostMomentTopicSelectViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEFB6A4B2BCE70F500292741 /* GDPostMomentTopicSelectViewModel.swift */; };
BEFB6A5C2BCE950D00292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A5B2BCE950D00292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -751,7 +750,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A5C2BCE950D00292741 /* Info.plist in Resources */,
BECDD3F32B67B6C700EE3649 /* GDMoment.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDPayment/GDPayment.xcodeproj/project.pbxproj
......@@ -21,7 +21,6 @@
BEC896122B59300C00224730 /* GDPaymentWebURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC896112B59300C00224730 /* GDPaymentWebURL.swift */; };
BEF18E342B90971B00BA83D8 /* GDPaymentBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEF18E332B90971B00BA83D8 /* GDPaymentBundle.swift */; };
BEF18E362B90988D00BA83D8 /* GDPayment.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BEF18E312B9096D700BA83D8 /* GDPayment.xcassets */; };
BEFB6A662BCE955900292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A652BCE955900292741 /* Info.plist */; };
FDD4F2D1BC478E890F6DCFEF /* Pods_GDPayment.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7867BE910C0FBF35DE77B661 /* Pods_GDPayment.framework */; };
/* End PBXBuildFile section */
......@@ -305,7 +304,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A662BCE955900292741 /* Info.plist in Resources */,
BEF18E362B90988D00BA83D8 /* GDPayment.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDPersonalModule/GDPersonalModule.xcodeproj/project.pbxproj
......@@ -63,7 +63,6 @@
BEE470982B5FA6CC00940BF5 /* GDOpenPasswordController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEE4707E2B5FA6CC00940BF5 /* GDOpenPasswordController.swift */; };
BEE4709E2B5FCEF000940BF5 /* GDThirdAccountInfoStruct.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEE4709D2B5FCEF000940BF5 /* GDThirdAccountInfoStruct.swift */; };
BEEDDC4E2B5BB14F00AD9FEA /* FollowViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEDDC4D2B5BB14F00AD9FEA /* FollowViewModel.swift */; };
BEFB6A622BCE953A00292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A612BCE953900292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -836,7 +835,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A622BCE953A00292741 /* Info.plist in Resources */,
BE8041DE2B5B7D4D00E2FCB4 /* Personal.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDTabbar/GDTabbar.xcodeproj/project.pbxproj
......@@ -18,7 +18,6 @@
BE84EC302B56799300DB8883 /* GDTabBarItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE84EC2B2B56799300DB8883 /* GDTabBarItemView.swift */; };
BE84EC312B56799300DB8883 /* GDTabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE84EC2C2B56799300DB8883 /* GDTabBarView.swift */; };
BE84EC322B56799300DB8883 /* GDTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE84EC2D2B56799300DB8883 /* GDTabBarViewController.swift */; };
BEFB6A682BCE956500292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A672BCE956500292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -269,7 +268,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A682BCE956500292741 /* Info.plist in Resources */,
BE83C5662B8EE0B000C040E0 /* GDTabbar.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Module/GDUserZoneModule/GDUserZoneModule.xcodeproj/project.pbxproj
......@@ -49,7 +49,6 @@
BE80EBC32B5911C700FA0245 /* GDReportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE80EBC12B5911C700FA0245 /* GDReportViewController.swift */; };
BE80EBC42B5911C700FA0245 /* GDReportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE80EBC22B5911C700FA0245 /* GDReportViewModel.swift */; };
BED66A3D2B57B20300D24CF1 /* GDUserZoneModule.h in Headers */ = {isa = PBXBuildFile; fileRef = BED66A3C2B57B20300D24CF1 /* GDUserZoneModule.h */; settings = {ATTRIBUTES = (Public, ); }; };
BEFB6A642BCE954800292741 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEFB6A632BCE954800292741 /* Info.plist */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -554,7 +553,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEFB6A642BCE954800292741 /* Info.plist in Resources */,
BE8041AF2B5B796000E2FCB4 /* UserZone.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
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