美购搜索页面

8a8f072b · licong · fca97fd8 · 8a8f072b · 8a8f072b · 8a8f072b
Commit 8a8f072b authored Oct 12, 2017 by licong
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 7 deletions

project.pbxproj Example/GMBase.xcodeproj/project.pbxproj +45 -2

Podfile.lock Example/Podfile.lock +4 -4

WMBaseViewController.h GMBase/Classes/WMBaseViewController.h +1 -1

No files found.
--- a/Example/GMBase.xcodeproj/project.pbxproj
+++ b/Example/GMBase.xcodeproj/project.pbxproj
@@ -336,9 +336,46 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-GMBase_Example/Pods-GMBase_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/Base64nl/Base64nl.framework",
+				"${BUILT_PRODUCTS_DIR}/GMBase/GMBase.framework",
+				"${BUILT_PRODUCTS_DIR}/GMCache/GMCache.framework",
+				"${BUILT_PRODUCTS_DIR}/GMFoundation/GMFoundation.framework",
+				"${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework",
+				"${BUILT_PRODUCTS_DIR}/GMKit/GMKit.framework",
+				"${BUILT_PRODUCTS_DIR}/GMNetService/GMNetService.framework",
+				"${BUILT_PRODUCTS_DIR}/GMOCConstant/GMOCConstant.framework",
+				"${BUILT_PRODUCTS_DIR}/GMPhobos/GMPhobos.framework",
+				"${BUILT_PRODUCTS_DIR}/GMRefresh/GMRefresh.framework",
+				"${BUILT_PRODUCTS_DIR}/JSONModel/JSONModel.framework",
+				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
+				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
+				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${BUILT_PRODUCTS_DIR}/TMCache/TMCache.framework",
+				"${BUILT_PRODUCTS_DIR}/UITableView+FDTemplateLayoutCell/UITableView_FDTemplateLayoutCell.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Base64nl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMBase.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMCache.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMFoundation.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMNetService.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMOCConstant.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMPhobos.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRefresh.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSONModel.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TMCache.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UITableView_FDTemplateLayoutCell.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -351,13 +388,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-GMBase_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 		AD2DAA4386519D3497CC28DC /* [CP] Copy Pods Resources */ = {
@@ -396,13 +436,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-GMBase_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -15,7 +15,7 @@ PODS:
  - AFNetworking/UIKit (3.1.0):
    - AFNetworking/NSURLSession
  - Base64nl (1.2)
-  - GMBase (0.1.2):
+  - GMBase (0.1.3):
    - GMHud
    - GMKit
    - GMNetService
@@ -84,12 +84,12 @@ DEPENDENCIES:

 EXTERNAL SOURCES:
  GMBase:
-    :path: "../"
+    :path: ../

 SPEC CHECKSUMS:
  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
  Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
-  GMBase: 82cc7220ff236b037121074a2d3793e4c780503f
+  GMBase: 464d0453701765bffcd105fe2090b6d534fc01a9
  GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
  GMFoundation: 395f1083c40aa38e9fb031726991dbc20247e2f9
  GMHud: 67c24abb83777c61e43741d4a803f7b6d8ad4e1e
@@ -108,4 +108,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 0c80e9302d494ed154da93823382c933df985f69

-COCOAPODS: 1.2.1
+COCOAPODS: 1.3.1
--- a/GMBase/Classes/WMBaseViewController.h
+++ b/GMBase/Classes/WMBaseViewController.h
@@ -31,6 +31,6 @@

 - (void)showEmptyView:(GMEmptyViewType)type;
 - (void)hideEmptyView;
-
+- (void)setupEmptyView;
 - (void)emptyViewDidClickReload;
 @end