Browse Source

新增灰度发布插件

liufl5 5 years ago
parent
commit
d209aa1892
25 changed files with 317 additions and 44 deletions
  1. 18 3
      IpuLib/IpuLib.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  2. BIN
      SuperMenu/SuperMenu.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  3. 6 1
      SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  4. BIN
      SuperMenu/SuperMenu.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  5. 16 0
      WadeMobileFunc/WadeMobileFunc.xcodeproj/project.pbxproj
  6. 4 19
      WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  7. 18 3
      WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  8. 22 0
      WadeMobileFunc/WadeMobileFunc/IPUGrayPlugin.h
  9. 115 0
      WadeMobileFunc/WadeMobileFunc/IPUGrayPlugin.m
  10. 2 2
      WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m
  11. 6 1
      display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  12. 6 1
      display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  13. 6 1
      display-center/ReactNative/node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  14. 6 1
      display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  15. 6 1
      display-center/ReactNative/node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  16. 6 1
      display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  17. 6 1
      display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  18. 5 0
      display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  19. 5 0
      display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  20. 5 0
      display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  21. 5 0
      display-center/ReactNative/node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  22. 10 0
      display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  23. 41 6
      display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  24. 3 3
      display-center/Res/config/mobile-config.xml
  25. BIN
      display-center/display-center.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate

+ 18 - 3
IpuLib/IpuLib.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,17 +7,32 @@
7 7
		<key>IpuLib.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>21</integer>
10
			<integer>6</integer>
11
		</dict>
12
		<key>IpuLib.xcscheme_^#shared#^_</key>
13
		<dict>
14
			<key>orderHint</key>
15
			<integer>7</integer>
11 16
		</dict>
12 17
		<key>IpuLib4Appstore.xcscheme</key>
13 18
		<dict>
14 19
			<key>orderHint</key>
15
			<integer>22</integer>
20
			<integer>14</integer>
21
		</dict>
22
		<key>IpuLib4Appstore.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>14</integer>
16 26
		</dict>
17 27
		<key>IpuLib4Develop.xcscheme</key>
18 28
		<dict>
19 29
			<key>orderHint</key>
20
			<integer>23</integer>
30
			<integer>15</integer>
31
		</dict>
32
		<key>IpuLib4Develop.xcscheme_^#shared#^_</key>
33
		<dict>
34
			<key>orderHint</key>
35
			<integer>15</integer>
21 36
		</dict>
22 37
	</dict>
23 38
</dict>

BIN
SuperMenu/SuperMenu.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate


+ 6 - 1
SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,12 @@
7 7
		<key>SuperMenu.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>0</integer>
10
			<integer>3</integer>
11
		</dict>
12
		<key>SuperMenu.xcscheme_^#shared#^_</key>
13
		<dict>
14
			<key>orderHint</key>
15
			<integer>3</integer>
11 16
		</dict>
12 17
	</dict>
13 18
</dict>

BIN
SuperMenu/SuperMenu.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate


+ 16 - 0
WadeMobileFunc/WadeMobileFunc.xcodeproj/project.pbxproj

@ -38,10 +38,14 @@
38 38
		01FC20812007700C00FA8B40 /* WDFSocial.h in Headers */ = {isa = PBXBuildFile; fileRef = 01FC207D2007700C00FA8B40 /* WDFSocial.h */; settings = {ATTRIBUTES = (Public, ); }; };
39 39
		0429A26021805228003CEE83 /* WDFResourceVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 0429A25E21805228003CEE83 /* WDFResourceVersion.m */; };
40 40
		0429A26121805228003CEE83 /* WDFResourceVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 0429A25F21805228003CEE83 /* WDFResourceVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
41
		04327F3522F9642400B7670A /* WDFScreenCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 04327F3322F9642400B7670A /* WDFScreenCapture.h */; };
42
		04327F3622F9642400B7670A /* WDFScreenCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 04327F3422F9642400B7670A /* WDFScreenCapture.m */; };
41 43
		0455D01A224B4DEC006B3F28 /* WDFTipsHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = 0455D018224B4DEC006B3F28 /* WDFTipsHUD.h */; settings = {ATTRIBUTES = (Public, ); }; };
42 44
		0455D01B224B4DEC006B3F28 /* WDFTipsHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 0455D019224B4DEC006B3F28 /* WDFTipsHUD.m */; };
43 45
		046DC4F1211D21BC00BCA3F5 /* WDFImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 046DC4EF211D21BC00BCA3F5 /* WDFImageCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
44 46
		046DC4F2211D21BC00BCA3F5 /* WDFImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 046DC4F0211D21BC00BCA3F5 /* WDFImageCache.m */; };
47
		04B7AB5D22FBCE57009B6449 /* IPUGrayPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B7AB5B22FBCE57009B6449 /* IPUGrayPlugin.h */; };
48
		04B7AB5E22FBCE57009B6449 /* IPUGrayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B7AB5C22FBCE57009B6449 /* IPUGrayPlugin.m */; };
45 49
		0A0A235D1CACB92100947564 /* WDFMobileContacts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A0A235B1CACB92100947564 /* WDFMobileContacts.h */; settings = {ATTRIBUTES = (Public, ); }; };
46 50
		0A0A235E1CACB92100947564 /* WDFMobileContacts.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A0A235C1CACB92100947564 /* WDFMobileContacts.m */; };
47 51
		0A4F09511FF4E109008928FF /* WDFMobileDatabaseTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A4F093F1FF4E106008928FF /* WDFMobileDatabaseTest.m */; };
@ -142,10 +146,14 @@
142 146
		01FC207D2007700C00FA8B40 /* WDFSocial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WDFSocial.h; sourceTree = "<group>"; };
143 147
		0429A25E21805228003CEE83 /* WDFResourceVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WDFResourceVersion.m; sourceTree = "<group>"; };
144 148
		0429A25F21805228003CEE83 /* WDFResourceVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WDFResourceVersion.h; sourceTree = "<group>"; };
149
		04327F3322F9642400B7670A /* WDFScreenCapture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WDFScreenCapture.h; sourceTree = "<group>"; };
150
		04327F3422F9642400B7670A /* WDFScreenCapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WDFScreenCapture.m; sourceTree = "<group>"; };
145 151
		0455D018224B4DEC006B3F28 /* WDFTipsHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WDFTipsHUD.h; sourceTree = "<group>"; };
146 152
		0455D019224B4DEC006B3F28 /* WDFTipsHUD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WDFTipsHUD.m; sourceTree = "<group>"; };
147 153
		046DC4EF211D21BC00BCA3F5 /* WDFImageCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WDFImageCache.h; sourceTree = "<group>"; };
148 154
		046DC4F0211D21BC00BCA3F5 /* WDFImageCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WDFImageCache.m; sourceTree = "<group>"; };
155
		04B7AB5B22FBCE57009B6449 /* IPUGrayPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPUGrayPlugin.h; sourceTree = "<group>"; };
156
		04B7AB5C22FBCE57009B6449 /* IPUGrayPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IPUGrayPlugin.m; sourceTree = "<group>"; };
149 157
		0A0A235B1CACB92100947564 /* WDFMobileContacts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WDFMobileContacts.h; sourceTree = "<group>"; };
150 158
		0A0A235C1CACB92100947564 /* WDFMobileContacts.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WDFMobileContacts.m; sourceTree = "<group>"; };
151 159
		0A4F093F1FF4E106008928FF /* WDFMobileDatabaseTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WDFMobileDatabaseTest.m; sourceTree = "<group>"; };
@ -347,6 +355,10 @@
347 355
				E2DE1B021B42DE6A00762141 /* WDFMobileStorage.m */,
348 356
				E2DE1B031B42DE6A00762141 /* WDFMobileUI.h */,
349 357
				E2DE1B041B42DE6A00762141 /* WDFMobileUI.m */,
358
				04B7AB5B22FBCE57009B6449 /* IPUGrayPlugin.h */,
359
				04B7AB5C22FBCE57009B6449 /* IPUGrayPlugin.m */,
