Skip to content

Commit e8c38a8

Browse files
bachuebachue
authored
Merge pull request #301 from XiaopingSun/uploadInfoReporter
add upload info reporter
2 parents 0e7d30c + ef91cfe commit e8c38a8

File tree

17 files changed

+619
-92
lines changed

17 files changed

+619
-92
lines changed

‎QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj‎

100755100644
Lines changed: 8 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@
183183
93D2301B1C86D7F700434F6D /* Sources */,
184184
93D2301C1C86D7F700434F6D /* Frameworks */,
185185
93D2301D1C86D7F700434F6D /* Resources */,
186-
E7747219847A629D5312382A /* [CP] Embed Pods Frameworks */,
187-
200D9CECB60715C9746F9444 /* [CP] Copy Pods Resources */,
188186
);
189187
buildRules = (
190188
);
@@ -203,8 +201,6 @@
203201
93D230341C86D7F700434F6D /* Sources */,
204202
93D230351C86D7F700434F6D /* Frameworks */,
205203
93D230361C86D7F700434F6D /* Resources */,
206-
29A428BC542135B14A72E77B /* [CP] Embed Pods Frameworks */,
207-
ABE36606520E0BC28F0FB079 /* [CP] Copy Pods Resources */,
208204
);
209205
buildRules = (
210206
);
@@ -305,64 +301,22 @@
305301
/* End PBXResourcesBuildPhase section */
306302

307303
/* Begin PBXShellScriptBuildPhase section */
308-
200D9CECB60715C9746F9444 /* [CP] Copy Pods Resources */ = {
309-
isa = PBXShellScriptBuildPhase;
310-
buildActionMask = 2147483647;
311-
files = (
312-
);
313-
inputPaths = (
314-
);
315-
name = "[CP] Copy Pods Resources";
316-
outputPaths = (
317-
);
318-
runOnlyForDeploymentPostprocessing = 0;
319-
shellPath = /bin/sh;
320-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QiniuDemo/Pods-QiniuDemo-resources.sh\"\n";
321-
showEnvVarsInLog = 0;
322-
};
323-
29A428BC542135B14A72E77B /* [CP] Embed Pods Frameworks */ = {
324-
isa = PBXShellScriptBuildPhase;
325-
buildActionMask = 2147483647;
326-
files = (
327-
);
328-
inputPaths = (
329-
);
330-
name = "[CP] Embed Pods Frameworks";
331-
outputPaths = (
332-
);
333-
runOnlyForDeploymentPostprocessing = 0;
334-
shellPath = /bin/sh;
335-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QiniuDemoTests/Pods-QiniuDemoTests-frameworks.sh\"\n";
336-
showEnvVarsInLog = 0;
337-
};
338304
7BC7BFB54A15F4E854C3D84E /* [CP] Check Pods Manifest.lock */ = {
339305
isa = PBXShellScriptBuildPhase;
340306
buildActionMask = 2147483647;
341307
files = (
342308
);
343309
inputPaths = (
310+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
311+
"${PODS_ROOT}/Manifest.lock",
344312
);
345313
name = "[CP] Check Pods Manifest.lock";
346314
outputPaths = (
315+
"$(DERIVED_FILE_DIR)/Pods-QiniuDemoTests-checkManifestLockResult.txt",
347316
);
348317
runOnlyForDeploymentPostprocessing = 0;
349318
shellPath = /bin/sh;
350-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
351-
showEnvVarsInLog = 0;
352-
};
353-
ABE36606520E0BC28F0FB079 /* [CP] Copy Pods Resources */ = {
354-
isa = PBXShellScriptBuildPhase;
355-
buildActionMask = 2147483647;
356-
files = (
357-
);
358-
inputPaths = (
359-
);
360-
name = "[CP] Copy Pods Resources";
361-
outputPaths = (
362-
);
363-
runOnlyForDeploymentPostprocessing = 0;
364-
shellPath = /bin/sh;
365-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QiniuDemoTests/Pods-QiniuDemoTests-resources.sh\"\n";
319+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
366320
showEnvVarsInLog = 0;
367321
};
368322
D0F6ADCA764EF90D58C53A3C /* [CP] Check Pods Manifest.lock */ = {
@@ -371,28 +325,16 @@
371325
files = (
372326
);
373327
inputPaths = (
328+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
329+
"${PODS_ROOT}/Manifest.lock",
374330
);
375331
name = "[CP] Check Pods Manifest.lock";
376332
outputPaths = (
333+
"$(DERIVED_FILE_DIR)/Pods-QiniuDemo-checkManifestLockResult.txt",
377334
);
378335
runOnlyForDeploymentPostprocessing = 0;
379336
shellPath = /bin/sh;
380-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
381-
showEnvVarsInLog = 0;
382-
};
383-
E7747219847A629D5312382A /* [CP] Embed Pods Frameworks */ = {
384-
isa = PBXShellScriptBuildPhase;
385-
buildActionMask = 2147483647;
386-
files = (
387-
);
388-
inputPaths = (
389-
);
390-
name = "[CP] Embed Pods Frameworks";
391-
outputPaths = (
392-
);
393-
runOnlyForDeploymentPostprocessing = 0;
394-
shellPath = /bin/sh;
395-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QiniuDemo/Pods-QiniuDemo-frameworks.sh\"\n";
337+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
396338
showEnvVarsInLog = 0;
397339
};
398340
/* End PBXShellScriptBuildPhase section */

