Merge pull request #36 from cslrfid/release-3.0

ksclam · web-flow · commit 5eaf503bc7d9 · 2020-04-02T02:53:09.000-04:00
Release 3.0
diff --git a/CS108iOSClient.xcodeproj/project.pbxproj b/CS108iOSClient.xcodeproj/project.pbxproj
@@ -659,7 +659,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.9;
+				MARKETING_VERSION = 3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -682,7 +682,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.9;
+				MARKETING_VERSION = 3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/CS108iOSClient/CSLReader/CSLBleReader+AccessControl.m b/CS108iOSClient/CSLReader/CSLBleReader+AccessControl.m
@@ -1488,8 +1488,10 @@ - (BOOL) startTagMemoryRead:(MEMORYBANK)bank dataOffset:(UInt16)offset dataCount
         [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0080"]) ||
         ([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"01"] &&
          [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0000"])
-        )
+        ) {
+        self.lastMacErrorCode=0x0000;
         NSLog(@"Receive read command-begin response: OK");
+    }
     else
     {
         NSLog(@"Receive read command-begin response: FAILED");
@@ -1594,8 +1596,10 @@ - (BOOL) startTagMemoryWrite:(MEMORYBANK)bank dataOffset:(UInt16)offset dataCoun
              [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0080"]) ||
             ([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"01"] &&
              [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0000"])
-            )
+            ) {
+            self.lastMacErrorCode=0x0000;
             NSLog(@"Receive read command-begin response: OK");
+        }
         else
         {
             NSLog(@"Receive read command-begin response: FAILED");
@@ -1659,8 +1663,10 @@ - (BOOL) startTagSearch:(MEMORYBANK)mask_bank maskPointer:(UInt16)mask_pointer m
          [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0080"]) ||
         ([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"01"] &&
          [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0000"])
-        )
+        ) {
+        self.lastMacErrorCode=0x0000;
         NSLog(@"Receive search command-begin response: OK");
+    }
     else
     {
         NSLog(@"Receive search command-begin response: FAILED");
@@ -1829,8 +1835,10 @@ - (BOOL) startTagMemoryLock:(UInt32)lockCommandConfigBits ACCPWD:(UInt32)passwor
          [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0080"]) ||
         ([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"01"] &&
          [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0000"])
-        )
+        ) {
+        self.lastMacErrorCode=0x0000;
         NSLog(@"Receive read command-begin response: OK");
+    }
     else
     {
         NSLog(@"Receive read command-begin response: FAILED");
diff --git a/CS108iOSClient/CSLReader/CSLBleReader.h b/CS108iOSClient/CSLReader/CSLBleReader.h
@@ -128,6 +128,9 @@ Insertion/update of tag data is based on binary searching algorithm for better e
 ///Delegate instance that follows the CSLBleReaderDelegate protocol
 @property (nonatomic, weak) id <CSLBleReaderDelegate> readerDelegate;
 
+///This error will be cleared every time when a host command is being initiated and set after and command-end response
+@property unsigned short lastMacErrorCode;
+
 /**
  Static method that converts hexdcecimal string to binary data
  
diff --git a/CS108iOSClient/CSLReader/CSLBleReader.m b/CS108iOSClient/CSLReader/CSLBleReader.m
@@ -1957,8 +1957,10 @@ - (BOOL)setLinkProfile:(LINKPROFILE) profile
     recvPacket = ((CSLBlePacket *)[cmdRespQueue deqObject]);
     if (([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"02"] && [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0080"]) ||
         ([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"01"] && [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0000"])
-        )
+        ) {
+        self.lastMacErrorCode=0x0000;
         NSLog(@"Receive HST_CMD 0x19 command-begin response: OK");
+    }
     else
     {
         NSLog(@"Receive HST_CMD 0x19 command-begin response: FAILED");
@@ -1972,11 +1974,14 @@ - (BOOL)setLinkProfile:(LINKPROFILE) profile
     if (([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"02"] || [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"01"]) &&
         ([[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0180"] || [[recvPacket.getPacketPayloadInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0100"]) &&
         ((Byte *)[recvPacket.payload bytes])[14] == 0x00 &&
-        ((Byte *)[recvPacket.payload bytes])[15] == 0x00)
+        ((Byte *)[recvPacket.payload bytes])[15] == 0x00) {
+        self.lastMacErrorCode=(((Byte *)[recvPacket.payload bytes])[15] << 8) + (((Byte *)[recvPacket.payload bytes])[14]);
         NSLog(@"Receive HST_CMD 0x19 command-end response: OK");
+    }
     else
     {
         NSLog(@"Receive HST_CMD 0x19 command-end response: FAILED");
+        self.lastMacErrorCode=(((Byte *)[recvPacket.payload bytes])[15] << 8) + (((Byte *)[recvPacket.payload bytes])[14]);
         connectStatus=CONNECTED;
         [self.delegate didInterfaceChangeConnectStatus:self]; //this will call the method for connections status chagnes.
         return FALSE;
@@ -2222,6 +2227,7 @@ - (void)decodePacketsInBufferAsync;
                         ([[rfidPacketBufferInHexString substringWithRange:NSMakeRange(4, 2)] isEqualToString:@"01"] && [[rfidPacketBufferInHexString substringWithRange:NSMakeRange(8, 4)] isEqualToString:@"0000"])
                         ) {
                         NSLog(@"[decodePacketsInBufferAsync] Command-begin response recieved: %@", rfidPacketBufferInHexString);
+                        self.lastMacErrorCode=0x0000;
                         //return packet directly to the API for decoding
                         [cmdRespQueue enqObject:packet];
                         [rfidPacketBuffer setLength:0];
@@ -2238,6 +2244,7 @@ - (void)decodePacketsInBufferAsync;
                         ) {
                         NSLog(@"[decodePacketsInBufferAsync] Command-end response recieved: %@", rfidPacketBufferInHexString);
                         //return packet directly to the API for decoding
+                        self.lastMacErrorCode=(((Byte *)[rfidPacketBuffer bytes])[15] << 8) + (((Byte *)[rfidPacketBuffer bytes])[14]);
                         [cmdRespQueue enqObject:packet];
                         [rfidPacketBuffer setLength:0];
                         connectStatus=CONNECTED;
@@ -2436,6 +2443,7 @@ - (void)decodePacketsInBufferAsync;
                                         ([[rfidPacketBufferInHexString substringWithRange:NSMakeRange(ptr * 2, 2)] isEqualToString:@"01"] && [[rfidPacketBufferInHexString substringWithRange:NSMakeRange((ptr+2) * 2, 4)] isEqualToString:@"0100"])
                                         ) {
                                         
+                                        self.lastMacErrorCode=(((Byte *)[rfidPacketBuffer bytes])[ptr+13] << 8) + (((Byte *)[rfidPacketBuffer bytes])[ptr+12]);
                                         //partial command-end packet received
                                         //remove decoded data from rfid buffer and leave the partial packet on the buffer with 8100 appended to the beginning
                                         
@@ -2554,6 +2562,18 @@ - (void)decodePacketsInBufferAsync;
                                     [self.delegate didInterfaceChangeConnectStatus:self]; //this will call the method for connections status chagnes.
                                     break;
                                 }
+                                //for the case where command-end appended to the packet as the radio stopped unexpectedly
+                                else if ([[rfidPacketBufferInHexString substringWithRange:NSMakeRange(ptr * 2, ([rfidPacketBuffer length] - ptr) * 2)] containsString:@"0101010002000000"]) {
+                                    NSLog(@"[decodePacketsInBufferAsync] Unexpected command-end received.  All operations ended");
+                                    //get mac error code
+                                    int startOfCmdEnd=(int)[[rfidPacketBufferInHexString substringWithRange:NSMakeRange(ptr * 2, ([rfidPacketBuffer length] - ptr) * 2)] rangeOfString:@"0101010002000000"].location / 2;
+                                    self.lastMacErrorCode=(((Byte *)[rfidPacketBuffer bytes])[ptr+startOfCmdEnd+13] << 8) + (((Byte *)[rfidPacketBuffer bytes])[ptr+startOfCmdEnd+12]);
+                                    [cmdRespQueue enqObject:packet];
+                                    [rfidPacketBuffer setLength:0];
+                                    connectStatus=CONNECTED;
+                                    [self.delegate didInterfaceChangeConnectStatus:self]; //this will call the method for connections status chagnes.
+                                    break;
+                                }
                                 //check if we are getting the beginning of another 8100 packet but with no 8100 event code.  If so, add the event code back with the header response
                                 else if (![[rfidPacketBufferInHexString substringWithRange:NSMakeRange(ptr * 2, ([rfidPacketBuffer length] - ptr) * 2)] containsString:@"8100"] && [[rfidPacketBufferInHexString substringWithRange:NSMakeRange((ptr * 2), 2)] isEqualToString:@"03"] && [[rfidPacketBufferInHexString substringWithRange:NSMakeRange((ptr * 2)+4, 4)] isEqualToString:@"0580"]) {
                                     
@@ -2677,6 +2697,18 @@ - (void)decodePacketsInBufferAsync;
                                     [self.delegate didInterfaceChangeConnectStatus:self]; //this will call the method for connections status chagnes.
                                     break;
                                 }
+                                //for the case where command-end appended to the packet as the radio stopped unexpectedly
+                                else if ([[rfidPacketBufferInHexString substringWithRange:NSMakeRange(ptr * 2, ([rfidPacketBuffer length] - ptr) * 2)] containsString:@"0101010002000000"]) {
+                                    NSLog(@"[decodePacketsInBufferAsync] Unexpected command-end received.  All operations ended");
+                                    //get mac error code
+                                    int startOfCmdEnd=(int)[[rfidPacketBufferInHexString substringWithRange:NSMakeRange(ptr * 2, ([rfidPacketBuffer length] - ptr) * 2)] rangeOfString:@"0101010002000000"].location / 2;
+                                    self.lastMacErrorCode=(((Byte *)[rfidPacketBuffer bytes])[ptr+startOfCmdEnd+13] << 8) + (((Byte *)[rfidPacketBuffer bytes])[ptr+startOfCmdEnd+12]);
+                                    [cmdRespQueue enqObject:packet];
+                                    [rfidPacketBuffer setLength:0];
+                                    connectStatus=CONNECTED;
+                                    [self.delegate didInterfaceChangeConnectStatus:self]; //this will call the method for connections status chagnes.
+                                    break;
+                                }
                                 //check if we are getting the beginning of another 8100 packet but with no 8100 event code.  If so, add the event code back with the header response
                                 else if (![[rfidPacketBufferInHexString substringWithRange:NSMakeRange(ptr * 2, ([rfidPacketBuffer length] - ptr) * 2)] containsString:@"8100"] && [[rfidPacketBufferInHexString substringWithRange:NSMakeRange((ptr * 2), 2)] isEqualToString:@"04"] && [[rfidPacketBufferInHexString substringWithRange:NSMakeRange((ptr * 2)+4, 4)] isEqualToString:@"0580"]) {
 
diff --git a/CS108iOSClient/CSLRfidDemoApp.storyboard b/CS108iOSClient/CSLRfidDemoApp.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="uy9-1K-dab">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="uy9-1K-dab">
     <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -2658,10 +2658,12 @@
                                     <constraint firstAttribute="bottom" secondItem="hJV-Ao-sxN" secondAttribute="bottom" id="yoZ-AT-Y0i"/>
                                 </constraints>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wjw-Xx-9N2">
-                                <rect key="frame" x="81" y="410" width="158" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wjw-Xx-9N2">
+                                <rect key="frame" x="85" y="404" width="150" height="33"/>
                                 <color key="backgroundColor" red="0.63921568627450975" green="0.63921568627450975" blue="0.63921568627450975" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="150" id="equ-qw-vrU"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" name="Lato-Regular" family="Lato" pointSize="17"/>
                                 <color key="tintColor" red="0.93725490570000003" green="0.93725490570000003" blue="0.95686274770000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <state key="normal" title="Save to File"/>
@@ -2672,6 +2674,7 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
+                            <constraint firstItem="wjw-Xx-9N2" firstAttribute="centerX" secondItem="LvH-Ge-MiT" secondAttribute="centerX" id="7ao-oF-ShI"/>
                             <constraint firstItem="tYY-tp-tY8" firstAttribute="leading" secondItem="r7x-TT-Fdx" secondAttribute="leading" constant="20" id="8Qt-JU-qrA"/>
                             <constraint firstItem="izk-vN-mQS" firstAttribute="top" secondItem="pkm-Tr-lhN" secondAttribute="bottom" constant="15" id="8Yt-6O-qcn"/>
                             <constraint firstItem="SiA-vG-TOw" firstAttribute="top" secondItem="izk-vN-mQS" secondAttribute="bottom" constant="8" symbolic="YES" id="AL8-Fh-h4H"/>
@@ -2681,6 +2684,7 @@
                             <constraint firstItem="pkm-Tr-lhN" firstAttribute="top" secondItem="dSd-N2-8Sh" secondAttribute="bottom" constant="20" id="Gc3-ZG-AJc"/>
                             <constraint firstItem="r7x-TT-Fdx" firstAttribute="trailing" secondItem="SiA-vG-TOw" secondAttribute="trailing" constant="20" id="PRa-aT-Ew6"/>
                             <constraint firstItem="tYY-tp-tY8" firstAttribute="top" secondItem="SiA-vG-TOw" secondAttribute="bottom" constant="8" id="TEv-BR-xvx"/>
+                            <constraint firstItem="wjw-Xx-9N2" firstAttribute="top" secondItem="tYY-tp-tY8" secondAttribute="bottom" constant="30" id="Xjj-Dy-HNe"/>
                             <constraint firstItem="izk-vN-mQS" firstAttribute="centerX" secondItem="pkm-Tr-lhN" secondAttribute="centerX" id="eXe-2y-tAQ"/>
                             <constraint firstItem="SiA-vG-TOw" firstAttribute="leading" secondItem="r7x-TT-Fdx" secondAttribute="leading" constant="20" id="fMy-as-M0X"/>
                             <constraint firstItem="dSd-N2-8Sh" firstAttribute="top" secondItem="3DD-BR-tCD" secondAttribute="bottom" constant="28" id="kxn-xE-q34"/>
diff --git a/CS108iOSClient/Info.plist b/CS108iOSClient/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>2690</string>
+	<string>2710</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
diff --git a/CS108iOSClient/ViewControllers/CSLInventoryVC.m b/CS108iOSClient/ViewControllers/CSLInventoryVC.m
@@ -126,6 +126,17 @@ - (void)refreshTagListing {
             else
                 self.lbStatus.text=[NSString stringWithFormat:@"Battery: %d%%", [CSLRfidAppEngine sharedAppEngine].readerInfo.batteryPercentage];
         }
+        
+        if ([CSLRfidAppEngine sharedAppEngine].reader.lastMacErrorCode != 0x0000)
+        {
+            UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"RFID Error"
+                                                                           message:[NSString stringWithFormat:@"Error Code: 0x%04X", [CSLRfidAppEngine sharedAppEngine].reader.lastMacErrorCode]
+                                                                    preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertAction *ok = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil];
+            [alert addAction:ok];
+            [self presentViewController:alert animated:YES completion:nil];
+            [CSLRfidAppEngine sharedAppEngine].reader.lastMacErrorCode=0x0000;
+        }
     }
 }
 
diff --git a/CS108iOSClient/ViewControllers/CSLTemperatureUploadVC.m b/CS108iOSClient/ViewControllers/CSLTemperatureUploadVC.m
@@ -216,7 +216,7 @@ - (IBAction)btnMQTTUpload:(id)sender {
         for (int i=0;i<COMMAND_TIMEOUT_10S;i++) { //wait for 5s for connection
             if([CSLRfidAppEngine sharedAppEngine].MQTTSettings.publishTopicCounter==[[CSLRfidAppEngine sharedAppEngine].reader.filteredBuffer count])
                 break;
-            [NSThread sleepForTimeInterval:0.1f];
+            [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
         }
         
         UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Data Upload"
diff --git a/CS108iOSClient/model/CSLReaderSettings.m b/CS108iOSClient/model/CSLReaderSettings.m
@@ -51,6 +51,7 @@ -(id)init {
         for (int n = 0; n < 16; n++)
             [self.dwellTime addObject:@"2000"];
         //For CS463, disable all ports except port 0
+        self.isPortEnabled = [NSMutableArray array];
         [self.isPortEnabled addObject:[[NSNumber alloc] initWithBool:TRUE]];
         for (int n = 1 ; n < 4; n++)
             [self.isPortEnabled addObject:[[NSNumber alloc] initWithBool:FALSE]];

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,17 @@ - (void)refreshTagListing {`
`126`	`126`	`else`
`127`	`127`	`self.lbStatus.text=[NSString stringWithFormat:@"Battery: %d%%", [CSLRfidAppEngine sharedAppEngine].readerInfo.batteryPercentage];`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ if ([CSLRfidAppEngine sharedAppEngine].reader.lastMacErrorCode != 0x0000)`
	`131`	`+ {`
	`132`	`+ UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"RFID Error"`
	`133`	`+ message:[NSString stringWithFormat:@"Error Code: 0x%04X", [CSLRfidAppEngine sharedAppEngine].reader.lastMacErrorCode]`
	`134`	`+ preferredStyle:UIAlertControllerStyleAlert];`
	`135`	`+ UIAlertAction *ok = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil];`
	`136`	`+ [alert addAction:ok];`
	`137`	`+ [self presentViewController:alert animated:YES completion:nil];`
	`138`	`+ [CSLRfidAppEngine sharedAppEngine].reader.lastMacErrorCode=0x0000;`
	`139`	`+ }`
`129`	`140`	`}`
`130`	`141`	`}`
`131`	`142`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ - (IBAction)btnMQTTUpload:(id)sender {`
`216`	`216`	`for (int i=0;i<COMMAND_TIMEOUT_10S;i++) { //wait for 5s for connection`
`217`	`217`	`if([CSLRfidAppEngine sharedAppEngine].MQTTSettings.publishTopicCounter==[[CSLRfidAppEngine sharedAppEngine].reader.filteredBuffer count])`
`218`	`218`	`break;`
`219`		`- [NSThread sleepForTimeInterval:0.1f];`
	`219`	`+ [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Data Upload"`