From 9c9568e2db61dac96566f57d5312eaae53d8b386 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 11 三月 2021 17:40:52 +0800
Subject: [PATCH] 2021-03-11 1.增加ON+集成丰林项目相关工程
---
On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnIntercomViewController.m | 2 +-
On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnMonitorViewController.m | 2 +-
On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m | 2 +-
On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnUtlis.h | 4 ++--
On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Library/libESVideoOnXamarin.a | 0
On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m | 2 +-
On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnUtlis.h | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnIntercomViewController.m b/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnIntercomViewController.m
index 2c384ee..7fb59ca 100644
--- a/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnIntercomViewController.m
+++ b/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnIntercomViewController.m
@@ -160,7 +160,7 @@
if (_titleUILabel == Nil) {
_titleUILabel = [[UILabel alloc] initWithFrame:CGRectMake(90, APP_STATUS_BAR_HEIGHT, self.view.frame.size.width - 180, 44)];
_titleUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:17.0];
- _titleUILabel.textColor = HEXCOLORA(0X1B2D4D, 1.0);
+ _titleUILabel.textColor = TextColor;
_titleUILabel.text = @"";
_titleUILabel.textAlignment = NSTextAlignmentCenter;
}
diff --git a/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnMonitorViewController.m b/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnMonitorViewController.m
index 4b63f58..1944aec 100644
--- a/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnMonitorViewController.m
+++ b/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnMonitorViewController.m
@@ -140,7 +140,7 @@
if (_titleUILabel == Nil) {
_titleUILabel = [[UILabel alloc] initWithFrame:CGRectMake(90, APP_STATUS_BAR_HEIGHT, self.view.frame.size.width - 180, 44)];
_titleUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:17.0];
- _titleUILabel.textColor = HEXCOLORA(0X1B2D4D, 1.0);
+ _titleUILabel.textColor = TextColor;
_titleUILabel.text = @"";
_titleUILabel.textAlignment = NSTextAlignmentCenter;
}
diff --git a/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnUtlis.h b/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnUtlis.h
index f773d42..ac50ea5 100644
--- a/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnUtlis.h
+++ b/On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnUtlis.h
@@ -48,8 +48,8 @@
#define GetRealHeight(H) H / (DesignHeight * 1.0f / APP_SCREEN_HEIGHT)
-#define TextColor HEXCOLORA(0x333333, 1.0)
-#define TextSelectColor HEXCOLORA(0xFB744A, 1.0)
+#define TextColor HEXCOLORA(0x1B2D4D, 1.0)
+#define TextSelectColor HEXCOLORA(0x4484F4, 1.0)
/** WEAKSELF_AT */
#define WEAKSELF_AT __weak __typeof(&*self)weakSelf_AT = self;
#define HEXCOLORA(rgbValue, a) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16)) / 255.0 green:((float)((rgbValue & 0xFF00) >> 8)) / 255.0 blue:((float)(rgbValue & 0xFF)) / 255.0 alpha:a]
diff --git a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m
index 2c384ee..7fb59ca 100644
--- a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m
+++ b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m
@@ -160,7 +160,7 @@
if (_titleUILabel == Nil) {
_titleUILabel = [[UILabel alloc] initWithFrame:CGRectMake(90, APP_STATUS_BAR_HEIGHT, self.view.frame.size.width - 180, 44)];
_titleUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:17.0];
- _titleUILabel.textColor = HEXCOLORA(0X1B2D4D, 1.0);
+ _titleUILabel.textColor = TextColor;
_titleUILabel.text = @"";
_titleUILabel.textAlignment = NSTextAlignmentCenter;
}
diff --git a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m
index 4b63f58..1944aec 100644
--- a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m
+++ b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m
@@ -140,7 +140,7 @@
if (_titleUILabel == Nil) {
_titleUILabel = [[UILabel alloc] initWithFrame:CGRectMake(90, APP_STATUS_BAR_HEIGHT, self.view.frame.size.width - 180, 44)];
_titleUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:17.0];
- _titleUILabel.textColor = HEXCOLORA(0X1B2D4D, 1.0);
+ _titleUILabel.textColor = TextColor;
_titleUILabel.text = @"";
_titleUILabel.textAlignment = NSTextAlignmentCenter;
}
diff --git a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnUtlis.h b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnUtlis.h
index f773d42..ac50ea5 100644
--- a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnUtlis.h
+++ b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnUtlis.h
@@ -48,8 +48,8 @@
#define GetRealHeight(H) H / (DesignHeight * 1.0f / APP_SCREEN_HEIGHT)
-#define TextColor HEXCOLORA(0x333333, 1.0)
-#define TextSelectColor HEXCOLORA(0xFB744A, 1.0)
+#define TextColor HEXCOLORA(0x1B2D4D, 1.0)
+#define TextSelectColor HEXCOLORA(0x4484F4, 1.0)
/** WEAKSELF_AT */
#define WEAKSELF_AT __weak __typeof(&*self)weakSelf_AT = self;
#define HEXCOLORA(rgbValue, a) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16)) / 255.0 green:((float)((rgbValue & 0xFF00) >> 8)) / 255.0 blue:((float)(rgbValue & 0xFF)) / 255.0 alpha:a]
diff --git a/On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Library/libESVideoOnXamarin.a b/On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Library/libESVideoOnXamarin.a
index 43a5bf6..05c4668 100644
--- a/On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Library/libESVideoOnXamarin.a
+++ b/On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Library/libESVideoOnXamarin.a
Binary files differ
--
Gitblit v1.8.0