360
				04327F3322F9642400B7670A /* WDFScreenCapture.h */,
361
				04327F3422F9642400B7670A /* WDFScreenCapture.m */,
350 362
				01FC207D2007700C00FA8B40 /* WDFSocial.h */,
351 363
				01FC207A2007700B00FA8B40 /* WDFSocial.m */,
352 364
				01FC207C2007700C00FA8B40 /* WDFSocialUtils.h */,
@ -468,12 +480,14 @@
468 480
				0A0A235D1CACB92100947564 /* WDFMobileContacts.h in Headers */,
469 481
				E2DE1B0F1B42DE6A00762141 /* WDFMobileLocation.h in Headers */,
470 482
				E2DE1B0D1B42DE6A00762141 /* WDFMobileFile.h in Headers */,
483
				04327F3522F9642400B7670A /* WDFScreenCapture.h in Headers */,
471 484
				E2DE1B151B42DE6A00762141 /* WDFMobileUI.h in Headers */,
472 485
				B2ADA4292186DEDB00F0E722 /* IpuAuthentication.h in Headers */,
473 486
				E2DE1B111B42DE6A00762141 /* WDFMobileNetwork.h in Headers */,
474 487
				E2DE1B131B42DE6A00762141 /* WDFMobileStorage.h in Headers */,
475 488
				B21A33FC20B516A700920072 /* WDFSystemPermissionPlugin.h in Headers */,
476 489
				E2DE1B091B42DE6A00762141 /* WDFMobileBasic.h in Headers */,
490
				04B7AB5D22FBCE57009B6449 /* IPUGrayPlugin.h in Headers */,
477 491
			);
478 492
			runOnlyForDeploymentPostprocessing = 0;
479 493
		};
@ -649,6 +663,7 @@
649 663
				E2DE1B161B42DE6A00762141 /* WDFMobileUI.m in Sources */,
650 664
				B2E8BEBB2175D89700A06A13 /* ImageDetailViewController.m in Sources */,
651 665
				0429A26021805228003CEE83 /* WDFResourceVersion.m in Sources */,
666
				04B7AB5E22FBCE57009B6449 /* IPUGrayPlugin.m in Sources */,
652 667
				0AE1E0781C7EABA700FCCD24 /* WDFDatabaseHelper.m in Sources */,
653 668
				E2D30F031C8C45060040A850 /* WDFUNIRestUtil.m in Sources */,
654 669
				E2DE1B0A1B42DE6A00762141 /* WDFMobileBasic.m in Sources */,
@ -658,6 +673,7 @@
658 673
				0A96AB021B9FCCE8003CACA5 /* WDFMobileDatabase.m in Sources */,
659 674
				E2DE1B0C1B42DE6A00762141 /* WDFMobileCamera.m in Sources */,
660 675
				B2E8BEBE2175D89700A06A13 /* UIImage+Rotate.m in Sources */,
676
				04327F3622F9642400B7670A /* WDFScreenCapture.m in Sources */,
661 677
				01FC207E2007700C00FA8B40 /* WDFSocial.m in Sources */,
662 678
				B2E8BEC12175D89700A06A13 /* WDFImagePickerController.m in Sources */,
663 679
				B2E8BEC32175D89700A06A13 /* WDFCamera.m in Sources */,

+ 4 - 19
WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -26,12 +26,12 @@
26 26
                  moduleName = "WadeMobileFunc"
27 27
                  usesParentBreakpointCondition = "Yes"
28 28
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
29
                  timestampString = "585738019.271003"
29
                  timestampString = "586926506.670706"
30 30
                  startingColumnNumber = "9223372036854775807"
31 31
                  endingColumnNumber = "9223372036854775807"
32 32
                  startingLineNumber = "291"
33 33
                  endingLineNumber = "291"
34
                  offsetFromSymbolStart = "1142">
34
                  offsetFromSymbolStart = "1132">
35 35
               </Location>
36 36
               <Location
37 37
                  shouldBeEnabled = "Yes"
