Skip to content

优化显示‘展开’逻辑 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yangguanghei wants to merge 2 commits into
base: master
Choose a base branch
from
Open

优化显示‘展开’逻辑 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b9b42e
pod install
yangguanghei Feb 8, 2025
ef19e1f
优化显示‘展开’的逻辑
yangguanghei Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 27 additions & 0 deletions CLDemo-OC/build/XCBuildData/0a2fcb2f923e9b62ba5f1b5c46b35d49.xcbuilddata/build-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"buildCommand" : {
"command" : "build",
"skipDependencies" : false,
"style" : "buildOnly"
},
"configuredTargets" : [

],
"continueBuildingAfterErrors" : false,
"dependencyScope" : "workspace",
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"overrides" : {

}
},
"qos" : "utility",
"schemeCommand" : "launch",
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : false,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
Binary file added CLDemo-OC/build/XCBuildData/0a2fcb2f923e9b62ba5f1b5c46b35d49.xcbuilddata/description.msgpack
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions CLDemo-OC/build/XCBuildData/0a2fcb2f923e9b62ba5f1b5c46b35d49.xcbuilddata/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"client":{"name":"basic","version":0,"file-system":"device-agnostic","perform-ownership-analysis":"no"},"targets":{"":["<all>"]},"commands":{"<all>":{"tool":"phony","inputs":["<WorkspaceHeaderMapVFSFilesWritten>"],"outputs":["<all>"]},"P0:::Gate WorkspaceHeaderMapVFSFilesWritten":{"tool":"phony","inputs":[],"outputs":["<WorkspaceHeaderMapVFSFilesWritten>"]}}}
1 change: 1 addition & 0 deletions CLDemo-OC/build/XCBuildData/0a2fcb2f923e9b62ba5f1b5c46b35d49.xcbuilddata/target-graph.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Target dependency graph (0 target)
Binary file added CLDemo-OC/build/XCBuildData/0a2fcb2f923e9b62ba5f1b5c46b35d49.xcbuilddata/task-store.msgpack
View file
Open in desktop
Binary file not shown.
27 changes: 27 additions & 0 deletions CLDemo-OC/build/XCBuildData/c49f86284b5f2798667fdb536425c370.xcbuilddata/build-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"buildCommand" : {
"command" : "build",
"skipDependencies" : false,
"style" : "buildOnly"
},
"configuredTargets" : [

],
"continueBuildingAfterErrors" : false,
"dependencyScope" : "workspace",
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"overrides" : {

}
},
"qos" : "utility",
"schemeCommand" : "launch",
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : false,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
Binary file added CLDemo-OC/build/XCBuildData/c49f86284b5f2798667fdb536425c370.xcbuilddata/description.msgpack
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions CLDemo-OC/build/XCBuildData/c49f86284b5f2798667fdb536425c370.xcbuilddata/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"client":{"name":"basic","version":0,"file-system":"device-agnostic","perform-ownership-analysis":"no"},"targets":{"":["<all>"]},"commands":{"<all>":{"tool":"phony","inputs":["<WorkspaceHeaderMapVFSFilesWritten>"],"outputs":["<all>"]},"P0:::Gate WorkspaceHeaderMapVFSFilesWritten":{"tool":"phony","inputs":[],"outputs":["<WorkspaceHeaderMapVFSFilesWritten>"]}}}
1 change: 1 addition & 0 deletions CLDemo-OC/build/XCBuildData/c49f86284b5f2798667fdb536425c370.xcbuilddata/target-graph.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Target dependency graph (0 target)
Binary file added CLDemo-OC/build/XCBuildData/c49f86284b5f2798667fdb536425c370.xcbuilddata/task-store.msgpack
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions CLDemo-Swift/CLDemo-Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2887,7 +2887,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 533J5B8T42;
DEVELOPMENT_TEAM = 3D47N4555T;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "";
INFOPLIST_FILE = "$(SRCROOT)/CLDemo-Swift/Resource/Info.plist";
Expand Down Expand Up @@ -2918,7 +2918,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 533J5B8T42;
DEVELOPMENT_TEAM = 3D47N4555T;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "";
INFOPLIST_FILE = "$(SRCROOT)/CLDemo-Swift/Resource/Info.plist";
Expand Down
2 changes: 1 addition & 1 deletion CLDemo-Swift/CLDemo-Swift/Class/CLTruncationController/CLTruncationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class CLTruncationController: CLController {

private lazy var truncationLabel: CLTruncationLabel = {
let view = CLTruncationLabel()
view.numberOfLines = 3
view.numberOfLines = 5
view.contentEdgeInsets = .init(top: 10, left: 10, bottom: 10, right: 10)
view.layer.cornerRadius = 5
view.layer.borderColor = UIColor.orange.cgColor
Expand Down
2 changes: 1 addition & 1 deletion CLDemo-Swift/CLDemo-Swift/Class/CLTruncationController/CLTruncationLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ extension CLTruncationLabel {
let width = textLabel.bounds.width
let lines = attributedText.lines(width)
if numberOfLines > 0,
lines.count >= numberOfLines
lines.count > numberOfLines
{
let additionalAttributedText = isOpen ? truncationToken.close : truncationToken.open
let length = lines.prefix(numberOfLines).reduce(0) { $0 + CTLineGetStringRange($1).length }
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 817a9f6635815ee132800871dcfecfd381ee2044

COCOAPODS: 1.16.2
COCOAPODS: 1.15.2
226 changes: 226 additions & 0 deletions Pods/CLCamera/Camera/Contrller/CLCameraController.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading