huangyp 7 лет назад
Родитель
Сommit
477fabe3a9

+ 1 - 1
shiku_im/shiku_im/controller/myOA/ALLURLHeader.h

@@ -13,7 +13,7 @@
 /*ip地址*/
 #define g_id  [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"]
 //#define g_id @"http://192.168.253.63:8080/uas_system/"
-//#define g_id @"http://192.168.253.12/APP/"
+//#define g_id @"http://10.1.80.197:8888/uas-system"
 /*新账户中心token*/
 #define g_accountToken [[NSUserDefaults standardUserDefaults] objectForKey:@"accountToken"]
 /*sessionId*/

+ 5 - 5
shiku_im/shiku_im/controller/myOA/WorkTools/UASWorkManager.m

@@ -1298,7 +1298,7 @@
                          
                          userID,@"mo_mancode",//签到人员编号
                          
-                         [NSString stringWithFormat:@"iOS自动外勤%@",switchs],@"mo_remark",//备注
+                        (_autoOutPlan ? [NSString stringWithFormat:@"iOS自动外勤%@:自动",switchs]:[NSString stringWithFormat:@"iOS手动外勤%@:手动",switchs]),@"mo_remark",//备注
                          
                          nil];
     
@@ -1648,12 +1648,12 @@
     [manager.requestSerializer setValue:[NSString stringWithFormat:@"%@",g_sessionUser] forHTTPHeaderField:@"sessionUser"];
     
     //接口
-    NSString * urlAddress=@"mobile/addAutoSign.action";
+    NSString * urlAddress = @"mobile/addAutoSign.action";
     
     //Caller
-    NSString * caller=@"Mobile_outsign";
+    NSString * caller = @"Mobile_outsign";
     
-    NSDictionary *forms=[NSDictionary dictionaryWithObjectsAndKeys:
+    NSDictionary *forms = [NSDictionary dictionaryWithObjectsAndKeys:
                          
                          model.MPD_ADDRESS,@"mo_address",//签到地点
                          
@@ -1663,7 +1663,7 @@
                          
                          userID,@"mo_mancode",//签到人员编号
                          
-                         [NSString stringWithFormat:@"iOS自动外勤%@",switchs],@"mo_remark",//备注
+                        (_autoOutPlan ? [NSString stringWithFormat:@"iOS自动外勤%@:自动",switchs]:[NSString stringWithFormat:@"iOS手动外勤%@:手动",switchs]),@"mo_remark",//备注
                          
                          nil];
     

+ 2 - 2
shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.3.5</string>
+	<string>6.3.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -112,7 +112,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6.0.1</string>
+	<string>6.0.0</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>baidumap</string>