解决didi#13

tdkr · Dec 11, 2018 · d261fcb · d261fcb
1 parent a7f373a
commit d261fcb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/DoraemonKit.podspec b/DoraemonKit.podspec
@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'DoraemonKit'
-  s.version          = '1.1.0'
+  s.version          = '1.1.1'
   s.summary          = 'iOS各式各样的工具集合'
   s.description      = <<-DESC
                           iOS各式各样的工具集合 Desc

diff --git a/DoraemonKit/Src/Core/Plugin/H5/DoraemonH5ViewController.m b/DoraemonKit/Src/Core/Plugin/H5/DoraemonH5ViewController.m
@@ -10,7 +10,7 @@
 #import "DoraemonToastUtil.h"
 #import "DoraemonDefine.h"
 #import "Doraemoni18NUtil.h"
-#import <UITextView+Placeholder/UITextView+Placeholder.h>
+#import "UITextView+Placeholder.h"
 
 @interface DoraemonH5ViewController ()
 

diff --git a/DoraemonKit/Src/Core/Util/Doraemoni18NUtil.m b/DoraemonKit/Src/Core/Util/Doraemoni18NUtil.m
@@ -26,6 +26,8 @@ @implementation Doraemoni18NUtil
 
 + (NSString *)localizedString:(NSString *)key {
 
+    return key;
+    //暂时不支持国际化
     NSString *language = [[NSLocale preferredLanguages] firstObject];
     if (language.length == 0) {
         return key;
@@ -42,6 +44,9 @@ + (NSString *)localizedString:(NSString *)key {
     NSString *path = [tmp pathForResource:fileNamePrefix ofType:@"lproj"];
     NSBundle *bundle = [NSBundle bundleWithPath:path];
     NSString *localizedString = [bundle localizedStringForKey:key value:nil table:@"Doraemon"];
+    if (!localizedString) {
+        localizedString = key;
+    }
     return localizedString;
 }
 

diff --git a/DoraemonKit/Src/Logger/Function/DoraemonCocoaLumberjackLogger.h b/DoraemonKit/Src/Logger/Function/DoraemonCocoaLumberjackLogger.h
@@ -5,7 +5,7 @@
 //  Created by yixiang on 2018/12/5.
 //
 
-#import "DDLog.h"
+#import <CocoaLumberjack/DDLog.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/DoraemonKitDemo/DoraemonKitDemo.xcodeproj/project.pbxproj b/DoraemonKitDemo/DoraemonKitDemo.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		B65C2263AF96F94C50A222DF /* libPods-DoraemonKitDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E964A2D92411C9DC5482EF /* libPods-DoraemonKitDemo.a */; };
 		DA0C6F331FDEBC2E00F43588 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA0C6F311FDEBC2E00F43588 /* LaunchScreen.storyboard */; };
 		DA0C6F3A1FDEBE3800F43588 /* TestPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0C6F391FDEBE3800F43588 /* TestPlugin.m */; };
 		DAC8A87C1FDE2C3B00F03E6F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC8A87B1FDE2C3B00F03E6F /* AppDelegate.m */; };
@@ -25,11 +26,10 @@
 		DAFE052D21BD4A4D00F97A59 /* DoraemonDemoMockGPSAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE051E21BD4A4C00F97A59 /* DoraemonDemoMockGPSAnnotation.m */; };
 		DAFE052E21BD4A4D00F97A59 /* DoraemonDemoMockGPSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE052121BD4A4C00F97A59 /* DoraemonDemoMockGPSViewController.m */; };
 		DAFE052F21BD4A4D00F97A59 /* DoraemonDemoPerformanceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE052321BD4A4C00F97A59 /* DoraemonDemoPerformanceViewController.m */; };
