Explorar el Código

Apex CRM 1.10

Ray Zhang hace 7 años
padre
commit
e6293cc06e
Se han modificado 23 ficheros con 37 adiciones y 37 borrados
  1. BIN
      RedAnt CRM/APEX CRM/APEX CRM.xcodeproj/project.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate
  2. 18 18
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/Contents.json
  3. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-1.png
  4. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-10.png
  5. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-11.png
  6. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-12.png
  7. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-13.png
  8. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-14.png
  9. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-15.png
  10. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-16.png
  11. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-17.png
  12. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-2.png
  13. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-3.png
  14. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-4.png
  15. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-5.png
  16. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-6.png
  17. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-7.png
  18. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-8.png
  19. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-9.png
  20. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon.png
  21. 1 1
      RedAnt CRM/APEX CRM/APEX CRM/Info.plist
  22. 12 12
      RedAnt CRM/APEX CRM/APEX CRM/WKWebTestViewController.m
  23. 6 6
      RedAnt CRM/APEX CRM/APEX CRM/config/config.h

BIN
RedAnt CRM/APEX CRM/APEX CRM.xcodeproj/project.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 18 - 18
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,109 +3,109 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneNotification_20pt@2x.png",
+      "filename" : "appicon-1.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneNotification_20pt@3x.png",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneSpootlight5_29pt@2x.png",
+      "filename" : "appicon-3.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneSpootlight5_29pt@3x.png",
+      "filename" : "appicon-4.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneSpootlight7_40pt@2x.png",
+      "filename" : "appicon-5.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneSpootlight7_40pt@3x.png",
+      "filename" : "appicon-6.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneApp_60pt@2x.png",
+      "filename" : "appicon-7.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "CRMq启动图标-06iPhoneApp_60pt@3x.png",
+      "filename" : "appicon-8.png",
       "scale" : "3x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadNotifications_20pt.png",
+      "filename" : "appicon-9.png",
       "scale" : "1x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadNotifications_20pt@2x.png",
+      "filename" : "appicon-10.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadSpootlight5_29pt.png",
+      "filename" : "appicon-11.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadSpootlight5_29pt@2x.png",
+      "filename" : "appicon-12.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadSpootlight7_40pt.png",
+      "filename" : "appicon-13.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadSpootlight7_40pt@2x.png",
+      "filename" : "appicon-14.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadApp_76pt.png",
+      "filename" : "appicon-15.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadApp_76pt@2x.png",
+      "filename" : "appicon-16.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "CRMq启动图标-06iPadProApp_83.5pt@2x.png",
+      "filename" : "appicon-17.png",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "CRMq启动图标-06store_1024pt.png",
+      "filename" : "appicon.png",
       "scale" : "1x"
     }
   ],

BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-1.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-10.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-11.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-12.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-13.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-14.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-15.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-16.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-17.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-2.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-3.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-4.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-5.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-6.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-7.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-8.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-9.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon.png


+ 1 - 1
RedAnt CRM/APEX CRM/APEX CRM/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.10</string>
 	<key>CFBundleVersion</key>
 	<string>39844</string>
 	<key>LSRequiresIPhoneOS</key>

+ 12 - 12
RedAnt CRM/APEX CRM/APEX CRM/WKWebTestViewController.m

@@ -128,18 +128,18 @@
 //    }
 //    self.notificationId = -1;
     
-    if (!CRMUser.sharedUser.isLogin) {
-        
-        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:@"you should login first" preferredStyle:UIAlertControllerStyleAlert];
-        UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-            
-        }];
-        
-        [alertVC addAction:okAction];
-        
-        [self presentViewController:alertVC animated:YES completion:nil];
-        return;
-    }
+//    if (!CRMUser.sharedUser.isLogin) {
+//        
+//        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:@"you should login first" preferredStyle:UIAlertControllerStyleAlert];
+//        UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+//            
+//        }];
+//        
+//        [alertVC addAction:okAction];
+//        
+//        [self presentViewController:alertVC animated:YES completion:nil];
+//        return;
+//    }
     
     [self handleNotificationByJs:notificationstr];
 }

+ 6 - 6
RedAnt CRM/APEX CRM/APEX CRM/config/config.h

@@ -8,12 +8,12 @@
 
 #ifndef config_h
 #define config_h
-//#define URL_SERVER @"https://ra.apexshipping.com"
-//#define URL_LOGIN @"https://ra.apexshipping.com/apexcrm/crm/mobile/login";
-//#define URL_LOGIN @"https://ra.apexshipping.com/apexcrm/crm/mobile/token.mo/";
+#define URL_SERVER @"https://ra.apexshipping.com"
+#define URL_LOGIN @"https://ra.apexshipping.com/apexcrm/crm/mobile/login";
+#define URL_UPDATE_TOKEN @"https://ra.apexshipping.com/apexcrm/crm/mobile/token.mo/";
 
-#define URL_SERVER @"http://192.168.1.108:8081"
-#define URL_LOGIN @"http://192.168.1.108:8081/j/crm/mobile/login";
-#define URL_UPDATE_TOKEN @"http://192.168.1.108:8081/j/crm/mobile/token.mo/"
+//#define URL_SERVER @"http://192.168.1.108:8081"
+//#define URL_LOGIN @"http://192.168.1.108:8081/j/crm/mobile/login";
+//#define URL_UPDATE_TOKEN @"http://192.168.1.108:8081/j/crm/mobile/token.mo/"
 
 #endif /* config_h */