Skip to content

Commit

Permalink
fix some error
Browse files Browse the repository at this point in the history
  • Loading branch information
MrShiY committed Apr 29, 2021
1 parent 403a91e commit 9de3379
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions Buddies.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,13 +708,13 @@
CODE_SIGN_ENTITLEMENTS = BuddiesBroadcastExtension/BuddiesBroadcastExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2700;
CURRENT_PROJECT_VERSION = 2800;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "$(SRCROOT)/BuddiesBroadcastExtension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.7.0;
MARKETING_VERSION = 2.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie.BuddiesBroadcastExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -733,13 +733,13 @@
CODE_SIGN_ENTITLEMENTS = BuddiesBroadcastExtension/BuddiesBroadcastExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2700;
CURRENT_PROJECT_VERSION = 2800;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "$(SRCROOT)/BuddiesBroadcastExtension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.7.0;
MARKETING_VERSION = 2.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie.BuddiesBroadcastExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -871,12 +871,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2700;
CURRENT_PROJECT_VERSION = 2800;
DEVELOPMENT_TEAM = 9X38D433RE;
INFOPLIST_FILE = Buddies/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.7.0;
MARKETING_VERSION = 2.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -896,12 +896,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2700;
CURRENT_PROJECT_VERSION = 2800;
DEVELOPMENT_TEAM = 9X38D433RE;
INFOPLIST_FILE = Buddies/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.7.0;
MARKETING_VERSION = 2.8.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down
20 changes: 10 additions & 10 deletions Buddies/BuddiesUIControlls/BuddiesCallViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class BuddiesCallViewController: UIViewController,UITableViewDelegate,UITableVie
}

private func updateRemoteViewImageView() {
if let name = self.currentCall?.activeSpeaker?.email{
if let name = self.currentCall?.activeSpeaker?.displayName{
activeSpeakerImageView?.alpha = 1.0
self.activeSpeakerImageView?.image = UIImage.getContactAvatorImage(name: name, size: spaceTableCellHeight-30, fontName: "HelveticaNeue-UltraLight", backColor: UIColor.MKColor.BlueGrey.P600)
}
Expand All @@ -231,7 +231,7 @@ class BuddiesCallViewController: UIViewController,UITableViewDelegate,UITableVie
// MARK: - WebexSDK: call state change processing code here...
private func callStateChangeCallBacks(call: Call) {

self.memberShipList = call.memberships.filter({$0.email != User.CurrentUser.email})
self.memberShipList = call.memberships.filter({$0.displayName != User.CurrentUser.name})
self.updateRemoteViewImageView()

/* Callback when remote participant(s) answered and this *call* is connected. */
Expand Down Expand Up @@ -318,17 +318,17 @@ class BuddiesCallViewController: UIViewController,UITableViewDelegate,UITableVie
switch memberShipChangeType {
/* This might be triggered when membership joined the call */
case .joined(let memberShip):
print("memberShip=======>\(memberShip.email!) joined")
print("memberShip=======>\(memberShip.displayName) joined")
self?.updateMemberShipView(membership: memberShip)
break
/* This might be triggered when membership left the call */
case .left(let memberShip):
print("memberShip=======>\(memberShip.email!) left")
print("memberShip=======>\(memberShip.displayName) left")
self?.updateMemberShipView(membership: memberShip)
break
/* This might be triggered when membership declined the call */
case .declined(let memberShip):
print("memberShip========> \(memberShip.email!) declined")
print("memberShip========> \(memberShip.displayName) declined")
self?.updateMemberShipView(membership: memberShip)
break
default:
Expand Down Expand Up @@ -427,7 +427,7 @@ class BuddiesCallViewController: UIViewController,UITableViewDelegate,UITableVie
let idx = renderView.tag - 10000
let backView = self.multiPersonBackViews[idx]
backView.subviews.forEach { (subView) in
if subView.isKind(of: UIImageView.self), let name = auxVideo?.person?.email{
if subView.isKind(of: UIImageView.self), let name = auxVideo?.person?.displayName {
(subView as! UIImageView).image = UIImage.getContactAvatorImage(name: name, size: spaceTableCellHeight-30, fontName: "HelveticaNeue-UltraLight", backColor: UIColor.MKColor.BlueGrey.P600)
}
}
Expand Down Expand Up @@ -854,8 +854,8 @@ class BuddiesCallViewController: UIViewController,UITableViewDelegate,UITableVie
private func setUpMemberShipView(){
if(self.isSpaceCall && self.memberShipViewList?.count == 0){
let sortedMemberList = self.memberShipList?.sorted(by: { (first: CallMembership, second: CallMembership) -> Bool in
let r1 = (first.email! == User.CurrentUser.email) ? 1 : 0
let r2 = (second.email! == User.CurrentUser.email) ? 1 : 0
let r1 = (first.displayName == User.CurrentUser.name) ? 1 : 0
let r2 = (second.displayName == User.CurrentUser.name) ? 1 : 0
return (r1 > r2)
})
self.memberShipList = sortedMemberList
Expand All @@ -876,7 +876,7 @@ class BuddiesCallViewController: UIViewController,UITableViewDelegate,UITableVie
if let listCount = self.memberShipList?.count{
for index in 0..<listCount{
let tempMemberShipModel = self.memberShipList?[index]
if tempMemberShipModel?.email == membership.email{
if tempMemberShipModel?.displayName == membership.displayName {
self.memberShipViewList?[index].updateMemberShipJoinState(newmemberShip: membership)
}
}
Expand Down Expand Up @@ -1074,7 +1074,7 @@ class CallMemberShipView: UIView{
self.avatorImageView?.image = UIImage.fontAwesomeIcon(name: .user, textColor: UIColor.white, size: CGSize(width: self.viewHeight, height: self.viewHeight))
self.addSubview(self.avatorImageView!)
DispatchQueue.global().async {
WebexSDK?.people.list(email: EmailAddress.fromString(self.memberShip.email!) , max: 1) {
WebexSDK?.people.list(email: EmailAddress.fromString(self.memberShip.displayName ?? "") , max: 1) {
(response: ServiceResponse<[Person]>) in
switch response.result {
case .success(let value):
Expand Down

0 comments on commit 9de3379

Please sign in to comment.