Commit 96753d97a056db22eec8d69221422e29cb310388

Authored by 赵康
Exists in master

Merge branch 'master' of http://123.59.74.8/document/spreader.git

Showing 8 changed files Side-by-side Diff

ios/SpreadDemo/SpreadDemo.xcodeproj/project.pbxproj
... ... @@ -17,7 +17,7 @@
17 17 3309D8DC1C3BA7CE00534E33 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3309D8DB1C3BA7CE00534E33 /* Default-568h@2x.png */; };
18 18 3309D9511C3E098000534E33 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3309D9501C3E098000534E33 /* SystemConfiguration.framework */; };
19 19 3309D95B1C3E0B1500534E33 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3309D95A1C3E0B1500534E33 /* MobileCoreServices.framework */; };
20   - 336FC7F61C4F305F00151550 /* Spreader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 336FC7F51C4F305F00151550 /* Spreader.framework */; };
  20 + 3396626B1C86D91100022866 /* Spreader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3396626A1C86D91100022866 /* Spreader.framework */; };
21 21 /* End PBXBuildFile section */
22 22  
23 23 /* Begin PBXFileReference section */
... ... @@ -35,7 +35,7 @@
35 35 3309D8DB1C3BA7CE00534E33 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
36 36 3309D9501C3E098000534E33 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
37 37 3309D95A1C3E0B1500534E33 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
38   - 336FC7F51C4F305F00151550 /* Spreader.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Spreader.framework; path = ../Spreader.framework; sourceTree = "<group>"; };
  38 + 3396626A1C86D91100022866 /* Spreader.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Spreader.framework; path = ../Spreader.framework; sourceTree = "<group>"; };
39 39 /* End PBXFileReference section */
40 40  
41 41 /* Begin PBXFrameworksBuildPhase section */
... ... @@ -43,7 +43,7 @@
43 43 isa = PBXFrameworksBuildPhase;
44 44 buildActionMask = 2147483647;
45 45 files = (
46   - 336FC7F61C4F305F00151550 /* Spreader.framework in Frameworks */,
  46 + 3396626B1C86D91100022866 /* Spreader.framework in Frameworks */,
47 47 3309D95B1C3E0B1500534E33 /* MobileCoreServices.framework in Frameworks */,
48 48 3309D9511C3E098000534E33 /* SystemConfiguration.framework in Frameworks */,
49 49 3309D8CF1C34CEF000534E33 /* CoreGraphics.framework in Frameworks */,
... ... @@ -98,7 +98,7 @@
98 98 3309D8D01C3A28A000534E33 /* Frameworks */ = {
99 99 isa = PBXGroup;
100 100 children = (
101   - 336FC7F51C4F305F00151550 /* Spreader.framework */,
  101 + 3396626A1C86D91100022866 /* Spreader.framework */,
102 102 3309D95A1C3E0B1500534E33 /* MobileCoreServices.framework */,
103 103 3309D9501C3E098000534E33 /* SystemConfiguration.framework */,
104 104 3309D8CE1C34CEF000534E33 /* CoreGraphics.framework */,
... ... @@ -291,13 +291,17 @@
291 291 CODE_SIGN_IDENTITY = "iPhone Developer";
292 292 ENABLE_BITCODE = NO;
293 293 FRAMEWORK_SEARCH_PATHS = (
  294 + "$(PROJECT_DIR)/../**",
294 295 "$(PROJECT_DIR)",
295   - "$(PROJECT_DIR)/../",
296 296 );
297   - HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../Spreader.Framework/**";
  297 + HEADER_SEARCH_PATHS = (
  298 + "$(PROJECT_DIR)/Spreader.Framework/**",
  299 + "$(PROJECT_DIR)/../../../SpreaderSDK/**",
  300 + );
298 301 INFOPLIST_FILE = SpreadDemo/Info.plist;
299 302 IPHONEOS_DEPLOYMENT_TARGET = 6.0;
300 303 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  304 + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/**";
301 305 OTHER_CODE_SIGN_FLAGS = "";
302 306 OTHER_LDFLAGS = "-ObjC";
303 307 PRODUCT_BUNDLE_IDENTIFIER = Gump.SpreadDemo;
... ... @@ -315,13 +319,17 @@
315 319 CODE_SIGN_IDENTITY = "iPhone Developer";
316 320 ENABLE_BITCODE = NO;
317 321 FRAMEWORK_SEARCH_PATHS = (
  322 + "$(PROJECT_DIR)/../**",
318 323 "$(PROJECT_DIR)",
319   - "$(PROJECT_DIR)/../",
320 324 );
321   - HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../Spreader.Framework/**";
  325 + HEADER_SEARCH_PATHS = (
  326 + "$(PROJECT_DIR)/Spreader.Framework/**",
  327 + "$(PROJECT_DIR)/../../../SpreaderSDK/**",
  328 + );
322 329 INFOPLIST_FILE = SpreadDemo/Info.plist;
323 330 IPHONEOS_DEPLOYMENT_TARGET = 6.0;
324 331 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  332 + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/**";
325 333 OTHER_CODE_SIGN_FLAGS = "";
326 334 OTHER_LDFLAGS = "-ObjC";
327 335 PRODUCT_BUNDLE_IDENTIFIER = Gump.SpreadDemo;
ios/SpreadDemo/SpreadDemo/Spreader.bundle/en.strings
1 1 "promote"="Promote";
2 2 "claim"="Claim";
3 3 "verify"="Verify";
4   -"invalid_request"="Invalid request";
5 4 \ No newline at end of file
  5 +"invalid_request"="Invalid request";
  6 +"copy4share"="Copy and share";
  7 +"copied_tips"="Copied to the clipboard";
  8 +"get_reward_succ"="Claimed";
6 9 \ No newline at end of file
ios/SpreadDemo/SpreadDemo/ViewController.m
... ... @@ -28,9 +28,10 @@
28 28 }
29 29  
30 30 -(void)enter{
  31 + [SpreaderSDK enableTestEnv:YES];
31 32 [SpreaderSDK sharedSDK].appId = @"10022";
32   - [SpreaderSDK sharedSDK].userId = @"10076";
33   - [SpreaderSDK sharedSDK].serverId = @"1001";
  33 + [SpreaderSDK sharedSDK].userId = @"1545402";
  34 + [SpreaderSDK sharedSDK].serverId = @"";
34 35 [SpreaderSDK sharedSDK].roleId = @"10009";
35 36 [[SpreaderSDK sharedSDK] enter];
36 37 }
ios/Spreader.bundle/en.strings
1 1 "promote"="Promote";
2 2 "claim"="Claim";
3 3 "verify"="Verify";
4   -"invalid_request"="Invalid request";
5 4 \ No newline at end of file
  5 +"invalid_request"="Invalid request";
  6 +"copy4share"="Copy and share";
  7 +"copied_tips"="Copied to the clipboard";
  8 +"get_reward_succ"="Claimed";
6 9 \ No newline at end of file
ios/Spreader.framework/Versions/A/Headers/SpreaderSDK.h
... ... @@ -15,7 +15,7 @@
15 15  
16 16 @end
17 17  
18   -static NSString *spreaderVersion = @"1.0.1";
  18 +static NSString *spreaderVersion = @"1.0.3";
19 19 @interface SpreaderSDK : NSObject
20 20  
21 21 @property(nonatomic,copy) NSString *appId;
... ... @@ -29,4 +29,6 @@ static NSString *spreaderVersion = @&quot;1.0.1&quot;;
29 29  
30 30 +(instancetype)sharedSDK;
31 31 -(void)enter;
  32 +
  33 ++(void)enableTestEnv:(BOOL)state;
32 34 @end
ios/Spreader.framework/Versions/A/Spreader
No preview for this file type
No preview for this file type
ios/spreader.zip
No preview for this file type