Skip to content

Commit b39a458

Browse files
MoLiceMoLice
committed
1. 整理 tableViewCell inset 的 Demo 界面，增加对 accessoryEdgeInsets 的效果展示。
2. 将 QMUIDemo 的版本号从1.0改为1.3.0，并在关于界面里增加查看文档的按钮。 3. 整理 QMUIConfigurationManager 里 tableView 相关的宏配置的顺序。 4. QDPopupContainerViewController 新增 QMUIPopupMenuView 的 Demo。
1 parent 138f6aa commit b39a458

22 files changed

Lines changed: 430 additions & 210 deletions

File tree

‎qmuidemo.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@
169169
CD1229AE1DF678FB003B9649 /* QDImagePreviewViewController1.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QDImagePreviewViewController1.m; sourceTree = "<group>"; };
170170
CD1229B01DF67922003B9649 /* QDImagePreviewViewController2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QDImagePreviewViewController2.h; sourceTree = "<group>"; };
171171
CD1229B11DF67922003B9649 /* QDImagePreviewViewController2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QDImagePreviewViewController2.m; sourceTree = "<group>"; };
172-
CD828F0F1C22802B006481C5 /* Reveal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Reveal.framework; sourceTree = "<group>"; };
173172
CD9207241DD49CD100AE32C0 /* QDFloatLayoutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QDFloatLayoutViewController.h; sourceTree = "<group>"; };
174173
CD9207251DD49CD100AE32C0 /* QDFloatLayoutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QDFloatLayoutViewController.m; sourceTree = "<group>"; };
175174
CDB8C9371DCC815A00769DF0 /* QMUIConfigurationTemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QMUIConfigurationTemplate.h; sourceTree = "<group>"; };
@@ -305,6 +304,7 @@
305304
CDD0D81C1E0A88B600A38B96 /* image4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image4@2x.png"; sourceTree = "<group>"; };
306305
CDD0D81D1E0A88B600A38B96 /* image5@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image5@2x.png"; sourceTree = "<group>"; };
307306
CDD0D81E1E0A88B600A38B96 /* image6@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image6@2x.png"; sourceTree = "<group>"; };
307+
CDD4942E1E5E92FA00829B7D /* RevealServer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RevealServer.framework; path = qmuidemo/Frameworks/RevealServer.framework; sourceTree = SOURCE_ROOT; };
308308
CDD4D1EC1DCE09FE00417427 /* QDAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QDAboutViewController.h; sourceTree = "<group>"; };
309309
CDD4D1ED1DCE09FE00417427 /* QDAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QDAboutViewController.m; sourceTree = "<group>"; };
310310
CDE50AD21DAA6E6F000D5414 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
@@ -364,7 +364,7 @@
364364
165F42F81ADB60180057EF6A /* AppDelegate.m */,
365365
165F43001ADB60180057EF6A /* Images.xcassets */,
366366
165F43021ADB60180057EF6A /* LaunchScreen.xib */,
367-
165F43191ADB62C00057EF6A /* Framewroks */,
367+
165F43191ADB62C00057EF6A /* Frameworks */,
368368
165F431A1ADB62C00057EF6A /* Resources */,
369369
165F43541ADB719F0057EF6A /* Modules */,
370370
165F42F31ADB60180057EF6A /* Supporting Files */,
@@ -382,15 +382,16 @@
382382
name = "Supporting Files";
383383
sourceTree = "<group>";
384384
};
385-
165F43191ADB62C00057EF6A /* Framewroks */ = {
385+
165F43191ADB62C00057EF6A /* Frameworks */ = {
386386
isa = PBXGroup;
387387
children = (
388+
CDD4942E1E5E92FA00829B7D /* RevealServer.framework */,
388389
FE7DC1691D2265DC0057A06E /* libxml2.2.tbd */,
389-
6D03A52F1B4AB63E003BDDE4 /* Photos.framework */,
390390
162E44171B1B2A3B006B73CD /* MediaPlayer.framework */,
391-
CD828F0F1C22802B006481C5 /* Reveal.framework */,
391+
6D03A52F1B4AB63E003BDDE4 /* Photos.framework */,
392392
16FE87E81AF76C8500289834 /* qmui.xcodeproj */,
393393
);
394+
name = Frameworks;
394395
path = Framewroks;
395396
sourceTree = "<group>";
396397
};
@@ -685,6 +686,7 @@
685686
165F42EE1ADB60180057EF6A /* Resources */,
686687
CD454B891D913A2E00BE3804 /* Run Script */,
687688
CDD0D8741E0D2BC600A38B96 /* Embed Frameworks */,
689+
CDD4942D1E5E8C3900829B7D /* Integrate Reveal Server */,
688690
);
689691
buildRules = (
690692
);
@@ -708,7 +710,7 @@
708710
TargetAttributes = {
709711
165F42EF1ADB60180057EF6A = {
710712
CreatedOnToolsVersion = 6.3;
711-
DevelopmentTeam = XKMGNG3AWZ;
713+
DevelopmentTeam = FP989NU38H;
712714
DevelopmentTeamName = "沛钞 陈 (Personal Team)";
713715
ProvisioningStyle = Manual;
714716
};
@@ -791,6 +793,20 @@
791793
shellPath = /bin/sh;
792794
shellScript = "# compress application.\n\n/bin/mkdir -p $CONFIGURATION_BUILD_DIR/Payload\n\n/bin/cp -R $CONFIGURATION_BUILD_DIR/qmuidemo.app $CONFIGURATION_BUILD_DIR/Payload\n\n#/bin/cp images/logo_itunes.png $CONFIGURATION_BUILD_DIR/iTunesArtwork\n\ncd $CONFIGURATION_BUILD_DIR\n\n# zip up the qmuidemo directory\n\n/usr/bin/zip -r qmuidemo.ipa Payload iTunesArtwork";
793795
};
796+
CDD4942D1E5E8C3900829B7D /* Integrate Reveal Server */ = {
797+
isa = PBXShellScriptBuildPhase;
798+
buildActionMask = 2147483647;
799+
files = (
800+
);
801+
inputPaths = (
802+
);
803+
name = "Integrate Reveal Server";
804+
outputPaths = (
805+
);
806+
runOnlyForDeploymentPostprocessing = 0;
807+
shellPath = /bin/sh;
808+
shellScript = "export REVEAL_SERVER_FILENAME=\"RevealServer.framework\"\n\n# Update this path to point to the location of RevealServer.framework in your project.\nexport REVEAL_SERVER_PATH=\"${SRCROOT}/qmuidemo/Frameworks/${REVEAL_SERVER_FILENAME}\"\n\n# If configuration is not Debug, skip this script.\n[ \"${CONFIGURATION}\" != \"Debug\" ] && exit 0\n\n# If RevealServer.framework exists at the specified path, run code signing script.\nif [ -d \"${REVEAL_SERVER_PATH}\" ]; then\n\"${REVEAL_SERVER_PATH}/Scripts/copy_and_codesign_revealserver.sh\"\nelse\necho \"Cannot find RevealServer.framework, so Reveal Server will not be started for your app.\"\nfi";
809+
};
794810
/* End PBXShellScriptBuildPhase section */
795811

796812
/* Begin PBXSourcesBuildPhase section */
@@ -998,8 +1014,8 @@
9981014
FRAMEWORK_SEARCH_PATHS = (
9991015
"$(inherited)",
10001016
"$(PROJECT_DIR)",
1001-
"$(PROJECT_DIR)/qmuidemo/Framewroks/**",
1002-
"$(PROJECT_DIR)/qmuidemo/Framewroks",
1017+
"$(SRCROOT)",
1018+
"$(PROJECT_DIR)/qmuidemo/Frameworks",
10031019
);
10041020
GCC_PRECOMPILE_PREFIX_HEADER = YES;
10051021
GCC_PREFIX_HEADER = ./qmuidemo/PrefixHeader.pch;
@@ -1014,9 +1030,8 @@
10141030
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10151031
OTHER_LDFLAGS = (
10161032
"-ObjC",
1017-
"-lz",
1018-
"-framework",
1019-
Reveal,
1033+
"-weak_framework",
1034+
RevealServer,
10201035
);
10211036
PRODUCT_BUNDLE_IDENTIFIER = com.qmuidemo.qmui;
10221037
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1037,8 +1052,7 @@
10371052
FRAMEWORK_SEARCH_PATHS = (
10381053
"$(inherited)",
10391054
"$(PROJECT_DIR)",
1040-
"$(PROJECT_DIR)/qmuidemo/Framewroks/**",
1041-
"$(PROJECT_DIR)/qmuidemo/Framewroks",
1055+
"$(PROJECT_DIR)/qmuidemo/Frameworks",
10421056
);
10431057
GCC_PRECOMPILE_PREFIX_HEADER = YES;
10441058
GCC_PREFIX_HEADER = ./qmuidemo/PrefixHeader.pch;

‎qmuidemo/Frameworks/RevealServer.framework/Headers/RevealServer.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// RevealServer.h
3+
// RevealServer
4+
//
5+
// Created by Tony Arnold on 25/11/2015.
6+
// Copyright © 2015 Itty Bitty Apps, Pty Ltd. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
//! Project version number for RevealServer.
12+
FOUNDATION_EXPORT double RevealServerVersionNumber;
13+
14+
//! Project version string for RevealServer.
15+
FOUNDATION_EXPORT const unsigned char RevealServerVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <RevealServer/PublicHeader.h>
18+
19+

‎qmuidemo/Frameworks/RevealServer.framework/Info.plist‎

791 Bytes
Binary file not shown.

‎qmuidemo/Frameworks/RevealServer.framework/Modules/module.modulemap‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
framework module RevealServer {
2+
umbrella header "RevealServer.h"
3+
4+
export *
5+
module * { export * }
6+
}

‎qmuidemo/Frameworks/RevealServer.framework/RevealServer‎

8.89 MB
Binary file not shown.

‎qmuidemo/Frameworks/RevealServer.framework/Scripts/copy_and_codesign_revealserver.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/usr/bin/env bash
2+
set -o errexit
3+
set -o nounset
4+
5+
# Ensure that we have a valid OTHER_LDFLAGS environment variable
6+
OTHER_LDFLAGS=${OTHER_LDFLAGS:=""}
7+
8+
# Ensure that we have a valid REVEAL_SERVER_FILENAME environment variable
9+
REVEAL_SERVER_FILENAME=${REVEAL_SERVER_FILENAME:="RevealServer.framework"}
10+
11+
# Ensure that we have a valid REVEAL_SERVER_PATH environment variable
12+
REVEAL_SERVER_PATH=${REVEAL_SERVER_PATH:="${SRCROOT}/${REVEAL_SERVER_FILENAME}"}
13+
14+
# The path to copy the framework to
15+
app_frameworks_dir="${CODESIGNING_FOLDER_PATH}/Frameworks"
16+
17+
copy_library() {
18+
mkdir -p "$app_frameworks_dir"
19+
cp -vRf "$REVEAL_SERVER_PATH" "${app_frameworks_dir}/${REVEAL_SERVER_FILENAME}"
20+
}
21+
22+
codesign_library() {
23+
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" ]; then
24+
codesign -fs "${EXPANDED_CODE_SIGN_IDENTITY}" "${app_frameworks_dir}/${REVEAL_SERVER_FILENAME}"
25+
fi
26+
}
27+
28+
main() {
29+
if [[ $OTHER_LDFLAGS =~ "RevealServer" ]]; then
30+
if [ -e "$REVEAL_SERVER_PATH" ]; then
31+
copy_library
32+
codesign_library
33+
echo "${REVEAL_SERVER_FILENAME} is included in this build, and has been copied to $CODESIGNING_FOLDER_PATH"
34+
else
35+
echo "${REVEAL_SERVER_FILENAME} is not included in this build, as it could not be found at $REVEAL_SERVER_PATH"
36+
fi
37+
else
38+
echo "${REVEAL_SERVER_FILENAME} is not included in this build because RevealServer was not present in the OTHER_LDFLAGS environment variable."
39+
fi
40+
}
41+
42+
main

‎qmuidemo/Frameworks/RevealServer.framework/_CodeSignature/CodeResources‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>files</key>
6+
<dict>
7+
<key>Headers/RevealServer.h</key>
8+
<data>
9+
e2S6Vuf8iJXurblvYWL8e3IMO7E=
10+
</data>
11+
<key>Info.plist</key>
12+
<data>
13+
hD3V7tiXGKcqJIFK4LKpeO/AGbs=
14+
</data>
15+
<key>Modules/module.modulemap</key>
16+
<data>
17+
EuDEeG1dcC1sd+hIW2SkUAImUg8=
18+
</data>
19+
<key>Scripts/copy_and_codesign_revealserver.sh</key>
20+
<data>
21+
aQbLdf9lVnmDd2BfBMGsVPBPdb8=
22+
</data>
23+
</dict>
24+
<key>files2</key>
25+
<dict>
26+
<key>Headers/RevealServer.h</key>
27+
<dict>
28+
<key>hash</key>
29+
<data>
30+
e2S6Vuf8iJXurblvYWL8e3IMO7E=
31+
</data>
32+
<key>hash2</key>
33+
<data>
34+
i4zuiS2fsgwsoicYEzHuBx32JYfKW38gkopt/7FdINY=
35+
</data>
36+
</dict>
37+
<key>Modules/module.modulemap</key>
38+
<dict>
39+
<key>hash</key>
40+
<data>
41+
EuDEeG1dcC1sd+hIW2SkUAImUg8=
42+
</data>
43+
<key>hash2</key>
44+
<data>
45+
tstqiJpIPr4iEd3MDHClLuTB/ciSC/zNlke1AjfSVuU=
46+
</data>
47+
</dict>
48+
<key>Scripts/copy_and_codesign_revealserver.sh</key>
49+
<dict>
50+
<key>hash</key>
51+
<data>
52+
aQbLdf9lVnmDd2BfBMGsVPBPdb8=
53+
</data>
54+
<key>hash2</key>
55+
<data>
56+
UYSfYiTYxoDhVX7UwCYvPXGOWQ4Yrm5DzFoomMlSIMs=
57+
</data>
58+
</dict>
59+
</dict>
60+
<key>rules</key>
61+
<dict>
62+
<key>^</key>
63+
<true/>
64+
<key>^.*\.lproj/</key>
65+
<dict>
66+
<key>optional</key>
67+
<true/>
68+
<key>weight</key>
69+
<real>1000</real>
70+
</dict>
71+
<key>^.*\.lproj/locversion.plist$</key>
72+
<dict>
73+
<key>omit</key>
74+
<true/>
75+
<key>weight</key>
76+
<real>1100</real>
77+
</dict>
78+
<key>^Base\.lproj/</key>
79+
<dict>
80+
<key>weight</key>
81+
<real>1010</real>
82+
</dict>
83+
<key>^version.plist$</key>
84+
<true/>
85+
</dict>
86+
<key>rules2</key>
87+
<dict>
88+
<key>.*\.dSYM($|/)</key>
89+
<dict>
90+
<key>weight</key>
91+
<real>11</real>
92+
</dict>
93+
<key>^</key>
94+
<dict>
95+
<key>weight</key>
96+
<real>20</real>
97+
</dict>
98+
<key>^(.*/)?\.DS_Store$</key>
99+
<dict>
100+
<key>omit</key>
101+
<true/>
102+
<key>weight</key>
103+
<real>2000</real>
104+
</dict>
105+
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
106+
<dict>
107+
<key>nested</key>
108+
<true/>
109+
<key>weight</key>
110+
<real>10</real>
111+
</dict>
112+
<key>^.*</key>
113+
<true/>
114+
<key>^.*\.lproj/</key>
115+
<dict>
116+
<key>optional</key>
117+
<true/>
118+
<key>weight</key>
119+
<real>1000</real>
120+
</dict>
121+
<key>^.*\.lproj/locversion.plist$</key>
122+
<dict>
123+
<key>omit</key>
124+
<true/>
125+
<key>weight</key>
126+
<real>1100</real>
127+
</dict>
128+
<key>^Base\.lproj/</key>
129+
<dict>
130+
<key>weight</key>
131+
<real>1010</real>
132+
</dict>
133+
<key>^Info\.plist$</key>
134+
<dict>
135+
<key>omit</key>
136+
<true/>
137+
<key>weight</key>
138+
<real>20</real>
139+
</dict>
140+
<key>^PkgInfo$</key>
141+
<dict>
142+
<key>omit</key>
143+
<true/>
144+
<key>weight</key>
145+
<real>20</real>
146+
</dict>
147+
<key>^[^/]+$</key>
148+
<dict>
149+
<key>nested</key>
150+
<true/>
151+
<key>weight</key>
152+
<real>10</real>
153+
</dict>
154+
<key>^embedded\.provisionprofile$</key>
155+
<dict>
156+
<key>weight</key>
157+
<real>20</real>
158+
</dict>
159+
<key>^version\.plist$</key>
160+
<dict>
161+
<key>weight</key>
162+
<real>20</real>
163+
</dict>
164+
</dict>
165+
</dict>
166+
</plist>

‎qmuidemo/Framewroks/Reveal.framework/Headers‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎qmuidemo/Framewroks/Reveal.framework/Reveal‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎qmuidemo/Framewroks/Reveal.framework/Versions/A/Headers/IBANetServiceTypes.h‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)