Browse Source

登录页面替换

huangyp 6 years ago
parent
commit
916f7ca8b4

+ 2 - 1
UU_Ent/UU_Ent.podspec

@@ -38,7 +38,8 @@ Pod::Spec.new do |s|
       #{src}/base.proto\
       #{src}/account.proto\
       #{src}/message.proto\
-
+      #{src}/app.proto\
+      #{src}/home.proto
   CMD
 
   # Files generated by protoc

+ 8 - 8
UU_Ent/UU_Ent.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		27029BC72276A23400D53A94 /* YRLoginVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 27029BC62276A23400D53A94 /* YRLoginVC.m */; };
 		3FE47A8D89A70D18F98B1E41 /* libPods-UU_EntUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F4F857DEEC69AEDCFACDFD51 /* libPods-UU_EntUITests.a */; };
 		99C6FE6122768B5C00C7070A /* UU_EntTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE6022768B5C00C7070A /* UU_EntTests.m */; };
 		99C6FE6C22768B5C00C7070A /* UU_EntUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE6B22768B5C00C7070A /* UU_EntUITests.m */; };
@@ -17,7 +18,6 @@
 		99C6FE96227690BE00C7070A /* YRBaseVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE95227690BE00C7070A /* YRBaseVC.m */; };
 		99C6FE99227690F800C7070A /* YRBaseNav.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE98227690F800C7070A /* YRBaseNav.m */; };
 		99C6FEBA2276950C00C7070A /* YRMainVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FEB92276950C00C7070A /* YRMainVC.m */; };
-		99C6FEBD2276953E00C7070A /* YRVLoginVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FEBC2276953E00C7070A /* YRVLoginVC.m */; };
 		99C6FEC02276957400C7070A /* YRMineVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FEBF2276957400C7070A /* YRMineVC.m */; };
 		99C6FEC32276959B00C7070A /* YRWorkVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FEC22276959B00C7070A /* YRWorkVC.m */; };
 		99C6FEC82276966600C7070A /* YRWebVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FEC72276966600C7070A /* YRWebVC.m */; };
@@ -48,6 +48,8 @@
 /* Begin PBXFileReference section */
 		102F3AF440E73FF2A1EB3208 /* libPods-UU_EntTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-UU_EntTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13A4F2D13DACD5857BD40BDE /* Pods-UU_Ent.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UU_Ent.release.xcconfig"; path = "Pods/Target Support Files/Pods-UU_Ent/Pods-UU_Ent.release.xcconfig"; sourceTree = "<group>"; };
+		27029BC52276A23400D53A94 /* YRLoginVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRLoginVC.h; sourceTree = "<group>"; };
+		27029BC62276A23400D53A94 /* YRLoginVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRLoginVC.m; sourceTree = "<group>"; };
 		49A8B37D50A80EFFD84620EC /* Pods-UU_EntTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UU_EntTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-UU_EntTests/Pods-UU_EntTests.release.xcconfig"; sourceTree = "<group>"; };
 		49D3F089EECE8E3EDF7D2E1C /* Pods-UU_EntUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UU_EntUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-UU_EntUITests/Pods-UU_EntUITests.release.xcconfig"; sourceTree = "<group>"; };
 		71B4DF45C8EC3368ACFC4193 /* Pods-UU_Ent.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UU_Ent.debug.xcconfig"; path = "Pods/Target Support Files/Pods-UU_Ent/Pods-UU_Ent.debug.xcconfig"; sourceTree = "<group>"; };
@@ -70,8 +72,6 @@
 		99C6FE98227690F800C7070A /* YRBaseNav.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRBaseNav.m; sourceTree = "<group>"; };
 		99C6FEB82276950C00C7070A /* YRMainVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRMainVC.h; sourceTree = "<group>"; };
 		99C6FEB92276950C00C7070A /* YRMainVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRMainVC.m; sourceTree = "<group>"; };
-		99C6FEBB2276953E00C7070A /* YRVLoginVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRVLoginVC.h; sourceTree = "<group>"; };
-		99C6FEBC2276953E00C7070A /* YRVLoginVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRVLoginVC.m; sourceTree = "<group>"; };
 		99C6FEBE2276957400C7070A /* YRMineVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRMineVC.h; sourceTree = "<group>"; };
 		99C6FEBF2276957400C7070A /* YRMineVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRMineVC.m; sourceTree = "<group>"; };
 		99C6FEC12276959B00C7070A /* YRWorkVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRWorkVC.h; sourceTree = "<group>"; };
@@ -401,8 +401,8 @@
 		99C6FEA62276940600C7070A /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				99C6FEBB2276953E00C7070A /* YRVLoginVC.h */,
-				99C6FEBC2276953E00C7070A /* YRVLoginVC.m */,
+				27029BC52276A23400D53A94 /* YRLoginVC.h */,
+				27029BC62276A23400D53A94 /* YRLoginVC.m */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -747,7 +747,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/gRPC/gRPCCertificates.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
@@ -756,7 +756,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-UU_Ent/Pods-UU_Ent-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		A2F6040888740937A057571A /* [CP] Check Pods Manifest.lock */ = {
@@ -785,7 +785,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				99C6FED12276982F00C7070A /* YRTabBar.m in Sources */,
-				99C6FEBD2276953E00C7070A /* YRVLoginVC.m in Sources */,
 				99C6FECB227696CA00C7070A /* YRMsgVC.m in Sources */,
 				99C6FE9222768EC000C7070A /* main.m in Sources */,
 				99C6FE99227690F800C7070A /* YRBaseNav.m in Sources */,
@@ -796,6 +795,7 @@
 				99C6FEC02276957400C7070A /* YRMineVC.m in Sources */,
 				99C6FE8F22768EC000C7070A /* AppDelegate.m in Sources */,
 				99C6FEBA2276950C00C7070A /* YRMainVC.m in Sources */,
+				27029BC72276A23400D53A94 /* YRLoginVC.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 10 - 0
UU_Ent/UU_Ent.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:UU_Ent.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

+ 8 - 0
UU_Ent/UU_Ent.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

+ 3 - 3
UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRVLoginVC.h → UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRLoginVC.h

@@ -1,8 +1,8 @@
 //
-//  YRVLoginVC.h
+//  YRLoginVC.h
 //  UU_Ent
 //
-//  Created by liujl on 2019/4/29.
+//  Created by huangyp-pc on 2019/4/29.
 //  Copyright © 2019 UAS. All rights reserved.
 //
 
@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface YRVLoginVC : YRBaseVC
+@interface YRLoginVC : YRBaseVC
 
 @end
 

+ 32 - 0
UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRLoginVC.m

@@ -0,0 +1,32 @@
+//
+//  YRLoginVC.m
+//  UU_Ent
+//
+//  Created by huangyp-pc on 2019/4/29.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import "YRLoginVC.h"
+
+@interface YRLoginVC ()
+
+@end
+
+@implementation YRLoginVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

+ 0 - 24
UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRVLoginVC.m

@@ -1,24 +0,0 @@
-//
-//  YRVLoginVC.m
-//  UU_Ent
-//
-//  Created by liujl on 2019/4/29.
-//  Copyright © 2019 UAS. All rights reserved.
-//
-
-#import "YRVLoginVC.h"
-
-@interface YRVLoginVC ()
-
-@end
-
-@implementation YRVLoginVC
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-}
-
-
-
-@end