Merge branch 'master' into master

leo23 · Feb 11, 2019 · c9ad88d · c9ad88d
2 parents 337f62a + e2b6436
commit c9ad88d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/Doc/android_cn_guide.md b/Doc/android_cn_guide.md
@@ -23,7 +23,7 @@ dependencies {
 @Override
 public void onCreate() {
 	...
-    DoraemonKit.install(application）
+    DoraemonKit.install(application)
      
     // H5任意门功能需要，非必须
     DoraemonKit.setWebDoorCallback(new WebDoorManager.WebDoorCallback() {
@@ -109,4 +109,4 @@ public void onCreate() {
     DoraemonKit.install(application, kits);
     ...
 }
-```
+```
diff --git a/Doc/android_en_guide.md b/Doc/android_en_guide.md
@@ -11,7 +11,7 @@ dependencies {
 }
 ```
 
-Please use [the lastest release](android-ReleaseNotes.md)。
+Please use [the latest release](android-ReleaseNotes.md)。
 
 
 
@@ -109,4 +109,4 @@ public void onCreate() {
     DoraemonKit.install(application, kits);
     ...
 }
-```
+```
diff --git a/iOS/DoraemonKit/Framework/DoraemonLoadAnalyze.framework/DoraemonLoadAnalyze b/iOS/DoraemonKit/Framework/DoraemonLoadAnalyze.framework/DoraemonLoadAnalyze
diff --git a/iOS/DoraemonKit/Framework/DoraemonLoadAnalyze.framework/Info.plist b/iOS/DoraemonKit/Framework/DoraemonLoadAnalyze.framework/Info.plist
diff --git a/iOS/DoraemonKitDemo/DoraemonKitDemo.xcodeproj/project.pbxproj b/iOS/DoraemonKitDemo/DoraemonKitDemo.xcodeproj/project.pbxproj
@@ -568,7 +568,7 @@
 				GCC_PREFIX_HEADER = "DoraemonKitDemo/DoraemonKitDemo-PrefixHeader.pch";
 				INFOPLIST_FILE = DoraemonKitDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = yixiang.DoraemonKitDemoC;
+				PRODUCT_BUNDLE_IDENTIFIER = yixiang.DoraemonKitDemoXXX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -586,7 +586,7 @@
 				GCC_PREFIX_HEADER = "DoraemonKitDemo/DoraemonKitDemo-PrefixHeader.pch";
 				INFOPLIST_FILE = DoraemonKitDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = yixiang.DoraemonKitDemoC;
+				PRODUCT_BUNDLE_IDENTIFIER = yixiang.DoraemonKitDemoXXX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

diff --git a/iOS/DoraemonLoadAnalyzeDemo/DoraemonLoadAnalyzeDemo.xcodeproj/project.pbxproj b/iOS/DoraemonLoadAnalyzeDemo/DoraemonLoadAnalyzeDemo.xcodeproj/project.pbxproj
@@ -430,15 +430,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 2M632FEG3H;
+				DEVELOPMENT_TEAM = RSV7DQ57L7;
 				INFOPLIST_FILE = DoraemonLoadAnalyzeDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = com.javer.yi.DoraemonLoadAnalyzeDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.javer.yi.DoraemonLoadAnalyzeDemoXXXX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -449,15 +449,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 2M632FEG3H;
+				DEVELOPMENT_TEAM = RSV7DQ57L7;
 				INFOPLIST_FILE = DoraemonLoadAnalyzeDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = com.javer.yi.DoraemonLoadAnalyzeDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.javer.yi.DoraemonLoadAnalyzeDemoXXXX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ dependencies { @@
     }
     ```
-    Please use [the lastest release](android-ReleaseNotes.md)。
+    Please use [the latest release](android-ReleaseNotes.md)。
@@ Expand Down Expand Up / @@ -109,4 +109,4 @@ public void onCreate() { @@
         DoraemonKit.install(application, kits);
         ...
     }
-    ```
+    ```