@ -41,27 +41,12 @@
41 41
                  moduleName = "WadeMobileFunc"
42 42
                  usesParentBreakpointCondition = "Yes"
43 43
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
44
                  timestampString = "585738019.273556"
44
                  timestampString = "586926506.673286"
45 45
                  startingColumnNumber = "9223372036854775807"
46 46
                  endingColumnNumber = "9223372036854775807"
47 47
                  startingLineNumber = "292"
48 48
                  endingLineNumber = "292"
49
                  offsetFromSymbolStart = "39">
50
               </Location>
51
               <Location
52
                  shouldBeEnabled = "Yes"
53
                  ignoreCount = "0"
54
                  continueAfterRunningActions = "No"
55
                  symbolName = "__destroy_helper_block_.287"
56
                  moduleName = "WadeMobileFunc"
57
                  usesParentBreakpointCondition = "Yes"
58
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
59
                  timestampString = "585738019.275722"
60
                  startingColumnNumber = "9223372036854775807"
61
                  endingColumnNumber = "9223372036854775807"
62
                  startingLineNumber = "291"
63
                  endingLineNumber = "291"
64
                  offsetFromSymbolStart = "8">
49
                  offsetFromSymbolStart = "52">
65 50
               </Location>
66 51
            </Locations>
67 52
         </BreakpointContent>

+ 18 - 3
WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,17 +7,32 @@
7 7
		<key>WadeMobileFunc.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>2</integer>
10
			<integer>16</integer>
11
		</dict>
12
		<key>WadeMobileFunc.xcscheme_^#shared#^_</key>
13
		<dict>
14
			<key>orderHint</key>
15
			<integer>4</integer>
11 16
		</dict>
12 17
		<key>WadeMobileFunc4Appstore.xcscheme</key>
13 18
		<dict>
14 19
			<key>orderHint</key>
15
			<integer>5</integer>
20
			<integer>18</integer>
21
		</dict>
22
		<key>WadeMobileFunc4Appstore.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>6</integer>
16 26
		</dict>
17 27
		<key>WadeMobileFuncAggregate.xcscheme</key>
18 28
		<dict>
19 29
			<key>orderHint</key>
20
			<integer>4</integer>
30
			<integer>19</integer>
31
		</dict>
32
		<key>WadeMobileFuncAggregate.xcscheme_^#shared#^_</key>
33
		<dict>
34
			<key>orderHint</key>
35
			<integer>5</integer>
21 36
		</dict>
22 37
	</dict>
23 38
</dict>

+ 22 - 0
WadeMobileFunc/WadeMobileFunc/IPUGrayPlugin.h

@ -0,0 +1,22 @@
1
//
2
//  IPUGrayPlugin.h
3
//  SuperMenu
4
//
5
//  Created by Mac on 2019/7/30.
6
//  Copyright © 2019年 shelomi. All rights reserved.
7
//
8
9
#import <WadeMobile/WadeMobile.h>
10
11
@interface IPUGrayPlugin : WDPlugin
12
13
/*
14
 设置主应用灰度环境
15
 a.输入参数:主应用灰度环境参数:g_user_flag,g_request_host,g_request_path,g_res_host
16
 b.如果g_user_flag=1,则根据灰度环境的参数,对主应用进行资源更新,并且保存灰度环境参数,下次启动app之后直接使用灰度环境参数进行,如果更新完成,则静默走success回调
17
 c.资源更新完成后,直接弹窗提示,“灰度环境资源更新完成,请重新进入蜂行动”,点击确定后关闭app
18
 d.如果g_user_flag=0,则直接使用mobile-config的资源路径与主环境资源进行比较,进行资源更新(如果无需更新则不更新),更新完成后提示,“资源更新完成,请重新进入蜂行动”,点击确定后关闭app,下次进入
19
 */
20
-(void)updateGrayInfo:(NSArray *)params;
21
22
@end

+ 115 - 0
WadeMobileFunc/WadeMobileFunc/IPUGrayPlugin.m

