marinofaggiana hace 6 años
padre
commit
d725ac6676

+ 23 - 0
iOSClient/Images.xcassets/qrcode.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/qrcode.imageset/qrcode.png


BIN
iOSClient/Images.xcassets/qrcode.imageset/qrcode@2x.png


BIN
iOSClient/Images.xcassets/qrcode.imageset/qrcode@3x.png


+ 19 - 2
iOSClient/Login/CCLogin.m

@@ -252,15 +252,32 @@
     }
 }
 
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark === NCLoginQRCodeDelegate ===
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)dismissQRCode:(NSString *)value metadataType:(NSString *)metadataType
 {
-    if (value != nil) {
+    if (value != nil && [value containsString:[NCBrandOptions sharedInstance].webLoginAutenticationProtocol]) {
+        
+        value = [value stringByReplacingOccurrencesOfString:[NCBrandOptions sharedInstance].webLoginAutenticationProtocol withString:@""];
+        value = [value stringByReplacingOccurrencesOfString:@"login/" withString:@""];
         
+        NSArray *valueArray = [value componentsSeparatedByString: @"&"];
+        
+        if (valueArray.count == 3) {
+            
+            _imageUser.hidden = NO;
+            _user.hidden = NO;
+            _imagePassword.hidden = NO;
+            _password.hidden = NO;
+            
+            [self.loginTypeView setTitle:NSLocalizedString(@"_web_login_", nil) forState:UIControlStateNormal];
+            
+            self.user.text = [valueArray[0] stringByReplacingOccurrencesOfString:@"user:" withString:@""];
+            self.password.text = [valueArray[1] stringByReplacingOccurrencesOfString:@"password:" withString:@""];
+            self.baseUrl.text = [valueArray[2] stringByReplacingOccurrencesOfString:@"server:" withString:@""];
+        }
     }
 }
 

+ 2 - 2
iOSClient/Login/CCLogin.storyboard

@@ -126,7 +126,7 @@
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6tp-bh-Z9k" userLabel="QRCode">
                                 <rect key="frame" x="194.66666666666666" y="440.66666666666669" width="25" height="25"/>
-                                <state key="normal" image="autoUpload"/>
+                                <state key="normal" image="qrcode"/>
                                 <connections>
                                     <action selector="handleQRCode:" destination="yj9-jo-WIn" eventType="touchUpInside" id="IW6-a9-880"/>
                                 </connections>
@@ -189,10 +189,10 @@
         </scene>
     </scenes>
     <resources>
-        <image name="autoUpload" width="25" height="25"/>
         <image name="loginPassword" width="25" height="25"/>
         <image name="loginURL" width="25" height="25"/>
         <image name="loginUser" width="25" height="25"/>
+        <image name="qrcode" width="25" height="25"/>
         <image name="visiblePassword" width="25" height="25"/>
     </resources>
 </document>