Merge branch 'master' of ssh://10.10.100.21/source/UUEnt

UU_Ent/UU_Ent.xcodeproj/project.pbxproj

@@ -1166,7 +1166,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_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/gRPC/gRPCCertificates.bundle",
 			);
@@ -1177,7 +1177,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 */ = {

UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRLoginVC.m

@@ -31,6 +31,8 @@
 #pragma mark --- 登录操作
 -(void)loginAction
 {
+    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    
     [GRPCCall useInsecureConnectionsForHost:kHostAddress];
     
     AccountService *client = [[AccountService alloc]initWithHost:kHostAddress];
@@ -49,6 +51,8 @@
     
     [client signinWithRequest:request handler:^(AccountSigninResponse * _Nullable response, NSError * _Nullable error) {
         
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
+        
         if (!error) {
             
             NSDictionary *resDic = response.mj_keyValues;

UU_Ent/UU_Ent/Supporting Files/Assets.xcassets/Resources/Contacts/UU_newPublicPic.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "UU_newPublicPic@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_newPublicPic@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "UU_newPublicPic@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UU_Ent/UU_Ent/Utils/UIButton/YRButton.h

@@ -16,6 +16,7 @@
 /**
  title:按钮名字
  color:字体颜色
+ font:字体大小
  nColor:按钮正常颜色
  sColor:按钮点击颜色
  dColor:按钮不可点击颜色