@ -0,0 +1,115 @@
1
//
2
//  IPUGrayPlugin.m
3
//  SuperMenu
4
//
5
//  Created by Mac on 2019/7/30.
6
//  Copyright © 2019年 shelomi. All rights reserved.
7
//
8
9
#import "IPUGrayPlugin.h"
10
11
@implementation IPUGrayPlugin
12
13
/*
14
 设置主应用灰度环境
15
 a.输入参数:主应用灰度环境参数:g_user_flag,g_request_host,g_request_path,g_res_host
16
 b.如果g_user_flag=1,则根据灰度环境的参数,对主应用进行资源更新,并且保存灰度环境参数,下次启动app之后直接使用灰度环境参数进行,如果更新完成,则静默走success回调
17
 c.资源更新完成后,直接弹窗提示,“灰度环境资源更新完成,请重新进入蜂行动”,点击确定后关闭app
18
 d.如果g_user_flag=0,则直接使用mobile-config的资源路径与主环境资源进行比较,进行资源更新(如果无需更新则不更新),更新完成后提示,“资源更新完成,请重新进入蜂行动”,点击确定后关闭app,下次进入
19
 */
20
-(void)updateGrayInfo:(NSArray *)params{
21
    if (params && params.count>0) {
22
        BOOL isGrayUser = false;
23
        if (params[0]==[NSNull null]) {
24
            isGrayUser = false;
25
        }else{
26
            isGrayUser = [params[0] boolValue];
27
        }
28
        
29
        NSString *grayRequestHost = nil;
30
        if (params.count>1) {
31
            if (params[1]==[NSNull null]) {
32
                grayRequestHost = nil;
33
            }else{
34
                grayRequestHost = params[1];
35
            }
36
        }
37
        
38
        NSString *grayRequestPath = nil;
39
        if (params.count>2) {
40
            if (params[2]==[NSNull null]) {
41
                grayRequestPath = nil;
42
            }else{
43
                grayRequestPath = params[2];
44
            }
45
        }
46
        
47
        NSString *grayResourceHost = nil;
48
        if (params.count>3) {
49
            if (params[3]==[NSNull null]) {
50
                grayResourceHost = nil;
51
            }else{
52
                grayResourceHost = params[3];
53
            }
54
        }
55
        
56
        NSString * userFlag = [[NSUserDefaults standardUserDefaults] valueForKey:@"GRAY_USER_FLAG"];
57
        if (isGrayUser != [userFlag boolValue]) {//环境发生变化
58
            UIAlertController* alert = nil;
59
            if (isGrayUser==YES) {//灰度
60
                alert = [UIAlertController alertControllerWithTitle:nil
61
                       message:@"服务器环境发生变化,是否退出重新打开以切换到灰度服务器?"  preferredStyle:UIAlertControllerStyleAlert];
62
                UIAlertAction* confirmAction = [UIAlertAction actionWithTitle:@"确定"     style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
63
                    
64
                    [self setGrayIsGrayUser:isGrayUser grayRequestHost:grayRequestHost grayRequestPath:grayRequestPath grayResourceHost:grayResourceHost];
65
                    
66
                    [[NSUserDefaults standardUserDefaults] setValue:@"1" forKey:@"GRAY_USER_FLAG"];
67
                    [[NSUserDefaults standardUserDefaults] synchronize];
68
                    exit(0);
69
                }];
70
                UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:@"取消"     style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
71
                    
72
                }];
73
                [alert addAction:confirmAction];
74
                [alert addAction:cancelAction];
75
            }else{//生产
76
                alert = [UIAlertController alertControllerWithTitle:nil
77
                         message:@"服务器环境发生变化,是否退出重新打开以切换到生产服务器?"  preferredStyle:UIAlertControllerStyleAlert];
78
                UIAlertAction* confirmAction = [UIAlertAction actionWithTitle:@"确定"     style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
79
                    [[NSUserDefaults standardUserDefaults] setValue:@"0" forKey:@"GRAY_USER_FLAG"];
80
                    [[NSUserDefaults standardUserDefaults] synchronize];
81
                    exit(0);
82
                }];