‎QiniuDemo/QiniuDemo.xcodeproj/xcshareddata/xcschemes/QiniuDemo.xcscheme‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1100"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "93D2301E1C86D7F700434F6D"
18+
BuildableName = "QiniuDemo.app"
19+
BlueprintName = "QiniuDemo"
20+
ReferencedContainer = "container:QiniuDemo.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "93D2301E1C86D7F700434F6D"
48+
BuildableName = "QiniuDemo.app"
49+
BlueprintName = "QiniuDemo"
50+
ReferencedContainer = "container:QiniuDemo.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "93D2301E1C86D7F700434F6D"
65+
BuildableName = "QiniuDemo.app"
66+
BlueprintName = "QiniuDemo"
67+
ReferencedContainer = "container:QiniuDemo.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎QiniuDemo/QiniuDemo/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",
@@ -30,6 +40,16 @@
3040
"size" : "60x60",
3141
"scale" : "3x"
3242
},
43+
{
44+
"idiom" : "ipad",
45+
"size" : "20x20",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "ipad",
50+
"size" : "20x20",
51+
"scale" : "2x"
52+
},
3353
{
3454
"idiom" : "ipad",
3555
"size" : "29x29",
@@ -59,6 +79,16 @@
5979
"idiom" : "ipad",
6080
"size" : "76x76",
6181
"scale" : "2x"
82+
},
83+
{
84+
"idiom" : "ipad",
85+
"size" : "83.5x83.5",
86+
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
6292
}
6393
],
6494
"info" : {

‎QiniuDemo/QiniuDemo/Base.lproj/LaunchScreen.storyboard‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina6_1" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
510
</dependencies>
611
<scenes>
712
<!--View Controller-->
@@ -13,10 +18,9 @@
1318
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
1419
</layoutGuides>
1520
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
16-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
21+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
1722
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<animations/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
23+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2024
</view>
2125
</viewController>
2226
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

‎QiniuDemo/QiniuDemo/Base.lproj/Main.storyboard‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="ICJ-el-kyi">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ICJ-el-kyi">
3+
<device id="retina6_1" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6-
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
7+
<deployment version="1792" identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
710
</dependencies>
811
<scenes>
912
<!--Navigation Controller-->
1013
<scene sceneID="OxZ-yA-b7f">
1114
<objects>
1215
<navigationController id="ICJ-el-kyi" sceneMemberID="viewController">
1316
<navigationBar key="navigationBar" contentMode="scaleToFill" id="0Ga-mq-GEB">
14-
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
17+
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
1518
<autoresizingMask key="autoresizingMask"/>
1619
</navigationBar>
1720
<connections>
@@ -31,42 +34,42 @@
3134
<viewControllerLayoutGuide type="bottom" id="EaF-tv-BfV"/>
3235
</layoutGuides>
3336
<view key="view" contentMode="scaleToFill" id="UJS-dn-gjX">
34-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
37+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
3538
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3639
<subviews>
37-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f8h-Tl-cef">
40+
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f8h-Tl-cef">
3841
<rect key="frame" x="70" y="114" width="460" height="50"/>
39-
<color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
42+
<color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4043
<constraints>
4144
<constraint firstAttribute="height" constant="50" id="kgT-aZ-IJU"/>
4245
</constraints>
4346
<fontDescription key="fontDescription" type="system" pointSize="20"/>
4447
<state key="normal" title="选择">
45-
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
48+
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4649
</state>
4750
<connections>
4851
<action selector="chooseAction:" destination="a0v-GO-7Qr" eventType="touchUpInside" id="tAj-mW-jxy"/>
4952
</connections>
5053
</button>
51-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Psn-X6-kmD">
54+
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Psn-X6-kmD">
5255
<rect key="frame" x="70" y="194" width="460" height="50"/>
53-
<color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
56+
<color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
5457
<constraints>
5558
<constraint firstAttribute="height" constant="50" id="pu0-Bk-3Gw"/>
5659
</constraints>
5760
<fontDescription key="fontDescription" type="system" pointSize="20"/>
5861
<state key="normal" title="上传">
59-
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
62+
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
6063
</state>
6164
<connections>
6265
<action selector="uploadAction:" destination="a0v-GO-7Qr" eventType="touchUpInside" id="QAY-9o-VbD"/>
6366
</connections>
6467
</button>
65-
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="PUC-cw-bND">
68+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PUC-cw-bND">
6669
<rect key="frame" x="20" y="274" width="560" height="326"/>
6770
</imageView>
6871
</subviews>
69-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
72+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
7073
<constraints>
7174
<constraint firstItem="f8h-Tl-cef" firstAttribute="leading" secondItem="UJS-dn-gjX" secondAttribute="leadingMargin" constant="50" id="93T-X6-QAQ"/>
7275
<constraint firstAttribute="trailingMargin" secondItem="Psn-X6-kmD" secondAttribute="trailing" constant="50" id="MQh-ht-UJM"/>

‎QiniuDemo/QiniuDemo/ViewController.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
//
88

99
#import "ViewController.h"
10-
#import "AFNetworking.h"
11-
#import "UIImageView+AFNetworking.h"
1210

1311
@interface ViewController () <UINavigationControllerDelegate, UIImagePickerControllerDelegate>
1412

0 commit comments

Comments
 (0)