-		EF63DA315CE9C3FF91A5B115 /* libPods-DoraemonKitDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8416D6FFC369740B6116CA2B /* libPods-DoraemonKitDemo.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		8416D6FFC369740B6116CA2B /* libPods-DoraemonKitDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DoraemonKitDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		29E964A2D92411C9DC5482EF /* libPods-DoraemonKitDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DoraemonKitDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA0C6F321FDEBC2E00F43588 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		DA0C6F381FDEBE3800F43588 /* TestPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestPlugin.h; sourceTree = "<group>"; };
 		DA0C6F391FDEBE3800F43588 /* TestPlugin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestPlugin.m; sourceTree = "<group>"; };
@@ -75,7 +75,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EF63DA315CE9C3FF91A5B115 /* libPods-DoraemonKitDemo.a in Frameworks */,
+				B65C2263AF96F94C50A222DF /* libPods-DoraemonKitDemo.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,7 +94,7 @@
 		9B3A6EF2639894DCF5DB2FD4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				8416D6FFC369740B6116CA2B /* libPods-DoraemonKitDemo.a */,
+				29E964A2D92411C9DC5482EF /* libPods-DoraemonKitDemo.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -266,7 +266,7 @@
 				DAC8A8731FDE2C3B00F03E6F /* Sources */,
 				DAC8A8741FDE2C3B00F03E6F /* Frameworks */,
 				DAC8A8751FDE2C3B00F03E6F /* Resources */,
-				187131D466B63701214420E4 /* [CP] Copy Pods Resources */,
+				4338E62332869AF074F6B38C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -323,7 +323,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		187131D466B63701214420E4 /* [CP] Copy Pods Resources */ = {
+		4338E62332869AF074F6B38C /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (

diff --git a/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/DoraemonDemoNetViewController.h b/DoraemonKitDemo/DoraemonKitDemo/DemoVC/Net/DoraemonDemoNetViewController.h
@@ -6,7 +6,7 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import <DoraemonKit/DoraemonBaseViewController.h>
 
 @interface DoraemonDemoNetViewController : DoraemonBaseViewController
 

diff --git a/DoraemonKitDemo/DoraemonKitDemo/DemoVC/UI/DoraemonDemoUIViewController.h b/DoraemonKitDemo/DoraemonKitDemo/DemoVC/UI/DoraemonDemoUIViewController.h
@@ -6,7 +6,7 @@
 //  Copyright © 2018年 yixiang. All rights reserved.
 //
 
-#import <DoraemonKit/DoraemonKit.h>
+#import <DoraemonKit/DoraemonBaseViewController.h>
 
 @interface DoraemonDemoUIViewController : DoraemonBaseViewController
 

diff --git a/DoraemonKitDemo/Podfile.lock b/DoraemonKitDemo/Podfile.lock
@@ -27,13 +27,13 @@ PODS:
   - CocoaLumberjack/Default (3.4.2)
   - CocoaLumberjack/Extensions (3.4.2):
     - CocoaLumberjack/Default
-  - DoraemonKit/Core (1.0.4):
+  - DoraemonKit/Core (1.1.0):
     - AFNetworking
     - BSBacktraceLogger
     - fishhook
     - PNChart
     - "UITextView+Placeholder"
-  - DoraemonKit/WithLogger (1.0.4):
+  - DoraemonKit/WithLogger (1.1.0):
     - AFNetworking
     - BSBacktraceLogger
     - CocoaLumberjack
@@ -69,7 +69,7 @@ SPEC CHECKSUMS:
   AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
   BSBacktraceLogger: 06b983ee93a9f87d957960e9c73d660d5966b447
   CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
-  DoraemonKit: 890210a96e2b9131787f1a47c786629ce155e5fc
+  DoraemonKit: b5f93ead3dc6d5522ba0d811be7987c58245c6ed
   fishhook: ea19933abfe8f2f52c55fd8b6e2718467d3ebc89
   PNChart: 84774d225c2126ded6c93d4dbe6ae98c3a73c2d2
   UICountingLabel: 1db4e7d023e1762171eb226d6dff47a7a84f27aa