83
                UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:@"取消"     style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
84
                    
85
                }];
86
                [alert addAction:confirmAction];
87
                [alert addAction:cancelAction];
88
            }
89
            [[self getViewController] presentViewController:alert animated:YES completion:^{
90
                
91
            }];
92
        }
93
    }
94
}
95
-(void)setGrayIsGrayUser:(BOOL)isGrayUser grayRequestHost:(NSString *)grayRequestHost grayRequestPath:(NSString *)grayRequestPath grayResourceHost:(NSString *)grayResourceHost{
96
    [[NSUserDefaults standardUserDefaults] setBool:isGrayUser forKey:@"IS_GRAY_USER"];
97
    if (isGrayUser) {//灰度用户
98
        if (grayRequestHost) {
99
            [[NSUserDefaults standardUserDefaults] setValue:grayRequestHost forKey:@"GRAY_REQUEST_HOST"];
100
        }
101
        if (grayRequestPath) {
102
            [[NSUserDefaults standardUserDefaults] setValue:grayRequestPath forKey:@"GRAY_REQUEST_PATH"];
103
        }
104
        if (grayResourceHost) {
105
            [[NSUserDefaults standardUserDefaults] setValue:grayResourceHost forKey:@"GRAY_RESOURCE_HOST"];
106
        }
107
    }else{
108
        [[NSUserDefaults standardUserDefaults] setValue:nil forKey:@"GRAY_REQUEST_HOST"];
109
        [[NSUserDefaults standardUserDefaults] setValue:nil forKey:@"GRAY_REQUEST_PATH"];
110
        [[NSUserDefaults standardUserDefaults] setValue:nil forKey:@"GRAY_RESOURCE_HOST"];
111
    }
112
    [[NSUserDefaults standardUserDefaults] synchronize];
113
}
114
115
@end

+ 2 - 2
WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m

@ -272,7 +272,7 @@
272 272
    if([param count] > 2 && param[2] != [NSNull null] ){
273 273
        isCurr = [@"true" isEqualToString:param[2]];
274 274
    }
275
//    NSLog(@"WDFMobileUI执行openTemplate:插件========pageAction:%@,,,pageParam:%@",pageAction,pageParam);
275
    NSLog(@"WDFMobileUI执行openTemplate:插件========pageAction:%@,,,pageParam:%@",pageAction,pageParam);
276 276
    [self openTemplate:pageAction withData:pageParam isCurr:isCurr];
277 277
}
278 278
@ -367,7 +367,7 @@
367 367
    if ([param count] > 2 && param[2] != [NSNull null]) {
368 368
        isCurr = [@"true" isEqualToString:param[2]];
369 369
    }
370
//    NSLog(@"WDFMobileUI执行openPage:插件========pageAction:%@,,,dataParam:%@",pageAction,dataParam);
370
    NSLog(@"WDFMobileUI执行openPage:插件========pageAction:%@,,,dataParam:%@",pageAction,dataParam);
371 371
    [self openPage:pageAction data:dataParam isCurrView:isCurr];
372 372
}
373 373

+ 6 - 1
display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,12 @@
7 7
		<key>RNCamera.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>21</integer>
10
			<integer>22</integer>
11
		</dict>
12
		<key>RNCamera.xcscheme_^#shared#^_</key>
13
		<dict>
14
			<key>orderHint</key>
15
			<integer>22</integer>
11 16
		</dict>
12 17
	</dict>
13 18
</dict>

+ 6 - 1
display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -17,7 +17,12 @@
17 17
		<key>ART.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>22</integer>
20
			<integer>21</integer>
21
		</dict>
22
		<key>ART.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>21</integer>
21 26
		</dict>
22 27
	</dict>
23 28
</dict>

+ 6 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -17,7 +17,12 @@
17 17
		<key>RCTBlob.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>23</integer>
20
			<integer>24</integer>
21
		</dict>
22
		<key>RCTBlob.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>24</integer>
21 26
		</dict>
22 27
	</dict>
23 28
</dict>

+ 6 - 1
display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,12 @@
7 7
		<key>RCTCameraRoll.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>24</integer>
10
			<integer>25</integer>
11
		</dict>
12
		<key>RCTCameraRoll.xcscheme_^#shared#^_</key>
13
		<dict>
14
			<key>orderHint</key>
15
			<integer>25</integer>
11 16
		</dict>
12 17
	</dict>
13 18
</dict>

+ 6 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,12 @@
7 7
		<key>RCTGeolocation.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>25</integer>
10
			<integer>26</integer>
11
		</dict>
12
		<key>RCTGeolocation.xcscheme_^#shared#^_</key>
13
		<dict>
14
			<key>orderHint</key>
15
			<integer>26</integer>
11 16
		</dict>
12 17
	</dict>
13 18
</dict>

+ 6 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -17,7 +17,12 @@
17 17
		<key>RCTImage.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>26</integer>
20
			<integer>27</integer>
21
		</dict>
22
		<key>RCTImage.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>27</integer>
21 26
		</dict>
22 27
	</dict>
23 28
</dict>

+ 6 - 1
display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -17,7 +17,12 @@
17 17
		<key>RCTLinking.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>27</integer>
20
			<integer>28</integer>
21
		</dict>
22
		<key>RCTLinking.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>28</integer>
21 26
		</dict>
22 27
	</dict>
23 28
</dict>

+ 5 - 0
display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -19,6 +19,11 @@
19 19
			<key>orderHint</key>
20 20
			<integer>35</integer>
21 21
		</dict>
22
		<key>RCTAnimation.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>35</integer>
26
		</dict>
22 27
	</dict>
23 28
</dict>
24 29
</plist>

+ 5 - 0
display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -19,6 +19,11 @@
19 19
			<key>orderHint</key>
20 20
			<integer>36</integer>
21 21
		</dict>
22
		<key>RCTNetwork.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>36</integer>
26
		</dict>
22 27
	</dict>
23 28
</dict>
24 29
</plist>

+ 5 - 0
display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -19,6 +19,11 @@
19 19
			<key>orderHint</key>
20 20
			<integer>37</integer>
21 21
		</dict>
22
		<key>RCTSettings.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>37</integer>
26
		</dict>
22 27
	</dict>
23 28
</dict>
24 29
</plist>

+ 5 - 0
display-center/ReactNative/node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -9,6 +9,11 @@
9 9
			<key>orderHint</key>
10 10
			<integer>38</integer>
11 11
		</dict>
12
		<key>RCTVibration.xcscheme_^#shared#^_</key>
13
		<dict>
14
			<key>orderHint</key>
15
			<integer>38</integer>
16
		</dict>
12 17
	</dict>
13 18
</dict>
14 19
</plist>

+ 10 - 0
display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -19,6 +19,11 @@
19 19
			<key>orderHint</key>
20 20
			<integer>39</integer>
21 21
		</dict>
22
		<key>RCTWebSocket.xcscheme_^#shared#^_</key>
23
		<dict>
24
			<key>orderHint</key>
25
			<integer>39</integer>
26
		</dict>
22 27
		<key>fishhook-tvOS.xcscheme</key>
23 28
		<dict>
24 29
			<key>orderHint</key>
@ -34,6 +39,11 @@
34 39
			<key>orderHint</key>
35 40
			<integer>40</integer>
36 41
		</dict>
42
		<key>fishhook.xcscheme_^#shared#^_</key>
43
		<dict>
44
			<key>orderHint</key>
45
			<integer>40</integer>
46
		</dict>
37 47
	</dict>
38 48
</dict>
39 49
</plist>

+ 41 - 6
display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -37,7 +37,12 @@
37 37
		<key>cxxreact.xcscheme</key>
38 38
		<dict>
39 39
			<key>orderHint</key>
40
			<integer>29</integer>
40
			<integer>23</integer>
41
		</dict>
42
		<key>cxxreact.xcscheme_^#shared#^_</key>
43
		<dict>
44
			<key>orderHint</key>
45
			<integer>23</integer>
41 46
		</dict>
42 47
		<key>double-conversion-tvOS.xcscheme</key>
43 48
		<dict>
@ -52,7 +57,12 @@
52 57
		<key>double-conversion.xcscheme</key>
53 58
		<dict>
54 59
			<key>orderHint</key>
55
			<integer>33</integer>
60
			<integer>30</integer>
61
		</dict>
62
		<key>double-conversion.xcscheme_^#shared#^_</key>
63
		<dict>
64
			<key>orderHint</key>
65
			<integer>30</integer>
56 66
		</dict>
57 67
		<key>jschelpers-tvOS.xcscheme</key>
58 68
		<dict>
@ -67,7 +77,12 @@
67 77
		<key>jschelpers.xcscheme</key>
68 78
		<dict>
69 79
			<key>orderHint</key>
70
			<integer>30</integer>
80
			<integer>31</integer>
81
		</dict>
82
		<key>jschelpers.xcscheme_^#shared#^_</key>
83
		<dict>
84
			<key>orderHint</key>
85
			<integer>31</integer>
71 86
		</dict>
72 87
		<key>jsinspector-tvOS.xcscheme</key>
73 88
		<dict>
@ -82,7 +97,12 @@
82 97
		<key>jsinspector.xcscheme</key>
83 98
		<dict>
84 99
			<key>orderHint</key>
85
			<integer>31</integer>
100
			<integer>32</integer>
101
		</dict>
102
		<key>jsinspector.xcscheme_^#shared#^_</key>
103
		<dict>
104
			<key>orderHint</key>
105
			<integer>32</integer>
86 106
		</dict>
87 107
		<key>privatedata-tvOS.xcscheme</key>
88 108
		<dict>
@ -99,6 +119,11 @@
99 119
			<key>orderHint</key>
100 120
			<integer>34</integer>
101 121
		</dict>
122
		<key>privatedata.xcscheme_^#shared#^_</key>
123
		<dict>
124
			<key>orderHint</key>
125
			<integer>34</integer>
126
		</dict>
102 127
		<key>third-party-tvOS.xcscheme</key>
103 128
		<dict>
104 129
			<key>orderHint</key>
@ -112,7 +137,12 @@
112 137
		<key>third-party.xcscheme</key>
113 138
		<dict>
114 139
			<key>orderHint</key>
115
			<integer>32</integer>
140
			<integer>33</integer>
141
		</dict>
142
		<key>third-party.xcscheme_^#shared#^_</key>
143
		<dict>
144
			<key>orderHint</key>
145
			<integer>33</integer>
116 146
		</dict>
117 147
		<key>yoga-tvOS.xcscheme</key>
118 148
		<dict>
@ -127,7 +157,12 @@
127 157
		<key>yoga.xcscheme</key>
128 158
		<dict>
129 159
			<key>orderHint</key>
130
			<integer>28</integer>
160
			<integer>29</integer>
161
		</dict>
162
		<key>yoga.xcscheme_^#shared#^_</key>
163
		<dict>
164
			<key>orderHint</key>
165
			<integer>29</integer>
131 166
		</dict>
132 167
	</dict>
133 168
	<key>SuppressBuildableAutocreation</key>

+ 3 - 3
display-center/Res/config/mobile-config.xml

@ -1,12 +1,12 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<configs>
3 3
    <!--appstore 正式环境  -->
4
<!--    <config name="request_host" value="http://www.aiipu.com:8083"/>-->
5
<!--    <config name="request_path" value="/show"/>-->
4
    <config name="request_host" value="http://www.aiipu.com:8083"/>
5
    <config name="request_path" value="/show"/>
6 6
7 7
    <!--chengwb 测试环境-->
8 8
<!--    <config name="request_host" value="http://121.42.183.206:8084"/>-->
9
<config name="request_host" value="http://121.42.183.206:8083"/>
9
<!--<config name="request_host" value="http://121.42.183.206:8083"/>-->
10 10
<!--    <config name="request_path" value="/show"/>-->
11 11
12 12
    <!--lfl-->

BIN
display-center/display-center.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate