Skip to content

pidan / FuSiLive

Go to a project
Commit e3ff8878 by suolong
Options

修改版本号和bug

parent 1235f998
Inline Side-by-side
Showing with 28 additions and 19 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiConfigs.m
...@@ -77,12 +77,12 @@ static const NSString *FUSCidUDKey = @"FUSCidUDKey"; ...@@ -77,12 +77,12 @@ static const NSString *FUSCidUDKey = @"FUSCidUDKey";
/// App Version /// App Version
- (NSString *)appVersion { - (NSString *)appVersion {
return @"7835"; return @"7850";
} }
/// App Dot Version /// App Dot Version
- (NSString *)appDotVersion { - (NSString *)appDotVersion {
return @"7.8.3.5"; return @"7.8.5.0";
} }
/// App Id /// App Id
......
FuSiLive.xcodeproj/project.pbxproj
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
00E501FF2E0543A800579DB0 /* Exceptions for "NotificationService" folder in "NotificationService" target */ = { 00E501FF2E0543A800579DB0 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet; isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = ( membershipExceptions = (
"NotificationService-Info.plist", "NotificationService-Info.plist",
...@@ -112,18 +112,7 @@ ...@@ -112,18 +112,7 @@
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
/* Begin PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFileSystemSynchronizedRootGroup section */
00E501F42E0543A800579DB0 /* NotificationService */ = { 00E501F42E0543A800579DB0 /* NotificationService */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (00E501FF2E0543A800579DB0 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = NotificationService; sourceTree = "<group>"; };
isa = PBXFileSystemSynchronizedRootGroup;
exceptions = (
00E501FF2E0543A800579DB0 /* Exceptions for "NotificationService" folder in "NotificationService" target */,
);
explicitFileTypes = {
};
explicitFolders = (
);
path = NotificationService;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */ /* End PBXFileSystemSynchronizedRootGroup section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -444,10 +433,14 @@ ...@@ -444,10 +433,14 @@
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-input-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = (
);
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-output-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
); );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks.sh\"\n";
...@@ -461,10 +454,14 @@ ...@@ -461,10 +454,14 @@
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-input-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = (
);
name = "[CP] Copy Pods Resources"; name = "[CP] Copy Pods Resources";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-output-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-output-files.xcfilelist",
); );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources.sh\"\n";
...@@ -729,7 +726,7 @@ ...@@ -729,7 +726,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty", "$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
); );
LOCALIZATION_PREFERS_STRING_CATALOGS = NO; LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 10; MARKETING_VERSION = 10.0.1;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
...@@ -994,7 +991,7 @@ ...@@ -994,7 +991,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty", "$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
); );
LOCALIZATION_PREFERS_STRING_CATALOGS = NO; LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 10; MARKETING_VERSION = 10.0.1;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
...@@ -155,10 +155,12 @@ FUSImagePickerViewControllerDelegate> ...@@ -155,10 +155,12 @@ FUSImagePickerViewControllerDelegate>
_inputTextView.font = [UIFont systemFontOfSize:18]; _inputTextView.font = [UIFont systemFontOfSize:18];
_inputTextView.yzdelegate = self; _inputTextView.yzdelegate = self;
_inputTextView.textMaxLength = 1000; _inputTextView.textMaxLength = 1000;
_inputTextView.placeHolderWithContainerTop = YES;
_sperator = [[UIView alloc] initWithFrame:CGRectMake(0, _headerView.height - 1, UIView.fus_screenW - 40, 0.5)]; _sperator = [[UIView alloc] initWithFrame:CGRectZero];
_sperator.backgroundColor = [[UIColor colorWithHex:@"#FFFFFF"] colorWithAlphaComponent:0.1]; _sperator.backgroundColor = [[UIColor colorWithHex:@"#FFFFFF"] colorWithAlphaComponent:0.1];
[_headerView addSubview:_sperator]; [_headerView addSubview:_sperator];
[self fus_layoutInputSeparator];
[_scrBgView addSubview:_headerView]; [_scrBgView addSubview:_headerView];
} }
...@@ -313,7 +315,7 @@ FUSImagePickerViewControllerDelegate> ...@@ -313,7 +315,7 @@ FUSImagePickerViewControllerDelegate>
- (void)fus_layoutSubviews{ - (void)fus_layoutSubviews{
_sperator.y = _headerView.height - 1; [self fus_layoutInputSeparator];
_collectionView.y = CGRectGetMaxY(_headerView.frame) + 20; _collectionView.y = CGRectGetMaxY(_headerView.frame) + 20;
_toolBgView.y = CGRectGetMaxY(_collectionView.frame)+20; _toolBgView.y = CGRectGetMaxY(_collectionView.frame)+20;
...@@ -325,6 +327,16 @@ FUSImagePickerViewControllerDelegate> ...@@ -325,6 +327,16 @@ FUSImagePickerViewControllerDelegate>
} }
} }
/// 让输入框分割线与 FUSTextView 的可视文字起点保持一致，避免与占位文案/输入内容出现左右不对齐。
- (void)fus_layoutInputSeparator {
CGFloat textLeading = 3.0 + self.inputTextView.textContainerInset.left;
CGFloat separatorWidth = self.headerView.width - textLeading;
if (separatorWidth < 0) {
separatorWidth = 0;
}
self.sperator.frame = CGRectMake(textLeading, self.headerView.height - 0.5, separatorWidth, 0.5);
}
#pragma mark - custom method #pragma mark - custom method
......
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