Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Open iOS
BJLiveUI
Commits
23c03819
Commit
23c03819
authored
Dec 28, 2018
by
戴曦嘉
Browse files
demo update
parent
f7db89a3
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
115 additions
and
78 deletions
+115
-78
demo-swift/BJLiveUISwiftDemo.xcodeproj/project.pbxproj
demo-swift/BJLiveUISwiftDemo.xcodeproj/project.pbxproj
+38
-14
demo-swift/BJLiveUISwiftDemo/AppDelegate.swift
demo-swift/BJLiveUISwiftDemo/AppDelegate.swift
+1
-1
demo-swift/BJLiveUISwiftDemo/BJLoginView.swift
demo-swift/BJLiveUISwiftDemo/BJLoginView.swift
+26
-15
demo-swift/BJLiveUISwiftDemo/BJLoginViewController.swift
demo-swift/BJLiveUISwiftDemo/BJLoginViewController.swift
+1
-1
demo-swift/BJLiveUISwiftDemo/NSObject+SwiftObserver.h
demo-swift/BJLiveUISwiftDemo/NSObject+SwiftObserver.h
+6
-6
demo-swift/BJLiveUISwiftDemo/NSObject+SwiftObserver.m
demo-swift/BJLiveUISwiftDemo/NSObject+SwiftObserver.m
+6
-6
demo-swift/Podfile
demo-swift/Podfile
+9
-8
demo-swift/Podfile.lock
demo-swift/Podfile.lock
+9
-8
demo/BJLiveUI.xcodeproj/project.pbxproj
demo/BJLiveUI.xcodeproj/project.pbxproj
+4
-4
demo/Podfile
demo/Podfile
+6
-7
demo/Podfile.lock
demo/Podfile.lock
+9
-8
No files found.
demo-swift/BJLiveUISwiftDemo.xcodeproj/project.pbxproj
View file @
23c03819
...
...
@@ -245,24 +245,26 @@
isa
=
PBXProject
;
attributes
=
{
LastSwiftUpdateCheck
=
0830
;
LastUpgradeCheck
=
083
0
;
LastUpgradeCheck
=
101
0
;
ORGANIZATIONNAME
=
"Baijia Cloud"
;
TargetAttributes
=
{
DFD129A51EF2960600A74BBF
=
{
CreatedOnToolsVersion
=
8.3.3
;
DevelopmentTeam
=
999368SJ2Y
;
LastSwiftMigration
=
083
0
;
LastSwiftMigration
=
101
0
;
ProvisioningStyle
=
Automatic
;
};
DFD129B91EF2960600A74BBF
=
{
CreatedOnToolsVersion
=
8.3.3
;
DevelopmentTeam
=
999368SJ2Y
;
LastSwiftMigration
=
1010
;
ProvisioningStyle
=
Automatic
;
TestTargetID
=
DFD129A51EF2960600A74BBF
;
};
DFD129C41EF2960600A74BBF
=
{
CreatedOnToolsVersion
=
8.3.3
;
DevelopmentTeam
=
999368SJ2Y
;
LastSwiftMigration
=
1010
;
ProvisioningStyle
=
Automatic
;
TestTargetID
=
DFD129A51EF2960600A74BBF
;
};
...
...
@@ -386,7 +388,7 @@
);
runOnlyForDeploymentPostprocessing
=
0
;
shellPath
=
/bin/sh
;
shellScript
=
../..
/BJLiveBase/script/ClearArchsFromFrameworks.sh
;
shellScript
=
Pods
/BJLiveBase/script/ClearArchsFromFrameworks.sh
;
showEnvVarsInLog
=
0
;
};
C4FA765FCBDF971B275E1716
/* [CP] Check Pods Manifest.lock */
=
{
...
...
@@ -423,7 +425,7 @@
);
runOnlyForDeploymentPostprocessing
=
0
;
shellPath
=
/bin/sh
;
shellScript
=
"../..
/BJLiveCore/frameworks/EmbedFrameworks.sh
../../BJLiveCore/frameworks"
;
shellScript
=
Pods
/BJLiveCore/frameworks/EmbedFrameworks.sh
;
showEnvVarsInLog
=
0
;
};
DCE2777E0E04D96BF23A3BEE
/* [CP] Copy Pods Resources */
=
{
...
...
@@ -433,8 +435,8 @@
);
inputPaths
=
(
"${SRCROOT}/Pods/Target Support Files/Pods-BJLiveUISwiftDemo/Pods-BJLiveUISwiftDemo-resources.sh"
,
"${PODS_ROOT}/
../..
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLiveUI.bundle"
,
"${PODS_ROOT}/
../..
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLInteractiveClass.bundle"
,
"${PODS_ROOT}/
BJLiveUI
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLiveUI.bundle"
,
"${PODS_ROOT}/
BJLiveUI
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLInteractiveClass.bundle"
,
"${PODS_CONFIGURATION_BUILD_DIR}/QBImagePickerController/QBImagePicker.bundle"
,
);
name
=
"[CP] Copy Pods Resources"
;
...
...
@@ -523,15 +525,23 @@
CLANG_CXX_LIBRARY
=
"libc++"
;
CLANG_ENABLE_MODULES
=
YES
;
CLANG_ENABLE_OBJC_ARC
=
YES
;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING
=
YES
;
CLANG_WARN_BOOL_CONVERSION
=
YES
;
CLANG_WARN_COMMA
=
YES
;
CLANG_WARN_CONSTANT_CONVERSION
=
YES
;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS
=
YES
;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_DOCUMENTATION_COMMENTS
=
YES
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION
=
YES
;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF
=
YES
;
CLANG_WARN_OBJC_LITERAL_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_RANGE_LOOP_ANALYSIS
=
YES
;
CLANG_WARN_STRICT_PROTOTYPES
=
YES
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
...
...
@@ -554,7 +564,7 @@
GCC_WARN_UNINITIALIZED_AUTOS
=
YES_AGGRESSIVE
;
GCC_WARN_UNUSED_FUNCTION
=
YES
;
GCC_WARN_UNUSED_VARIABLE
=
YES
;
IPHONEOS_DEPLOYMENT_TARGET
=
10.3
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.0
;
MTL_ENABLE_DEBUG_INFO
=
YES
;
ONLY_ACTIVE_ARCH
=
YES
;
SDKROOT
=
iphoneos
;
...
...
@@ -574,15 +584,23 @@
CLANG_CXX_LIBRARY
=
"libc++"
;
CLANG_ENABLE_MODULES
=
YES
;
CLANG_ENABLE_OBJC_ARC
=
YES
;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING
=
YES
;
CLANG_WARN_BOOL_CONVERSION
=
YES
;
CLANG_WARN_COMMA
=
YES
;
CLANG_WARN_CONSTANT_CONVERSION
=
YES
;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS
=
YES
;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_DOCUMENTATION_COMMENTS
=
YES
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION
=
YES
;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF
=
YES
;
CLANG_WARN_OBJC_LITERAL_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_RANGE_LOOP_ANALYSIS
=
YES
;
CLANG_WARN_STRICT_PROTOTYPES
=
YES
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
...
...
@@ -599,7 +617,7 @@
GCC_WARN_UNINITIALIZED_AUTOS
=
YES_AGGRESSIVE
;
GCC_WARN_UNUSED_FUNCTION
=
YES
;
GCC_WARN_UNUSED_VARIABLE
=
YES
;
IPHONEOS_DEPLOYMENT_TARGET
=
10.3
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.0
;
MTL_ENABLE_DEBUG_INFO
=
NO
;
SDKROOT
=
iphoneos
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Owholemodule"
;
...
...
@@ -621,7 +639,8 @@
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_OBJC_BRIDGING_HEADER
=
"BJLiveUISwiftDemo/BJLiveUISwiftDemo-Bridging-Header.h"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_VERSION
=
3.0
;
SWIFT_SWIFT3_OBJC_INFERENCE
=
Default
;
SWIFT_VERSION
=
4.2
;
};
name
=
Debug
;
};
...
...
@@ -637,7 +656,8 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.baijiacloud.BJLiveUISwiftDemo
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_OBJC_BRIDGING_HEADER
=
"BJLiveUISwiftDemo/BJLiveUISwiftDemo-Bridging-Header.h"
;
SWIFT_VERSION
=
3.0
;
SWIFT_SWIFT3_OBJC_INFERENCE
=
Default
;
SWIFT_VERSION
=
4.2
;
};
name
=
Release
;
};
...
...
@@ -652,7 +672,8 @@
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.baijiacloud.BJLiveUISwiftDemoTests
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
3.0
;
SWIFT_SWIFT3_OBJC_INFERENCE
=
On
;
SWIFT_VERSION
=
4.2
;
TEST_HOST
=
"$(BUILT_PRODUCTS_DIR)/BJLiveUISwiftDemo.app/BJLiveUISwiftDemo"
;
};
name
=
Debug
;
...
...
@@ -668,7 +689,8 @@
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.baijiacloud.BJLiveUISwiftDemoTests
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
3.0
;
SWIFT_SWIFT3_OBJC_INFERENCE
=
On
;
SWIFT_VERSION
=
4.2
;
TEST_HOST
=
"$(BUILT_PRODUCTS_DIR)/BJLiveUISwiftDemo.app/BJLiveUISwiftDemo"
;
};
name
=
Release
;
...
...
@@ -683,7 +705,8 @@
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.baijiacloud.BJLiveUISwiftDemoUITests
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
3.0
;
SWIFT_SWIFT3_OBJC_INFERENCE
=
On
;
SWIFT_VERSION
=
4.2
;
TEST_TARGET_NAME
=
BJLiveUISwiftDemo
;
};
name
=
Debug
;
...
...
@@ -698,7 +721,8 @@
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.baijiacloud.BJLiveUISwiftDemoUITests
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
3.0
;
SWIFT_SWIFT3_OBJC_INFERENCE
=
On
;
SWIFT_VERSION
=
4.2
;
TEST_TARGET_NAME
=
BJLiveUISwiftDemo
;
};
name
=
Release
;
...
...
demo-swift/BJLiveUISwiftDemo/AppDelegate.swift
View file @
23c03819
...
...
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var
window
:
UIWindow
?
func
application
(
_
application
:
UIApplication
,
didFinishLaunchingWithOptions
launchOptions
:
[
UIApplicationLaunchOptionsKey
:
Any
]?)
->
Bool
{
func
application
(
_
application
:
UIApplication
,
didFinishLaunchingWithOptions
launchOptions
:
[
UIApplication
.
LaunchOptionsKey
:
Any
]?)
->
Bool
{
// Override point for customization after application launch.
self
.
window
=
UIWindow
.
init
(
frame
:
UIScreen
.
main
.
bounds
)
self
.
window
?
.
backgroundColor
=
UIColor
.
white
...
...
demo-swift/BJLiveUISwiftDemo/BJLoginView.swift
View file @
23c03819
...
...
@@ -32,7 +32,7 @@ class BJLoginView: UIView {
private
func
makeSubViews
()
{
// backgroundView
let
backgroundView
=
UIImageView
.
init
()
backgroundView
.
contentMode
=
UIViewContentMode
.
scaleAspectFill
backgroundView
.
contentMode
=
UIView
.
ContentMode
.
scaleAspectFill
backgroundView
.
image
=
UIImage
.
init
(
named
:
"login-bg"
)
self
.
backgroundView
=
backgroundView
self
.
addSubview
(
self
.
backgroundView
!
)
...
...
@@ -74,9 +74,9 @@ class BJLoginView: UIView {
doneButton
.
layer
.
masksToBounds
=
true
doneButton
.
layer
.
cornerRadius
=
2.0
doneButton
.
titleLabel
?
.
font
=
UIFont
.
systemFont
(
ofSize
:
16.0
)
doneButton
.
setTitleColor
(
UIColor
.
white
,
for
:
UIControlState
.
normal
)
doneButton
.
setTitleColor
(
UIColor
.
init
(
white
:
1.0
,
alpha
:
0.5
),
for
:
UIControlState
.
disabled
)
doneButton
.
setTitle
(
"登录"
,
for
:
UIControlState
.
normal
)
doneButton
.
setTitleColor
(
UIColor
.
white
,
for
:
UIControl
.
State
.
normal
)
doneButton
.
setTitleColor
(
UIColor
.
init
(
white
:
1.0
,
alpha
:
0.5
),
for
:
UIControl
.
State
.
disabled
)
doneButton
.
setTitle
(
"登录"
,
for
:
UIControl
.
State
.
normal
)
self
.
doneButton
=
doneButton
self
.
addSubview
(
self
.
doneButton
)
}
...
...
@@ -93,22 +93,22 @@ class BJLoginView: UIView {
_
=
self
.
inputContainerView
?
.
mas_makeConstraints
({
(
make
:
MASConstraintMaker
!
)
in
make
.
centerX
.
equalTo
()(
self
)
make
.
bottom
.
equalTo
()(
self
.
mas_centerY
)?
.
offset
()(
-
32.0
)
make
.
left
.
right
()
.
equalTo
()(
self
)?
.
with
()
.
insets
()(
UIEdgeInsets
Make
(
0.0
,
15.0
,
0.0
,
15.0
))
make
.
left
.
right
()
.
equalTo
()(
self
)?
.
with
()
.
insets
()(
UIEdgeInsets
.
init
(
top
:
0.0
,
left
:
15.0
,
bottom
:
0.0
,
right
:
15.0
))
make
.
height
.
equalTo
()(
100.0
)
})
_
=
self
.
inputSeparatorLine
?
.
mas_makeConstraints
({
(
make
:
MASConstraintMaker
!
)
in
make
.
center
.
equalTo
()(
self
.
inputContainerView
)
make
.
left
.
right
()
.
equalTo
()(
self
.
inputContainerView
)?
.
with
()
.
insets
()(
UIEdgeInsets
Make
(
0.0
,
margin
,
0.0
,
margin
))
make
.
left
.
right
()
.
equalTo
()(
self
.
inputContainerView
)?
.
with
()
.
insets
()(
UIEdgeInsets
.
init
(
top
:
0.0
,
left
:
margin
,
bottom
:
0.0
,
right
:
margin
))
make
.
height
.
equalTo
()(
1.0
/
UIScreen
.
main
.
scale
)
})
_
=
self
.
codeTextField
.
mas_makeConstraints
({
(
make
:
MASConstraintMaker
!
)
in
make
.
top
.
left
()
.
right
()
.
equalTo
()(
self
.
inputContainerView
)?
.
with
()
.
insets
()(
UIEdgeInsets
Make
(
0.0
,
12.0
,
0.0
,
12.0
))
make
.
top
.
left
()
.
right
()
.
equalTo
()(
self
.
inputContainerView
)?
.
with
()
.
insets
()(
UIEdgeInsets
.
init
(
top
:
0.0
,
left
:
12.0
,
bottom
:
0.0
,
right
:
12.0
))
})
_
=
self
.
nameTextField
.
mas_makeConstraints
({
(
make
:
MASConstraintMaker
!
)
in
make
.
bottom
.
left
()
.
right
()
.
equalTo
()(
self
.
inputContainerView
)?
.
with
()
.
insets
()(
UIEdgeInsets
Make
(
0.0
,
12.0
,
0.0
,
12.0
))
make
.
bottom
.
left
()
.
right
()
.
equalTo
()(
self
.
inputContainerView
)?
.
with
()
.
insets
()(
UIEdgeInsets
.
init
(
top
:
0.0
,
left
:
12.0
,
bottom
:
0.0
,
right
:
12.0
))
make
.
top
.
equalTo
()(
self
.
codeTextField
.
mas_bottom
)
make
.
height
.
equalTo
()(
self
.
codeTextField
)
})
...
...
@@ -138,24 +138,35 @@ class BJLoginView: UIView {
let
textField
=
UITextField
.
init
()
textField
.
font
=
UIFont
.
systemFont
(
ofSize
:
fontSize
)
textField
.
textColor
=
UIColor
.
white
textField
.
clearButtonMode
=
UITextFieldViewMode
.
whileEditing
textField
.
clearButtonMode
=
UITextField
.
ViewMode
.
whileEditing
// placeholder
let
attributeDic
:
Dictionary
=
[
NSFontAttributeName
:
UIFont
.
systemFont
(
ofSize
:
fontSize
),
NSForegroundColorAttributeName
:
UIColor
.
init
(
white
:
1.0
,
alpha
:
0.69
)];
textField
.
attributedPlaceholder
=
NSAttributedString
.
init
(
string
:
placeholder
,
attributes
:
attributeDic
)
let
attributeDic
:
Dictionary
=
[
convertFromNSAttributedStringKey
(
NSAttributedString
.
Key
.
font
)
:
UIFont
.
systemFont
(
ofSize
:
fontSize
),
convertFromNSAttributedStringKey
(
NSAttributedString
.
Key
.
foregroundColor
)
:
UIColor
.
init
(
white
:
1.0
,
alpha
:
0.69
)];
textField
.
attributedPlaceholder
=
NSAttributedString
.
init
(
string
:
placeholder
,
attributes
:
convertToOptionalNSAttributedStringKeyDictionary
(
attributeDic
)
)
// leftView
let
button
=
UIButton
.
init
()
button
.
setImage
(
icon
,
for
:
UIControlState
.
normal
)
button
.
setImage
(
icon
,
for
:
UIControl
.
State
.
normal
)
textField
.
leftView
=
button
textField
.
leftViewMode
=
UITextFieldViewMode
.
always
textField
.
leftViewMode
=
UITextField
.
ViewMode
.
always
button
.
mas_makeConstraints
{
(
make
:
MASConstraintMaker
!
)
in
make
.
size
.
mas_equalTo
()(
CGSize
.
init
(
width
:
27.0
,
height
:
27.0
))
}
button
.
rac_signal
(
for
:
UIControlEvent
s
.
touchUpInside
)
.
subscribeNext
{
(
sender
)
in
button
.
rac_signal
(
for
:
UIControl
.
Event
.
touchUpInside
)
.
subscribeNext
{
(
sender
)
in
textField
.
becomeFirstResponder
()
}
return
textField
}
}
// Helper function inserted by Swift 4.2 migrator.
fileprivate
func
convertFromNSAttributedStringKey
(
_
input
:
NSAttributedString
.
Key
)
->
String
{
return
input
.
rawValue
}
// Helper function inserted by Swift 4.2 migrator.
fileprivate
func
convertToOptionalNSAttributedStringKeyDictionary
(
_
input
:
[
String
:
Any
]?)
->
[
NSAttributedString
.
Key
:
Any
]?
{
guard
let
input
=
input
else
{
return
nil
}
return
Dictionary
(
uniqueKeysWithValues
:
input
.
map
{
key
,
value
in
(
NSAttributedString
.
Key
(
rawValue
:
key
),
value
)})
}
demo-swift/BJLiveUISwiftDemo/BJLoginViewController.swift
View file @
23c03819
...
...
@@ -91,7 +91,7 @@ class BJLoginViewController: UIViewController, UITextFieldDelegate, BJLRoomViewC
self
.
codeLoginView
?
.
nameTextField
.
delegate
=
self
// login
self
.
codeLoginView
?
.
doneButton
.
rac_signal
(
for
:
UIControlEvent
s
.
touchUpInside
)
.
subscribeNext
({
(
button
)
in
self
.
codeLoginView
?
.
doneButton
.
rac_signal
(
for
:
UIControl
.
Event
.
touchUpInside
)
.
subscribeNext
({
(
button
)
in
self
.
login
()
})
}
...
...
demo-swift/BJLiveUISwiftDemo/NSObject+SwiftObserver.h
View file @
23c03819
...
...
@@ -23,8 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
/** enterRoomSuccess */
-
(
id
<
BJLObservation
>
)
bjl_observeEnterRoomSuccessForTarget
:(
BJLRoom
*
)
room
filter
:(
nullable
BOOL
(
^
)())
filter
observer
:(
BOOL
(
^
)())
observer
;
filter
:(
nullable
BOOL
(
^
)(
void
))
filter
observer
:(
BOOL
(
^
)(
void
))
observer
;
/** roomWillExitWithError: */
-
(
id
<
BJLObservation
>
)
bjl_observeRoomWillExitWithErrorForTarget
:(
BJLRoom
*
)
room
...
...
@@ -45,8 +45,8 @@ NS_ASSUME_NONNULL_BEGIN
/** rollcallDidFinish */
-
(
id
<
BJLObservation
>
)
bjl_observeRollcallDidFinishForTarget
:(
BJLRoomVM
*
)
roomVM
filter
:(
nullable
BOOL
(
^
)())
filter
observer
:(
BOOL
(
^
)())
observer
;
filter
:(
nullable
BOOL
(
^
)(
void
))
filter
observer
:(
BOOL
(
^
)(
void
))
observer
;
#pragma mark - BJLChatVM observe
...
...
@@ -74,8 +74,8 @@ NS_ASSUME_NONNULL_BEGIN
/** loadingSuccess */
-
(
id
<
BJLObservation
>
)
bjl_observeLoadingSuccessForTarget
:(
BJLLoadingVM
*
)
loadingVM
filter
:(
nullable
BOOL
(
^
)())
filter
observer
:(
BOOL
(
^
)())
observer
;
filter
:(
nullable
BOOL
(
^
)(
void
))
filter
observer
:(
BOOL
(
^
)(
void
))
observer
;
/** loadingFailureWithError: */
-
(
id
<
BJLObservation
>
)
bjl_observeLoadingFailureWithErrorForTarget
:(
BJLLoadingVM
*
)
loadingVM
...
...
demo-swift/BJLiveUISwiftDemo/NSObject+SwiftObserver.m
View file @
23c03819
...
...
@@ -21,8 +21,8 @@
}
-
(
id
<
BJLObservation
>
)
bjl_observeEnterRoomSuccessForTarget
:(
BJLRoom
*
)
room
filter
:(
nullable
BOOL
(
^
)())
filter
observer
:(
BOOL
(
^
)())
observer
{
filter
:(
nullable
BOOL
(
^
)(
void
))
filter
observer
:(
BOOL
(
^
)(
void
))
observer
{
return
[
self
bjl_observe
:[
BJLMethodMeta
instanceWithTarget
:
room
name
:
@"enterRoomSuccess"
]
filter:
filter
observer:
observer
];
...
...
@@ -55,8 +55,8 @@
}
-
(
id
<
BJLObservation
>
)
bjl_observeRollcallDidFinishForTarget
:(
BJLRoomVM
*
)
roomVM
filter
:(
nullable
BOOL
(
^
)())
filter
observer
:(
BOOL
(
^
)())
observer
{
filter
:(
nullable
BOOL
(
^
)(
void
))
filter
observer
:(
BOOL
(
^
)(
void
))
observer
{
return
[
self
bjl_observe
:[
BJLMethodMeta
instanceWithTarget
:
roomVM
name
:
@"rollcallDidFinish"
]
filter:
filter
observer:
observer
];
...
...
@@ -99,8 +99,8 @@
}
-
(
id
<
BJLObservation
>
)
bjl_observeLoadingSuccessForTarget
:(
BJLLoadingVM
*
)
loadingVM
filter
:(
nullable
BOOL
(
^
)())
filter
observer
:(
BOOL
(
^
)())
observer
{
filter
:(
nullable
BOOL
(
^
)(
void
))
filter
observer
:(
BOOL
(
^
)(
void
))
observer
{
return
[
self
bjl_observe
:[
BJLMethodMeta
instanceWithTarget
:
loadingVM
name
:
@"loadingSuccess"
]
filter:
filter
observer:
observer
];
...
...
demo-swift/Podfile
View file @
23c03819
...
...
@@ -11,20 +11,21 @@ target 'BJLiveUISwiftDemo' do
# #see http://guides.cocoapods.org/syntax/podfile.html#script_phase
script_phase
:name
=>
'[BJLiveCore] Embed Frameworks'
,
#
:script => 'Pods/BJLiveCore/frameworks/EmbedFrameworks.sh' # for remote pod
:
script
=>
'../../BJLiveCore/frameworks/EmbedFrameworks.sh ../../BJLiveCore/frameworks'
# for local pod
:script
=>
'Pods/BJLiveCore/frameworks/EmbedFrameworks.sh'
,
# for remote pod
:
execution_position
=>
:after_compile
# #see https://stackoverflow.com/a/30866648/456536
script_phase
\
:name
=>
'[BJLiveBase] Clear Archs From Frameworks'
,
# :script => 'Pods/BJLiveBase/script/ClearArchsFromFrameworks.sh', # for remote pod
:script
=>
'../../BJLiveBase/script/ClearArchsFromFrameworks.sh'
,
# for local pod
:script
=>
'Pods/BJLiveBase/script/ClearArchsFromFrameworks.sh'
,
# for remote pod
:execution_position
=>
:after_compile
pod
'BJLiveUI'
,
:path
=>
'../'
pod
'Masonry'
pod
'ReactiveObjC'
# dev
pod
'BJLiveUI'
,
'~> 2.0.0-alpha'
# demo
pod
'Masonry'
,
:inhibit_warnings
=>
true
pod
'ReactiveObjC'
,
:inhibit_warnings
=>
true
target
'BJLiveUISwiftDemoTests'
do
inherit!
:search_paths
...
...
demo-swift/Podfile.lock
View file @
23c03819
...
...
@@ -26,6 +26,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/static (= 2.0.0-alpha)
- BJLiveCore/BJHLMediaPlayer (2.0.0-alpha):
...
...
@@ -35,6 +36,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/BJYRTCEngine (2.0.0-alpha):
- AgoraRtcEngine_iOS
...
...
@@ -44,6 +46,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/static (2.0.0-alpha):
- BJLiveBase (~> 2.0.0-alpha)
...
...
@@ -52,6 +55,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/BJHLMediaPlayer
- BJLiveCore/BJYRTCEngine
...
...
@@ -74,7 +78,7 @@ PODS:
- ReactiveObjC (3.1.0)
DEPENDENCIES:
- BJLiveUI (
from `../`
)
- BJLiveUI (
~> 2.0.0-alpha
)
- Masonry
- ReactiveObjC
...
...
@@ -82,6 +86,7 @@ SPEC REPOS:
http://git.baijiashilian.com/open-ios/specs.git:
- BJLiveBase
- BJLiveCore
- BJLiveUI
https://github.com/cocoapods/specs.git:
- AgoraRtcEngine_iOS
- Masonry
...
...
@@ -89,20 +94,16 @@ SPEC REPOS:
- QBImagePickerController
- ReactiveObjC
EXTERNAL SOURCES:
BJLiveUI:
:path: "../"
SPEC CHECKSUMS:
AgoraRtcEngine_iOS: b0304fee470e0b88bd3abedf9ce1c4309f4fd722
BJLiveBase:
ac0ef31002c9e91d5742f3dd71726aa4682ef811
BJLiveCore:
461217b94ecd9d1759c3be2e8b0936059020265c
BJLiveBase:
ce202b09da41fa92db2fa8b8041acd238cae8d43
BJLiveCore:
7d78394c7adab1fa72de4e857545c48ee73f7a59
BJLiveUI: 770a4d7e76abd3306c4ab7a6c804ba347cc7ad3a
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
ReactiveObjC: 2a38ea15335de4119d8b17caf1db1484f61db902
PODFILE CHECKSUM:
8faeda76e249221fbdb4df8860543d4a268492e5
PODFILE CHECKSUM:
73c9bbdf55052ab2da8a35634753563b82315cf7
COCOAPODS: 1.5.3
demo/BJLiveUI.xcodeproj/project.pbxproj
View file @
23c03819
...
...
@@ -427,7 +427,7 @@
);
runOnlyForDeploymentPostprocessing
=
0
;
shellPath
=
/bin/sh
;
shellScript
=
"../..
/BJLiveCore/frameworks/EmbedFrameworks.sh
../../BJLiveCore/frameworks"
;
shellScript
=
Pods
/BJLiveCore/frameworks/EmbedFrameworks.sh
;
showEnvVarsInLog
=
0
;
};
1EA6E2F00E4590FF15E7751C
/* [CP] Copy Pods Resources */
=
{
...
...
@@ -437,8 +437,8 @@
);
inputPaths
=
(
"${SRCROOT}/Pods/Target Support Files/Pods-BJLiveUI/Pods-BJLiveUI-resources.sh"
,
"${PODS_ROOT}/
../..
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLiveUI.bundle"
,
"${PODS_ROOT}/
../..
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLInteractiveClass.bundle"
,
"${PODS_ROOT}/
BJLiveUI
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLiveUI.bundle"
,
"${PODS_ROOT}/
BJLiveUI
/frameworks/BJLiveUI.framework/Versions/A/Resources/BJLInteractiveClass.bundle"
,
"${PODS_CONFIGURATION_BUILD_DIR}/QBImagePickerController/QBImagePicker.bundle"
,
);
name
=
"[CP] Copy Pods Resources"
;
...
...
@@ -486,7 +486,7 @@
);
runOnlyForDeploymentPostprocessing
=
0
;
shellPath
=
/bin/sh
;
shellScript
=
../..
/BJLiveBase/script/ClearArchsFromFrameworks.sh
;
shellScript
=
Pods
/BJLiveBase/script/ClearArchsFromFrameworks.sh
;
showEnvVarsInLog
=
0
;
};
54FD79B273C6B5D70F4D8F23
/* [CP] Embed Pods Frameworks */
=
{
...
...
demo/Podfile
View file @
23c03819
...
...
@@ -18,7 +18,7 @@ post_install do |installer|
# @see https://stackoverflow.com/a/37289688/456536
installer
.
pods_project
.
targets
.
each
do
|
target
|
target
.
build_configurations
.
each
do
|
config
|
config
.
build_settings
[
'IPHONEOS_DEPLOYMENT_TARGET'
]
=
'
8
.0'
config
.
build_settings
[
'IPHONEOS_DEPLOYMENT_TARGET'
]
=
'
9
.0'
end
end
...
...
@@ -31,19 +31,18 @@ target 'BJLiveUI' do
# #see http://guides.cocoapods.org/syntax/podfile.html#script_phase
script_phase
:name
=>
'[BJLiveCore] Embed Frameworks'
,
#
:script => 'Pods/BJLiveCore/frameworks/EmbedFrameworks.sh' # for remote pod
:
script
=>
'../../BJLiveCore/frameworks/EmbedFrameworks.sh ../../BJLiveCore/frameworks'
# for local pod
:script
=>
'Pods/BJLiveCore/frameworks/EmbedFrameworks.sh'
,
# for remote pod
:
execution_position
=>
:after_compile
# #see https://stackoverflow.com/a/30866648/456536
script_phase
\
:name
=>
'[BJLiveBase] Clear Archs From Frameworks'
,
# :script => 'Pods/BJLiveBase/script/ClearArchsFromFrameworks.sh', # for remote pod
:script
=>
'../../BJLiveBase/script/ClearArchsFromFrameworks.sh'
,
# for local pod
:script
=>
'Pods/BJLiveBase/script/ClearArchsFromFrameworks.sh'
,
# for remote pod
:execution_position
=>
:after_compile
# dev
pod
'BJLiveUI'
,
:path
=>
'../
'
pod
'BJLiveUI'
,
'~> 2.0.0-alpha
'
# demo
pod
'Masonry'
,
:inhibit_warnings
=>
true
pod
'ReactiveObjC'
,
:inhibit_warnings
=>
true
...
...
demo/Podfile.lock
View file @
23c03819
...
...
@@ -26,6 +26,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/static (= 2.0.0-alpha)
- BJLiveCore/BJHLMediaPlayer (2.0.0-alpha):
...
...
@@ -35,6 +36,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/BJYRTCEngine (2.0.0-alpha):
- AgoraRtcEngine_iOS
...
...
@@ -44,6 +46,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/static (2.0.0-alpha):
- BJLiveBase (~> 2.0.0-alpha)
...
...
@@ -52,6 +55,7 @@ PODS:
- "BJLiveBase/Networking+BaijiaYun"
- BJLiveBase/PocketSocket/Client
- BJLiveBase/WebImage/AFNetworking
- BJLiveBase/WebImage/BJLWebImage
- BJLiveBase/YYModel
- BJLiveCore/BJHLMediaPlayer
- BJLiveCore/BJYRTCEngine
...
...
@@ -75,7 +79,7 @@ PODS:
- ReactiveObjC (3.1.0)
DEPENDENCIES:
- BJLiveUI (
from `../`
)
- BJLiveUI (
~> 2.0.0-alpha
)
- FLEX (~> 2.0)
- Masonry
- ReactiveObjC
...
...
@@ -84,6 +88,7 @@ SPEC REPOS:
http://git.baijiashilian.com/open-ios/specs.git:
- BJLiveBase
- BJLiveCore
- BJLiveUI
https://github.com/cocoapods/specs.git:
- AgoraRtcEngine_iOS
- FLEX
...
...
@@ -92,14 +97,10 @@ SPEC REPOS:
- QBImagePickerController
- ReactiveObjC
EXTERNAL SOURCES:
BJLiveUI:
:path: "../"
SPEC CHECKSUMS:
AgoraRtcEngine_iOS: b0304fee470e0b88bd3abedf9ce1c4309f4fd722
BJLiveBase:
ac0ef31002c9e91d5742f3dd71726aa4682ef811
BJLiveCore:
461217b94ecd9d1759c3be2e8b0936059020265c
BJLiveBase:
ce202b09da41fa92db2fa8b8041acd238cae8d43
BJLiveCore:
7d78394c7adab1fa72de4e857545c48ee73f7a59
BJLiveUI: 770a4d7e76abd3306c4ab7a6c804ba347cc7ad3a
FLEX: bd1a39e55b56bb413b6f1b34b3c10a0dc44ef079
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
...
...
@@ -107,6 +108,6 @@ SPEC CHECKSUMS:
QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
ReactiveObjC: 2a38ea15335de4119d8b17caf1db1484f61db902
PODFILE CHECKSUM:
927c89396f473bbc8d23b30527817992c42c2b34
PODFILE CHECKSUM:
484f90acaa17d05fc8186f3f33fe4876b2f08611
COCOAPODS: 1.5.3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment