Quellcode durchsuchen

去除IPUDragButton单例生成模式

liufl5 vor 6 Jahren
Ursprung
Commit
791088692f
39 geänderte Dateien mit 432 neuen und 257 gelöschten Zeilen
  1. 0 1
      IpuCommon/Frameworks/WadeMobile.framework/Headers/IPUDragButton.h
  2. 0 40
      IpuCommon/Frameworks/WadeMobile.framework/Headers/UIDragButton.h
  3. 0 6
      IpuCommon/Frameworks/WadeMobile.framework/Headers/WDAppDelegate.h
  4. 6 1
      IpuCommon/Frameworks/WadeMobile.framework/Headers/WDTemplateNavigateController.h
  5. 0 7
      IpuCommon/Frameworks/WadeMobile.framework/Headers/WDViewController.h
  6. 0 1
      IpuCommon/Frameworks/WadeMobile.framework/Headers/WadeMobile.h
  7. BIN
      IpuCommon/Frameworks/WadeMobile.framework/Info.plist
  8. BIN
      IpuCommon/Frameworks/WadeMobile.framework/WadeMobile
  9. BIN
      IpuCommon/Frameworks/WadeMobileFunc.framework/WadeMobileFunc
  10. 3 3
      IpuLib/IpuLib.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  11. 4 4
      SuperMenu/Res/config/mobile-config.xml
  12. 253 0
      SuperMenu/SuperMenu.xcodeproj/project.pbxproj
  13. BIN
      SuperMenu/SuperMenu.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  14. 24 72
      SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  15. 1 1
      SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  16. 1 1
      SuperMenu/SuperMenu/Info.plist
  17. 1 1
      SuperMenu/SuperMenu/multiple/AppManagePlugin.h
  18. 40 17
      SuperMenu/SuperMenu/multiple/AppManagePlugin.m
  19. 3 3
      WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  20. 3 3
      WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  21. 13 1
      WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m
  22. 1 1
      display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  23. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  24. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  25. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  26. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  27. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  28. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  29. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  30. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  31. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  32. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  33. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  34. 8 8
      display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  35. 4 4
      display-center/Res/config/mobile-config.xml
  36. 40 40
      display-center/display-center.xcodeproj/project.pbxproj
  37. BIN
      display-center/display-center.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  38. 7 23
      display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  39. 8 7
      display-center/display-center/ViewController.m

+ 0 - 1
IpuCommon/Frameworks/WadeMobile.framework/Headers/IPUDragButton.h

@ -10,7 +10,6 @@
10 10
11 11
@interface IPUDragButton : UIButton
12 12
13
+ (instancetype)sharedButton;
14 13
-(void)show;
15 14
-(void)dismiss;
16 15

+ 0 - 40
IpuCommon/Frameworks/WadeMobile.framework/Headers/UIDragButton.h

@ -1,40 +0,0 @@
1
//
2
//  UIDragButton.h
3
//  WadeMobile
4
//
5
//  Created by Wangxl,Lu on 2017/4/10.
6
//  Copyright © 2017年 asiainfo. All rights reserved.
7
//
8
9
#import <UIKit/UIKit.h>
10
11
@class UIDragButton;
12
13
@protocol UIDragButtonClickDelegate <NSObject>
14
15
@required
16
- (void)onClick:(UIDragButton *)target;
17
18
@end
19
20
@interface UIDragButton : UIButton
21
22
typedef void(^OnClickBlock)(UIDragButton *sender);
23
24
/**
25
 *  点击回调方法块
26
 **/
27
@property (nonatomic, copy) OnClickBlock onClick;
28
29
@property (nonatomic, retain) id <UIDragButtonClickDelegate> onClickDelegate;
30
31
- (instancetype)initWithFrame:(CGRect)frame AndViewController:(UIViewController *)viewController;
32
33
- (instancetype)initWithFrame:(CGRect)frame AndRooView:(UIView *)rootView;
34
35
- (void)show;
36
37
- (void)dismiss;
38
39
@end
40

+ 0 - 6
IpuCommon/Frameworks/WadeMobile.framework/Headers/WDAppDelegate.h

@ -11,7 +11,6 @@
11 11
#import "WDViewController.h"
12 12
#import "IpuUDPHelper.h"
13 13
#import "IpuUDPUtil.h"
14
//#import "UIDragButton.h"
15 14
#import "IpuImageUtil.h"
16 15
17 16
@interface WDAppDelegate : UIResponder <UIApplicationDelegate>
@ -22,11 +21,6 @@
22 21
23 22
@property (nonatomic, retain) UIView *lockView;
24 23
25
///**
26
// *  悬浮的按钮
27
// */
28
//@property (nonatomic, strong) UIDragButton *backButton;
29
30 24
/** 创建视图控制器 */
31 25
- (id)createViewController;
32 26

+ 6 - 1
IpuCommon/Frameworks/WadeMobile.framework/Headers/WDTemplateNavigateController.h

@ -23,8 +23,13 @@
23 23
@property(nonatomic,strong)NSArray *colors;
24 24
@property(nonatomic,assign)BOOL hiddenNavigationBar;
25 25
26
/*
27
 默认显示导航栏
28
 */
26 29
-(id)initWithUrl:(NSString *)url Callback:(NSString *)callback Title:(NSString *)title Operates:(NSArray *)operates Colors:(NSArray *)colors;
27
30
/*
31
 通过参数控制是否显示导航栏:隐藏导航栏的情况会显示悬浮按钮
32
 */
28 33
-(id)initWithUrl:(NSString *)url Callback:(NSString *)callback Title:(NSString *)title Operates:(NSArray *)operates Colors:(NSArray *)colors Hidden:(BOOL)hidden;
29 34
30 35
@end

+ 0 - 7
IpuCommon/Frameworks/WadeMobile.framework/Headers/WDViewController.h

@ -19,19 +19,12 @@
19 19
#import "IpuMacroDefinition.h"
20 20
21 21
#import <WebKit/WebKit.h>
22
#import "IPUDragButton.h"
23 22
24 23
@interface WDViewController : UIViewController <UIWebViewDelegate,WadeMobileDelegate,UIGestureRecognizerDelegate,WKUIDelegate,WKNavigationDelegate>
25 24
{
26 25
    WDMobileWebView *wadeWebView;
27
//    IPUDragButton *dragButton;
28 26
}
29 27
30
///*
31
// 悬浮按钮返回操作:add by lfl
32
// */
33
//-(void)dragButtonBackAction;
34
35 28
// 获取视图窗体大小
36 29
- (CGRect)getViewFrame;
37 30

+ 0 - 1
IpuCommon/Frameworks/WadeMobile.framework/Headers/WadeMobile.h

@ -12,7 +12,6 @@
12 12
13 13
#import <WadeMobile/IpuMacroDefinition.h>
14 14
#import <WadeMobile/IpuDateTool.h>
15
#import <WadeMobile/UIDragButton.h>
16 15
#import <WadeMobile/IPUDragButton.h>
17 16
#import <WadeMobile/DynamicPlugin.h>
18 17
#import <WadeMobile/DynamicPluginManager.h>

BIN
IpuCommon/Frameworks/WadeMobile.framework/Info.plist


BIN
IpuCommon/Frameworks/WadeMobile.framework/WadeMobile


BIN
IpuCommon/Frameworks/WadeMobileFunc.framework/WadeMobileFunc


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

@ -7,17 +7,17 @@
7 7
		<key>IpuLib.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>16</integer>
10
			<integer>10</integer>
11 11
		</dict>
12 12
		<key>IpuLib4Appstore.xcscheme</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>17</integer>
15
			<integer>11</integer>
16 16
		</dict>
17 17
		<key>IpuLib4Develop.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>18</integer>
20
			<integer>12</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

+ 4 - 4
SuperMenu/Res/config/mobile-config.xml

@ -1,8 +1,8 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<configs>
3 3
    <!--appstore 正式环境-->
4
    <config name="request_host" value="http://aiipu.com:8083"/>
5
    <config name="request_path" value="/superapp"/>
4
<!--    <config name="request_host" value="http://aiipu.com:8083"/>-->
5
<!--    <config name="request_path" value="/superapp"/>-->
6 6
7 7
    <!--openUrl测试环境-->
8 8
<!--    <config name="request_host" value="http://121.42.183.206:8083"/>-->
@ -23,8 +23,8 @@
23 23
24 24
    <!--lfl-->
25 25
<!--    <config name="request_host" value="http://192.168.31.239:8080"/>-->
26
<!--    <config name="request_host" value="http://172.20.10.4:8080"/>-->
27
<!--    <config name="request_path" value="/superapp"/>-->
26
    <config name="request_host" value="http://172.20.10.4:8080"/>
27
    <config name="request_path" value="/superapp"/>
28 28
29 29
    
30 30
    <config name="request_servlet" value="/mobiledata"/>

+ 253 - 0
SuperMenu/SuperMenu.xcodeproj/project.pbxproj

@ -50,6 +50,93 @@
50 50
		EA9AB3291E1DF3CB009CDEB6 /* IpuMapBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = EA9AB3281E1DF3CB009CDEB6 /* IpuMapBundle.bundle */; };
51 51
/* End PBXBuildFile section */
52 52
53
/* Begin PBXContainerItemProxy section */
54
		0465669B2240945600E9BD7F /* PBXContainerItemProxy */ = {
55
			isa = PBXContainerItemProxy;
56
			containerPortal = 046566942240945600E9BD7F /* IpuLib.xcodeproj */;
57
			proxyType = 2;
58
			remoteGlobalIDString = E2BECD581BF8EC290077807A;
59
			remoteInfo = IpuLib;
60
		};
61
		0465669D2240945600E9BD7F /* PBXContainerItemProxy */ = {
62
			isa = PBXContainerItemProxy;
63
			containerPortal = 046566942240945600E9BD7F /* IpuLib.xcodeproj */;
64
			proxyType = 2;
65
			remoteGlobalIDString = E2BECD631BF8EC290077807A;
66
			remoteInfo = IpuLibTests;
67
		};
68
		046566AF2240946600E9BD7F /* PBXContainerItemProxy */ = {
69
			isa = PBXContainerItemProxy;
70
			containerPortal = 046566A92240946600E9BD7F /* IpuPush.xcodeproj */;
71
			proxyType = 2;
72
			remoteGlobalIDString = 0A159C231D2B4BD70025166A;
73
			remoteInfo = IpuPush;
74
		};
75
		046566B12240946600E9BD7F /* PBXContainerItemProxy */ = {
76
			isa = PBXContainerItemProxy;
77
			containerPortal = 046566A92240946600E9BD7F /* IpuPush.xcodeproj */;
78
			proxyType = 2;
79
			remoteGlobalIDString = 0A159C2D1D2B4BD70025166A;
80
			remoteInfo = IpuPushTests;
81
		};
82
		046566B82240947900E9BD7F /* PBXContainerItemProxy */ = {
83
			isa = PBXContainerItemProxy;
84
			containerPortal = 046566B32240947800E9BD7F /* IpuCount.xcodeproj */;
85
			proxyType = 2;
86
			remoteGlobalIDString = EAA4B4D61C897885000342A1;
87
			remoteInfo = IpuCount;
88
		};
89
		046566BA2240947900E9BD7F /* PBXContainerItemProxy */ = {
90
			isa = PBXContainerItemProxy;
91
			containerPortal = 046566B32240947800E9BD7F /* IpuCount.xcodeproj */;
92
			proxyType = 2;
93
			remoteGlobalIDString = EAA4B4E01C897885000342A1;
94
			remoteInfo = IpuCountTests;
95
		};
96
		0477305A223F9ACE00709882 /* PBXContainerItemProxy */ = {
97
			isa = PBXContainerItemProxy;
98
			containerPortal = 04773051223F9ACD00709882 /* WadeMobile.xcodeproj */;
99
			proxyType = 2;
100
			remoteGlobalIDString = 614A1CD61B2142130099793B;
101
			remoteInfo = WadeMobile;
102
		};
103
		0477305C223F9ACE00709882 /* PBXContainerItemProxy */ = {
104
			isa = PBXContainerItemProxy;
105
			containerPortal = 04773051223F9ACD00709882 /* WadeMobile.xcodeproj */;
106
			proxyType = 2;
107
			remoteGlobalIDString = 614A1CE11B2142130099793B;
108
			remoteInfo = WadeMobileTests;
109
		};
110
		0477305E223F9ACE00709882 /* PBXContainerItemProxy */ = {
111
			isa = PBXContainerItemProxy;
112
			containerPortal = 04773051223F9ACD00709882 /* WadeMobile.xcodeproj */;
113
			proxyType = 2;
114
			remoteGlobalIDString = E2D93A741B89BA2800D1DE7C;
115
			remoteInfo = WadeMobileBundle;
116
		};
117
		04773060223F9ACE00709882 /* PBXContainerItemProxy */ = {
118
			isa = PBXContainerItemProxy;
119
			containerPortal = 04773051223F9ACD00709882 /* WadeMobile.xcodeproj */;
120
			proxyType = 2;
121
			remoteGlobalIDString = 0A791C221FD102C0003CD586;
122
			remoteInfo = WadeMobileTestUnit;
123
		};
124
		04773069223F9ADA00709882 /* PBXContainerItemProxy */ = {
125
			isa = PBXContainerItemProxy;
126
			containerPortal = 04773062223F9ADA00709882 /* WadeMobileFunc.xcodeproj */;
127
			proxyType = 2;
128
			remoteGlobalIDString = E2DE1AD41B42DD9500762141;
129
			remoteInfo = WadeMobileFunc;
130
		};
131
		0477306B223F9ADA00709882 /* PBXContainerItemProxy */ = {
132
			isa = PBXContainerItemProxy;
133
			containerPortal = 04773062223F9ADA00709882 /* WadeMobileFunc.xcodeproj */;
134
			proxyType = 2;
135
			remoteGlobalIDString = 0AE1E0841C7EE95900FCCD24;
136
			remoteInfo = WadeMobileFuncTests;
137
		};
138
/* End PBXContainerItemProxy section */
139
53 140
/* Begin PBXCopyFilesBuildPhase section */
54 141
		EA45A5B21E0777C0001275C9 /* Embed Frameworks */ = {
55 142
			isa = PBXCopyFilesBuildPhase;
@ -78,8 +165,13 @@
78 165
		045BF82B218AEDD800235C80 /* WadeMobileFunc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WadeMobileFunc.framework; path = ../IpuCommon/Frameworks/WadeMobileFunc.framework; sourceTree = "<group>"; };
79 166
		045E1FF22175E2E400F0D45A /* SuperMenu_Enterprise-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "SuperMenu_Enterprise-Info.plist"; path = "/Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu_Enterprise-Info.plist"; sourceTree = "<absolute>"; };
80 167
		04635DDA2223E3150073DE0A /* IpuCount.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IpuCount.framework; path = ../IpuCommon/Frameworks/IpuCount.framework; sourceTree = "<group>"; };
168
		046566942240945600E9BD7F /* IpuLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = IpuLib.xcodeproj; path = ../IpuLib/IpuLib.xcodeproj; sourceTree = "<group>"; };
169
		046566A92240946600E9BD7F /* IpuPush.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = IpuPush.xcodeproj; path = "../../ios-plugin/IpuPush/IpuPush.xcodeproj"; sourceTree = "<group>"; };
170
		046566B32240947800E9BD7F /* IpuCount.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = IpuCount.xcodeproj; path = "../../ios-plugin/IpuCount/IpuCount.xcodeproj"; sourceTree = "<group>"; };
81 171
		0468917B21C9080700EE1411 /* IpuPush.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IpuPush.framework; path = ../IpuCommon/Frameworks/IpuPush.framework; sourceTree = "<group>"; };
82 172
		0468917D21C9081600EE1411 /* WadeMobile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WadeMobile.framework; path = ../IpuCommon/Frameworks/WadeMobile.framework; sourceTree = "<group>"; };
173
		04773051223F9ACD00709882 /* WadeMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobile.xcodeproj; path = ../../ios/WadeMobile/WadeMobile.xcodeproj; sourceTree = "<group>"; };
174
		04773062223F9ADA00709882 /* WadeMobileFunc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobileFunc.xcodeproj; path = ../WadeMobileFunc/WadeMobileFunc.xcodeproj; sourceTree = "<group>"; };
83 175
		0A780E611EE8EACF004AE072 /* IpuQrCode.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IpuQrCode.framework; path = ../IpuCommon/Frameworks/IpuQrCode.framework; sourceTree = "<group>"; };
84 176
		0ADE48411FF6181A009961EF /* SubViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SubViewController.h; sourceTree = "<group>"; };
85 177
		0ADE48421FF6181A009961EF /* SubViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SubViewController.m; sourceTree = "<group>"; };
@ -141,6 +233,53 @@
141 233
/* End PBXFrameworksBuildPhase section */
142 234
143 235
/* Begin PBXGroup section */
236
		046566952240945600E9BD7F /* Products */ = {
237
			isa = PBXGroup;
238
			children = (
239
				0465669C2240945600E9BD7F /* IpuLib.framework */,
240
				0465669E2240945600E9BD7F /* IpuLibTests.xctest */,
241
			);
242
			name = Products;
243
			sourceTree = "<group>";
244
		};
245
		046566AA2240946600E9BD7F /* Products */ = {
246
			isa = PBXGroup;
247
			children = (
248
				046566B02240946600E9BD7F /* IpuPush.framework */,
249
				046566B22240946600E9BD7F /* IpuPushTests.xctest */,
250
			);
251
			name = Products;
252
			sourceTree = "<group>";
253
		};
254
		046566B42240947800E9BD7F /* Products */ = {
255
			isa = PBXGroup;
256
			children = (
257
				046566B92240947900E9BD7F /* IpuCount.framework */,
258
				046566BB2240947900E9BD7F /* IpuCountTests.xctest */,
259
			);
260
			name = Products;
261
			sourceTree = "<group>";
262
		};
263
		04773052223F9ACD00709882 /* Products */ = {
264
			isa = PBXGroup;
265
			children = (
266
				0477305B223F9ACE00709882 /* WadeMobile.framework */,
267
				0477305D223F9ACE00709882 /* WadeMobileTests.xctest */,
268
				0477305F223F9ACE00709882 /* WadeMobileBundle.bundle */,
269
				04773061223F9ACE00709882 /* WadeMobileTestUnit.xctest */,
270
			);
271
			name = Products;
272
			sourceTree = "<group>";
273
		};
274
		04773063223F9ADA00709882 /* Products */ = {
275
			isa = PBXGroup;
276
			children = (
277
				0477306A223F9ADA00709882 /* WadeMobileFunc.framework */,
278
				0477306C223F9ADA00709882 /* WadeMobileFuncTests.xctest */,
279
			);
280
			name = Products;
281
			sourceTree = "<group>";
282
		};
144 283
		0A780E601EE8EAB0004AE072 /* Framework */ = {
145 284
			isa = PBXGroup;
146 285
			children = (
@ -194,6 +333,11 @@
194 333
		EA45A5831E077735001275C9 = {
195 334
			isa = PBXGroup;
196 335
			children = (
336
				046566B32240947800E9BD7F /* IpuCount.xcodeproj */,
337
				046566A92240946600E9BD7F /* IpuPush.xcodeproj */,
338
				046566942240945600E9BD7F /* IpuLib.xcodeproj */,
339
				04773062223F9ADA00709882 /* WadeMobileFunc.xcodeproj */,
340
				04773051223F9ACD00709882 /* WadeMobile.xcodeproj */,
197 341
				0429A29921805EA8003CEE83 /* Res */,
198 342
				0A780E601EE8EAB0004AE072 /* Framework */,
199 343
				EA45A58E1E077735001275C9 /* SuperMenu */,
@ -307,6 +451,28 @@
307 451
			mainGroup = EA45A5831E077735001275C9;
308 452
			productRefGroup = EA45A58D1E077735001275C9 /* Products */;
309 453
			projectDirPath = "";
454
			projectReferences = (
455
				{
456
					ProductGroup = 046566B42240947800E9BD7F /* Products */;
457
					ProjectRef = 046566B32240947800E9BD7F /* IpuCount.xcodeproj */;
458
				},
459
				{
460
					ProductGroup = 046566952240945600E9BD7F /* Products */;
461
					ProjectRef = 046566942240945600E9BD7F /* IpuLib.xcodeproj */;
462
				},
463
				{
464
					ProductGroup = 046566AA2240946600E9BD7F /* Products */;
465
					ProjectRef = 046566A92240946600E9BD7F /* IpuPush.xcodeproj */;
466
				},
467
				{
468
					ProductGroup = 04773052223F9ACD00709882 /* Products */;
469
					ProjectRef = 04773051223F9ACD00709882 /* WadeMobile.xcodeproj */;
470
				},
471
				{
472
					ProductGroup = 04773063223F9ADA00709882 /* Products */;
473
					ProjectRef = 04773062223F9ADA00709882 /* WadeMobileFunc.xcodeproj */;
474
				},
475
			);
310 476
			projectRoot = "";
311 477
			targets = (
312 478
				EA45A58B1E077735001275C9 /* SuperMenu */,
@ -314,6 +480,93 @@
314 480
		};
315 481
/* End PBXProject section */
316 482
483
/* Begin PBXReferenceProxy section */
484
		0465669C2240945600E9BD7F /* IpuLib.framework */ = {
485
			isa = PBXReferenceProxy;
486
			fileType = wrapper.framework;
487
			path = IpuLib.framework;
488
			remoteRef = 0465669B2240945600E9BD7F /* PBXContainerItemProxy */;
489
			sourceTree = BUILT_PRODUCTS_DIR;
490
		};
491
		0465669E2240945600E9BD7F /* IpuLibTests.xctest */ = {
492
			isa = PBXReferenceProxy;
493
			fileType = wrapper.cfbundle;
494
			path = IpuLibTests.xctest;
495
			remoteRef = 0465669D2240945600E9BD7F /* PBXContainerItemProxy */;
496
			sourceTree = BUILT_PRODUCTS_DIR;
497
		};
498
		046566B02240946600E9BD7F /* IpuPush.framework */ = {
499
			isa = PBXReferenceProxy;
500
			fileType = wrapper.framework;
501
			path = IpuPush.framework;
502
			remoteRef = 046566AF2240946600E9BD7F /* PBXContainerItemProxy */;
503
			sourceTree = BUILT_PRODUCTS_DIR;
504
		};
505
		046566B22240946600E9BD7F /* IpuPushTests.xctest */ = {
506
			isa = PBXReferenceProxy;
507
			fileType = wrapper.cfbundle;
508
			path = IpuPushTests.xctest;
509
			remoteRef = 046566B12240946600E9BD7F /* PBXContainerItemProxy */;
510
			sourceTree = BUILT_PRODUCTS_DIR;
511
		};
512
		046566B92240947900E9BD7F /* IpuCount.framework */ = {
513
			isa = PBXReferenceProxy;
514
			fileType = wrapper.framework;
515
			path = IpuCount.framework;
516
			remoteRef = 046566B82240947900E9BD7F /* PBXContainerItemProxy */;
517
			sourceTree = BUILT_PRODUCTS_DIR;
518
		};
519
		046566BB2240947900E9BD7F /* IpuCountTests.xctest */ = {
520
			isa = PBXReferenceProxy;
521
			fileType = wrapper.cfbundle;
522
			path = IpuCountTests.xctest;
523
			remoteRef = 046566BA2240947900E9BD7F /* PBXContainerItemProxy */;
524
			sourceTree = BUILT_PRODUCTS_DIR;
525
		};
526
		0477305B223F9ACE00709882 /* WadeMobile.framework */ = {
527
			isa = PBXReferenceProxy;
528
			fileType = wrapper.framework;
529
			path = WadeMobile.framework;
530
			remoteRef = 0477305A223F9ACE00709882 /* PBXContainerItemProxy */;
531
			sourceTree = BUILT_PRODUCTS_DIR;
532
		};
533
		0477305D223F9ACE00709882 /* WadeMobileTests.xctest */ = {
534
			isa = PBXReferenceProxy;
535
			fileType = wrapper.cfbundle;
536
			path = WadeMobileTests.xctest;
537
			remoteRef = 0477305C223F9ACE00709882 /* PBXContainerItemProxy */;
538
			sourceTree = BUILT_PRODUCTS_DIR;
539
		};
540
		0477305F223F9ACE00709882 /* WadeMobileBundle.bundle */ = {
541
			isa = PBXReferenceProxy;
542
			fileType = wrapper.cfbundle;
543
			path = WadeMobileBundle.bundle;
544
			remoteRef = 0477305E223F9ACE00709882 /* PBXContainerItemProxy */;
545
			sourceTree = BUILT_PRODUCTS_DIR;
546
		};
547
		04773061223F9ACE00709882 /* WadeMobileTestUnit.xctest */ = {
548
			isa = PBXReferenceProxy;
549
			fileType = wrapper.cfbundle;
550
			path = WadeMobileTestUnit.xctest;
551
			remoteRef = 04773060223F9ACE00709882 /* PBXContainerItemProxy */;
552
			sourceTree = BUILT_PRODUCTS_DIR;
553
		};
554
		0477306A223F9ADA00709882 /* WadeMobileFunc.framework */ = {
555
			isa = PBXReferenceProxy;
556
			fileType = wrapper.framework;
557
			path = WadeMobileFunc.framework;
558
			remoteRef = 04773069223F9ADA00709882 /* PBXContainerItemProxy */;
559
			sourceTree = BUILT_PRODUCTS_DIR;
560
		};
561
		0477306C223F9ADA00709882 /* WadeMobileFuncTests.xctest */ = {
562
			isa = PBXReferenceProxy;
563
			fileType = wrapper.cfbundle;
564
			path = WadeMobileFuncTests.xctest;
565
			remoteRef = 0477306B223F9ADA00709882 /* PBXContainerItemProxy */;
566
			sourceTree = BUILT_PRODUCTS_DIR;
567
		};
568
/* End PBXReferenceProxy section */
569
317 570
/* Begin PBXResourcesBuildPhase section */
318 571
		EA45A58A1E077735001275C9 /* Resources */ = {
319 572
			isa = PBXResourcesBuildPhase;

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


+ 24 - 72
SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -25,22 +25,6 @@
25 25
            shouldBeEnabled = "Yes"
26 26
            ignoreCount = "0"
27 27
            continueAfterRunningActions = "No"
28
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
29
            timestampString = "574234345.384583"
30
            startingColumnNumber = "9223372036854775807"
31
            endingColumnNumber = "9223372036854775807"
32
            startingLineNumber = "287"
33
            endingLineNumber = "287"
34
            landmarkName = "AppManagePlugin"
35
            landmarkType = "3">
36
         </BreakpointContent>
37
      </BreakpointProxy>
38
      <BreakpointProxy
39
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
40
         <BreakpointContent
41
            shouldBeEnabled = "Yes"
42
            ignoreCount = "0"
43
            continueAfterRunningActions = "No"
44 28
            filePath = "SuperMenu/multiple/SubViewController.m"
45 29
            timestampString = "574081169.643162"
46 30
            startingColumnNumber = "9223372036854775807"
@ -842,7 +826,7 @@
842 826
                  moduleName = "WadeMobileFunc"
843 827
                  usesParentBreakpointCondition = "Yes"
844 828
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFUploadDownload.m"
845
                  timestampString = "574234345.721573"
829
                  timestampString = "574657969.556193"
846 830
                  startingColumnNumber = "9223372036854775807"
847 831
                  endingColumnNumber = "9223372036854775807"
848 832
                  startingLineNumber = "472"
@ -857,7 +841,7 @@
857 841
                  moduleName = "WadeMobileFunc"
858 842
                  usesParentBreakpointCondition = "Yes"
859 843
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFUploadDownload.m"
860
                  timestampString = "574234345.7237"
844
                  timestampString = "574657969.558228"
861 845
                  startingColumnNumber = "9223372036854775807"
862 846
                  endingColumnNumber = "9223372036854775807"
863 847
                  startingLineNumber = "472"
@ -895,7 +879,7 @@
895 879
            endingColumnNumber = "9223372036854775807"
896 880
            startingLineNumber = "210"
897 881
            endingLineNumber = "210"
898
            landmarkName = "-getChoice:"
882
            landmarkName = "-openNativeApp:url:"
899 883
            landmarkType = "7">
900 884
         </BreakpointContent>
901 885
      </BreakpointProxy>
@ -911,7 +895,7 @@
911 895
            endingColumnNumber = "9223372036854775807"
912 896
            startingLineNumber = "244"
913 897
            endingLineNumber = "244"
914
            landmarkName = "-closeIpuApp:"
898
            landmarkName = "-reLogin:"
915 899
            landmarkType = "7">
916 900
         </BreakpointContent>
917 901
      </BreakpointProxy>
@ -927,40 +911,8 @@
927 911
            endingColumnNumber = "9223372036854775807"
928 912
            startingLineNumber = "253"
929 913
            endingLineNumber = "253"
930
            landmarkName = "-initNfc:"
914
            landmarkName = "-closeVC:toPage:"
931 915
            landmarkType = "7">
932
            <Locations>
933
               <Location
934
                  shouldBeEnabled = "Yes"
935
                  ignoreCount = "0"
936
                  continueAfterRunningActions = "No"
937
                  symbolName = "-[AppManagePlugin initNfc:]"
938
                  moduleName = "SuperMenu"
939
                  usesParentBreakpointCondition = "Yes"
940
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
941
                  timestampString = "574234345.603299"
942
                  startingColumnNumber = "9223372036854775807"
943
                  endingColumnNumber = "9223372036854775807"
944
                  startingLineNumber = "253"
945
                  endingLineNumber = "253"
946
                  offsetFromSymbolStart = "39">
947
               </Location>
948
               <Location
949
                  shouldBeEnabled = "Yes"
950
                  ignoreCount = "0"
951
                  continueAfterRunningActions = "No"
952
                  symbolName = "__27-[AppManagePlugin initNfc:]_block_invoke"
953
                  moduleName = "SuperMenu"
954
                  usesParentBreakpointCondition = "Yes"
955
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
956
                  timestampString = "574234345.605612"
957
                  startingColumnNumber = "9223372036854775807"
958
                  endingColumnNumber = "9223372036854775807"
959
                  startingLineNumber = "255"
960
                  endingLineNumber = "255"
961
                  offsetFromSymbolStart = "69">
962
               </Location>
963
            </Locations>
964 916
         </BreakpointContent>
965 917
      </BreakpointProxy>
966 918
      <BreakpointProxy
@ -975,24 +927,8 @@
975 927
            endingColumnNumber = "9223372036854775807"
976 928
            startingLineNumber = "269"
977 929
            endingLineNumber = "269"
978
            landmarkName = "-getSubAppParams"
979
            landmarkType = "7">
980
         </BreakpointContent>
981
      </BreakpointProxy>
982
      <BreakpointProxy
983
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
984
         <BreakpointContent
985
            shouldBeEnabled = "Yes"
986
            ignoreCount = "0"
987
            continueAfterRunningActions = "No"
988
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
989
            timestampString = "574234345.38548"
990
            startingColumnNumber = "9223372036854775807"
991
            endingColumnNumber = "9223372036854775807"
992
            startingLineNumber = "277"
993
            endingLineNumber = "277"
994
            landmarkName = "-openNativeApp:url:"
995
            landmarkType = "7">
930
            landmarkName = "AppManagePlugin"
931
            landmarkType = "3">
996 932
         </BreakpointContent>
997 933
      </BreakpointProxy>
998 934
      <BreakpointProxy
@ -1119,7 +1055,23 @@
1119 1055
            endingColumnNumber = "9223372036854775807"
1120 1056
            startingLineNumber = "132"
1121 1057
            endingLineNumber = "132"
1122
            landmarkName = "-openRemoteURL:"
1058
            landmarkName = "-openNativeApp:"
1059
            landmarkType = "7">
1060
         </BreakpointContent>
1061
      </BreakpointProxy>
1062
      <BreakpointProxy
1063
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
1064
         <BreakpointContent
1065
            shouldBeEnabled = "Yes"
1066
            ignoreCount = "0"
1067
            continueAfterRunningActions = "No"
1068
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m"
1069
            timestampString = "574593854.515074"
1070
            startingColumnNumber = "9223372036854775807"
1071
            endingColumnNumber = "9223372036854775807"
1072
            startingLineNumber = "192"
1073
            endingLineNumber = "192"
1074
            landmarkName = "-openUrl:"
1123 1075
            landmarkType = "7">
1124 1076
         </BreakpointContent>
1125 1077
      </BreakpointProxy>

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

@ -7,7 +7,7 @@
7 7
		<key>SuperMenu.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>0</integer>
10
			<integer>2</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

+ 1 - 1
SuperMenu/SuperMenu/Info.plist

@ -17,7 +17,7 @@
17 17
	<key>CFBundlePackageType</key>
18 18
	<string>APPL</string>
19 19
	<key>CFBundleShortVersionString</key>
20
	<string>3.0</string>
20
	<string>1.0.5</string>
21 21
	<key>CFBundleSignature</key>
22 22
	<string>????</string>
23 23
	<key>CFBundleURLTypes</key>

+ 1 - 1
SuperMenu/SuperMenu/multiple/AppManagePlugin.h

@ -23,6 +23,6 @@
23 23
24 24
- (void) getAppsConfig:(NSArray *)args;
25 25
26
- (void) openRemoteURL:(NSArray *)args;
26
- (void) openRemoteURL:(NSArray *)param;
27 27
28 28
@end

+ 40 - 17
SuperMenu/SuperMenu/multiple/AppManagePlugin.m

@ -275,23 +275,46 @@
275 275
    return [NSString stringWithFormat:@"{\"%@\":\"%@\",\"%@\":\"%@\"}", KEY_SESSION, sessionId, KEY_STAFF_ID, staffId];
276 276
}
277 277
278
- (void) openRemoteURL:(NSArray *)args {
279
    //    dispatch_time_t time = dispatch_time(DISPATCH_TIME_NOW, 0.5*NSEC_PER_SEC);
280
    //    dispatch_after(time, dispatch_get_main_queue(), ^{
281
    //        UIViewController *vc = [self.wademobile getViewController];
282
    //
283
    //        NSString *urlStr = @"https://m.10010.com/queen/tencent/king-tab.html?channel=2&from=singlemessage";
284
    //        RemoteWebVC *webVC = [[RemoteWebVC alloc] initWithTitle:@"" urlPath:urlStr];
285
    //
286
    //        [vc presentViewController:webVC animated:NO completion:^{
287
    //            ;
288
    //        }];
289
    //    });
290
    
291
    //    NSString *urlStr = @"https://m.10010.com/queen/tencent/king-tab.html?channel=2&from=singlemessage";
292
    
293
    if (args && args.count > 0) {
294
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:args[0] Callback:nil Title:nil Operates:nil Colors:nil];
278
- (void) openRemoteURL:(NSArray *)param {
279
    if (param && param.count>0) {
280
        if (param[0]==[NSNull null]) {
281
            return;
282
        }
283
        NSString *url = param[0];
284
        NSString *title = nil;
285
        if (param.count>1) {
286
            if (param[1]==[NSNull null]) {
287
                title = nil;
288
            }else{
289
                title = param[1];
290
            }
291
        }
292
        NSArray *operates = nil;
293
        if (param.count>2) {
294
            if (param[2]==[NSNull null]) {
295
                operates = nil;
296
            }else{
297
                operates = param[2];
298
            }
299
        }
300
        NSArray *colors = nil;
301
        if (param.count>3) {
302
            if (param[3]==[NSNull null]) {
303
                colors = nil;
304
            }else{
305
                colors = param[3];
306
            }
307
        }
308
        BOOL hiddenBar = false;
309
        if (param.count>4) {
310
            if (param[4]==[NSNull null]) {
311
                hiddenBar = false;
312
            }else{
313
                hiddenBar = [param[4] boolValue];
314
            }
315
        }
316
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors Hidden:hiddenBar];
317
        vc.plugin = self;
295 318
        UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:vc];
296 319
        [[self getViewController] presentViewController:nc animated:YES completion:^{
297 320
            

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

@ -26,7 +26,7 @@
26 26
                  moduleName = "WadeMobileFunc"
27 27
                  usesParentBreakpointCondition = "Yes"
28 28
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
29
                  timestampString = "574234345.662415"
29
                  timestampString = "574657969.565012"
30 30
                  startingColumnNumber = "9223372036854775807"
31 31
                  endingColumnNumber = "9223372036854775807"
32 32
                  startingLineNumber = "291"
@ -41,7 +41,7 @@
41 41
                  moduleName = "WadeMobileFunc"
42 42
                  usesParentBreakpointCondition = "Yes"
43 43
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
44
                  timestampString = "574234345.6647559"
44
                  timestampString = "574657969.567091"
45 45
                  startingColumnNumber = "9223372036854775807"
46 46
                  endingColumnNumber = "9223372036854775807"
47 47
                  startingLineNumber = "292"
@ -56,7 +56,7 @@
56 56
                  moduleName = "WadeMobileFunc"
57 57
                  usesParentBreakpointCondition = "Yes"
58 58
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
59
                  timestampString = "574234345.6666321"
59
                  timestampString = "574657969.568895"
60 60
                  startingColumnNumber = "9223372036854775807"
61 61
                  endingColumnNumber = "9223372036854775807"
62 62
                  startingLineNumber = "291"

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

@ -7,17 +7,17 @@
7 7
		<key>WadeMobileFunc.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>10</integer>
10
			<integer>3</integer>
11 11
		</dict>
12 12
		<key>WadeMobileFunc4Appstore.xcscheme</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>11</integer>
15
			<integer>5</integer>
16 16
		</dict>
17 17
		<key>WadeMobileFuncAggregate.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>9</integer>
20
			<integer>4</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

+ 13 - 1
WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m

@ -190,6 +190,9 @@
190 190
-(void) openUrl:(NSArray*)param
191 191
{
192 192
    if (param && param.count>0) {
193
        if (param[0]==[NSNull null]) {
194
            return;
195
        }
193 196
        NSString *url = param[0];
194 197
        NSString *title = nil;
195 198
        if (param.count>1) {
@ -215,7 +218,16 @@
215 218
                colors = param[3];
216 219
            }
217 220
        }
218
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors];
221
        BOOL hiddenBar = false;
222
        if (param.count>4) {
223
            if (param[4]==[NSNull null]) {
224
                hiddenBar = false;
225
            }else{
226
                hiddenBar = [param[4] boolValue];
227
            }
228
        }
229
//        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors];
230
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors Hidden:hiddenBar];
219 231
        vc.plugin = self;
220 232
        UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:vc];
221 233
        [[self getViewController] presentViewController:nc animated:YES completion:^{

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

@ -7,7 +7,7 @@
7 7
		<key>RNCamera.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>24</integer>
10
			<integer>28</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>ART.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>23</integer>
20
			<integer>38</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTBlob.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>26</integer>
20
			<integer>32</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -7,7 +7,7 @@
7 7
		<key>RCTCameraRoll.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>27</integer>
10
			<integer>33</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

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

@ -7,7 +7,7 @@
7 7
		<key>RCTGeolocation.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>28</integer>
10
			<integer>34</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTImage.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>29</integer>
20
			<integer>35</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTLinking.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>30</integer>
20
			<integer>36</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTAnimation.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>38</integer>
20
			<integer>44</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTNetwork.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>39</integer>
20
			<integer>45</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTSettings.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>40</integer>
20
			<integer>46</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -7,7 +7,7 @@
7 7
		<key>RCTVibration.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>41</integer>
10
			<integer>47</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTWebSocket.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>42</integer>
20
			<integer>48</integer>
21 21
		</dict>
22 22
		<key>fishhook-tvOS.xcscheme</key>
23 23
		<dict>
@ -32,7 +32,7 @@
32 32
		<key>fishhook.xcscheme</key>
33 33
		<dict>
34 34
			<key>orderHint</key>
35
			<integer>36</integer>
35
			<integer>49</integer>
36 36
		</dict>
37 37
	</dict>
38 38
</dict>

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

@ -32,12 +32,12 @@
32 32
		<key>cxxreact-tvOS.xcscheme_^#shared#^_</key>
33 33
		<dict>
34 34
			<key>orderHint</key>
35
			<integer>2</integer>
35
			<integer>3</integer>
36 36
		</dict>
37 37
		<key>cxxreact.xcscheme</key>
38 38
		<dict>
39 39
			<key>orderHint</key>
40
			<integer>25</integer>
40
			<integer>31</integer>
41 41
		</dict>
42 42
		<key>double-conversion-tvOS.xcscheme</key>
43 43
		<dict>
@ -52,7 +52,7 @@
52 52
		<key>double-conversion.xcscheme</key>
53 53
		<dict>
54 54
			<key>orderHint</key>
55
			<integer>32</integer>
55
			<integer>39</integer>
56 56
		</dict>
57 57
		<key>jschelpers-tvOS.xcscheme</key>
58 58
		<dict>
@ -67,7 +67,7 @@
67 67
		<key>jschelpers.xcscheme</key>
68 68
		<dict>
69 69
			<key>orderHint</key>
70
			<integer>33</integer>
70
			<integer>40</integer>
71 71
		</dict>
72 72
		<key>jsinspector-tvOS.xcscheme</key>
73 73
		<dict>
@ -82,7 +82,7 @@
82 82
		<key>jsinspector.xcscheme</key>
83 83
		<dict>
84 84
			<key>orderHint</key>
85
			<integer>34</integer>
85
			<integer>41</integer>
86 86
		</dict>
87 87
		<key>privatedata-tvOS.xcscheme</key>
88 88
		<dict>
@ -97,7 +97,7 @@
97 97
		<key>privatedata.xcscheme</key>
98 98
		<dict>
99 99
			<key>orderHint</key>
100
			<integer>37</integer>
100
			<integer>43</integer>
101 101
		</dict>
102 102
		<key>third-party-tvOS.xcscheme</key>
103 103
		<dict>
@ -112,7 +112,7 @@
112 112
		<key>third-party.xcscheme</key>
113 113
		<dict>
114 114
			<key>orderHint</key>
115
			<integer>35</integer>
115
			<integer>42</integer>
116 116
		</dict>
117 117
		<key>yoga-tvOS.xcscheme</key>
118 118
		<dict>
@ -127,7 +127,7 @@
127 127
		<key>yoga.xcscheme</key>
128 128
		<dict>
129 129
			<key>orderHint</key>
130
			<integer>31</integer>
130
			<integer>37</integer>
131 131
		</dict>
132 132
	</dict>
133 133
	<key>SuppressBuildableAutocreation</key>

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

@ -1,8 +1,8 @@
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"/>-->
@ -10,8 +10,8 @@
10 10
11 11
    <!--lfl-->
12 12
<!--    <config name="request_host" value="http://192.168.31.239:8080"/>-->
13
<!--    <config name="request_host" value="http://172.20.10.4:8080"/>-->
14
<!--    <config name="request_path" value="/show"/>-->
13
    <config name="request_host" value="http://172.20.10.4:8080"/>
14
    <config name="request_path" value="/show"/>
15 15
16 16
    <config name="request_servlet" value="/mobiledata"/>
17 17
    <config name="loading_page" value="Res/local/welcome.html"/>

+ 40 - 40
display-center/display-center.xcodeproj/project.pbxproj

@ -94,44 +94,44 @@
94 94
/* End PBXBuildFile section */
95 95
96 96
/* Begin PBXContainerItemProxy section */
97
		04627EDD2238B48F0083A956 /* PBXContainerItemProxy */ = {
97
		047730B5223F9C6B00709882 /* PBXContainerItemProxy */ = {
98 98
			isa = PBXContainerItemProxy;
99
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
99
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
100 100
			proxyType = 2;
101 101
			remoteGlobalIDString = 614A1CD61B2142130099793B;
102 102
			remoteInfo = WadeMobile;
103 103
		};
104
		04627EDF2238B48F0083A956 /* PBXContainerItemProxy */ = {
104
		047730B7223F9C6B00709882 /* PBXContainerItemProxy */ = {
105 105
			isa = PBXContainerItemProxy;
106
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
106
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
107 107
			proxyType = 2;
108 108
			remoteGlobalIDString = 614A1CE11B2142130099793B;
109 109
			remoteInfo = WadeMobileTests;
110 110
		};
111
		04627EE12238B48F0083A956 /* PBXContainerItemProxy */ = {
111
		047730B9223F9C6B00709882 /* PBXContainerItemProxy */ = {
112 112
			isa = PBXContainerItemProxy;
113
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
113
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
114 114
			proxyType = 2;
115 115
			remoteGlobalIDString = E2D93A741B89BA2800D1DE7C;
116 116
			remoteInfo = WadeMobileBundle;
117 117
		};
118
		04627EE32238B48F0083A956 /* PBXContainerItemProxy */ = {
118
		047730BB223F9C6B00709882 /* PBXContainerItemProxy */ = {
119 119
			isa = PBXContainerItemProxy;
120
			containerPortal = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
120
			containerPortal = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
121 121
			proxyType = 2;
122 122
			remoteGlobalIDString = 0A791C221FD102C0003CD586;
123 123
			remoteInfo = WadeMobileTestUnit;
124 124
		};
125
		04627EEC2238B4A40083A956 /* PBXContainerItemProxy */ = {
125
		047730C4223F9C7500709882 /* PBXContainerItemProxy */ = {
126 126
			isa = PBXContainerItemProxy;
127
			containerPortal = 04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */;
127
			containerPortal = 047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */;
128 128
			proxyType = 2;
129 129
			remoteGlobalIDString = E2DE1AD41B42DD9500762141;
130 130
			remoteInfo = WadeMobileFunc;
131 131
		};
132
		04627EEE2238B4A40083A956 /* PBXContainerItemProxy */ = {
132
		047730C6223F9C7500709882 /* PBXContainerItemProxy */ = {
133 133
			isa = PBXContainerItemProxy;
134
			containerPortal = 04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */;
134
			containerPortal = 047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */;
135 135
			proxyType = 2;
136 136
			remoteGlobalIDString = 0AE1E0841C7EE95900FCCD24;
137 137
			remoteInfo = WadeMobileFuncTests;
@ -447,8 +447,8 @@
447 447
		0429A206218046E2003CEE83 /* WadeMobileFuncBundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = WadeMobileFuncBundle.bundle; path = ../IpuCommon/Frameworks/WadeMobileFuncBundle.bundle; sourceTree = "<group>"; };
448 448
		0429A2332180484E003CEE83 /* fontawesome-webfont.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "fontawesome-webfont.ttf"; path = "../IpuCommon/Frameworks/fontawesome-webfont.ttf"; sourceTree = "<group>"; };
449 449
		0460E86220AA9C1300CCFDA4 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
450
		04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobile.xcodeproj; path = ../../ios/WadeMobile/WadeMobile.xcodeproj; sourceTree = "<group>"; };
451
		04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobileFunc.xcodeproj; path = ../WadeMobileFunc/WadeMobileFunc.xcodeproj; sourceTree = "<group>"; };
450
		047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobile.xcodeproj; path = ../../ios/WadeMobile/WadeMobile.xcodeproj; sourceTree = "<group>"; };
451
		047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobileFunc.xcodeproj; path = ../WadeMobileFunc/WadeMobileFunc.xcodeproj; sourceTree = "<group>"; };
452 452
		B247A76B20E0D33A00117A38 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
453 453
		B247A76D20E0D34100117A38 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
454 454
		B247A76F20E0D34700117A38 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@ -620,22 +620,22 @@
620 620
			name = Frameworks;
621 621
			sourceTree = "<group>";
622 622
		};
623
		04627EAD2238B48E0083A956 /* Products */ = {
623
		047730AD223F9C6B00709882 /* Products */ = {
624 624
			isa = PBXGroup;
625 625
			children = (
626
				04627EDE2238B48F0083A956 /* WadeMobile.framework */,
627
				04627EE02238B48F0083A956 /* WadeMobileTests.xctest */,
628
				04627EE22238B48F0083A956 /* WadeMobileBundle.bundle */,
629
				04627EE42238B48F0083A956 /* WadeMobileTestUnit.xctest */,
626
				047730B6223F9C6B00709882 /* WadeMobile.framework */,
627
				047730B8223F9C6B00709882 /* WadeMobileTests.xctest */,
628
				047730BA223F9C6B00709882 /* WadeMobileBundle.bundle */,
629
				047730BC223F9C6B00709882 /* WadeMobileTestUnit.xctest */,
630 630
			);
631 631
			name = Products;
632 632
			sourceTree = "<group>";
633 633
		};
634
		04627EE62238B4A40083A956 /* Products */ = {
634
		047730BE223F9C7500709882 /* Products */ = {
635 635
			isa = PBXGroup;
636 636
			children = (
637
				04627EED2238B4A40083A956 /* WadeMobileFunc.framework */,
638
				04627EEF2238B4A40083A956 /* WadeMobileFuncTests.xctest */,
637
				047730C5223F9C7500709882 /* WadeMobileFunc.framework */,
638
				047730C7223F9C7500709882 /* WadeMobileFuncTests.xctest */,
639 639
			);
640 640
			name = Products;
641 641
			sourceTree = "<group>";
@ -865,8 +865,8 @@
865 865
		EA8712331ECD8B580045E19A = {
866 866
			isa = PBXGroup;
867 867
			children = (
868
				04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */,
869
				04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */,
868
				047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */,
869
				047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */,
870 870
				B2E563B921E5E07A00B67E21 /* mapapi.bundle */,
871 871
				B2E5637921E4A39E00B67E21 /* BDMapLibs */,
872 872
				B2E563A821E4A39E00B67E21 /* IpuBDMap */,
@ -1038,12 +1038,12 @@
1038 1038
					ProjectRef = B2FC4AD52191392D008F7621 /* RNCamera.xcodeproj */;
1039 1039
				},
1040 1040
				{
1041
					ProductGroup = 04627EAD2238B48E0083A956 /* Products */;
1042
					ProjectRef = 04627EAC2238B48E0083A956 /* WadeMobile.xcodeproj */;
1041
					ProductGroup = 047730AD223F9C6B00709882 /* Products */;
1042
					ProjectRef = 047730AC223F9C6B00709882 /* WadeMobile.xcodeproj */;
1043 1043
				},
1044 1044
				{
1045
					ProductGroup = 04627EE62238B4A40083A956 /* Products */;
1046
					ProjectRef = 04627EE52238B4A40083A956 /* WadeMobileFunc.xcodeproj */;
1045
					ProductGroup = 047730BE223F9C7500709882 /* Products */;
1046
					ProjectRef = 047730BD223F9C7500709882 /* WadeMobileFunc.xcodeproj */;
1047 1047
				},
1048 1048
			);
1049 1049
			projectRoot = "";
@ -1054,46 +1054,46 @@
1054 1054
/* End PBXProject section */
1055 1055
1056 1056
/* Begin PBXReferenceProxy section */
1057
		04627EDE2238B48F0083A956 /* WadeMobile.framework */ = {
1057
		047730B6223F9C6B00709882 /* WadeMobile.framework */ = {
1058 1058
			isa = PBXReferenceProxy;
1059 1059
			fileType = wrapper.framework;
1060 1060
			path = WadeMobile.framework;
1061
			remoteRef = 04627EDD2238B48F0083A956 /* PBXContainerItemProxy */;
1061
			remoteRef = 047730B5223F9C6B00709882 /* PBXContainerItemProxy */;
1062 1062
			sourceTree = BUILT_PRODUCTS_DIR;
1063 1063
		};
1064
		04627EE02238B48F0083A956 /* WadeMobileTests.xctest */ = {
1064
		047730B8223F9C6B00709882 /* WadeMobileTests.xctest */ = {
1065 1065
			isa = PBXReferenceProxy;
1066 1066
			fileType = wrapper.cfbundle;
1067 1067
			path = WadeMobileTests.xctest;
1068
			remoteRef = 04627EDF2238B48F0083A956 /* PBXContainerItemProxy */;
1068
			remoteRef = 047730B7223F9C6B00709882 /* PBXContainerItemProxy */;
1069 1069
			sourceTree = BUILT_PRODUCTS_DIR;
1070 1070
		};
1071
		04627EE22238B48F0083A956 /* WadeMobileBundle.bundle */ = {
1071
		047730BA223F9C6B00709882 /* WadeMobileBundle.bundle */ = {
1072 1072
			isa = PBXReferenceProxy;
1073 1073
			fileType = wrapper.cfbundle;
1074 1074
			path = WadeMobileBundle.bundle;
1075
			remoteRef = 04627EE12238B48F0083A956 /* PBXContainerItemProxy */;
1075
			remoteRef = 047730B9223F9C6B00709882 /* PBXContainerItemProxy */;
1076 1076
			sourceTree = BUILT_PRODUCTS_DIR;
1077 1077
		};
1078
		04627EE42238B48F0083A956 /* WadeMobileTestUnit.xctest */ = {
1078
		047730BC223F9C6B00709882 /* WadeMobileTestUnit.xctest */ = {
1079 1079
			isa = PBXReferenceProxy;
1080 1080
			fileType = wrapper.cfbundle;
1081 1081
			path = WadeMobileTestUnit.xctest;
1082
			remoteRef = 04627EE32238B48F0083A956 /* PBXContainerItemProxy */;
1082
			remoteRef = 047730BB223F9C6B00709882 /* PBXContainerItemProxy */;
1083 1083
			sourceTree = BUILT_PRODUCTS_DIR;
1084 1084
		};
1085
		04627EED2238B4A40083A956 /* WadeMobileFunc.framework */ = {
1085
		047730C5223F9C7500709882 /* WadeMobileFunc.framework */ = {
1086 1086
			isa = PBXReferenceProxy;
1087 1087
			fileType = wrapper.framework;
1088 1088
			path = WadeMobileFunc.framework;
1089
			remoteRef = 04627EEC2238B4A40083A956 /* PBXContainerItemProxy */;
1089
			remoteRef = 047730C4223F9C7500709882 /* PBXContainerItemProxy */;
1090 1090
			sourceTree = BUILT_PRODUCTS_DIR;
1091 1091
		};
1092
		04627EEF2238B4A40083A956 /* WadeMobileFuncTests.xctest */ = {
1092
		047730C7223F9C7500709882 /* WadeMobileFuncTests.xctest */ = {
1093 1093
			isa = PBXReferenceProxy;
1094 1094
			fileType = wrapper.cfbundle;
1095 1095
			path = WadeMobileFuncTests.xctest;
1096
			remoteRef = 04627EEE2238B4A40083A956 /* PBXContainerItemProxy */;
1096
			remoteRef = 047730C6223F9C7500709882 /* PBXContainerItemProxy */;
1097 1097
			sourceTree = BUILT_PRODUCTS_DIR;
1098 1098
		};
1099 1099
		B25B8FE021901B0C001A240E /* libRCTWebSocket.a */ = {

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


+ 7 - 23
display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -136,7 +136,7 @@
136 136
            ignoreCount = "0"
137 137
            continueAfterRunningActions = "No"
138 138
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
139
            timestampString = "557052540.358753"
139
            timestampString = "574603983.712311"
140 140
            startingColumnNumber = "9223372036854775807"
141 141
            endingColumnNumber = "9223372036854775807"
142 142
            startingLineNumber = "206"
@ -567,30 +567,14 @@
567 567
            shouldBeEnabled = "Yes"
568 568
            ignoreCount = "0"
569 569
            continueAfterRunningActions = "No"
570
            filePath = "display-center/ViewController.m"
571
            timestampString = "574149683.094046"
570
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/WDTemplateNavigateController.m"
571
            timestampString = "574654776.2638479"
572 572
            startingColumnNumber = "9223372036854775807"
573 573
            endingColumnNumber = "9223372036854775807"
574
            startingLineNumber = "85"
575
            endingLineNumber = "85"
576
            landmarkName = "-back"
577
            landmarkType = "7">
578
         </BreakpointContent>
579
      </BreakpointProxy>
580
      <BreakpointProxy
581
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
582
         <BreakpointContent
583
            shouldBeEnabled = "Yes"
584
            ignoreCount = "0"
585
            continueAfterRunningActions = "No"
586
            filePath = "display-center/ViewController.m"
587
            timestampString = "574149683.094344"
588
            startingColumnNumber = "9223372036854775807"
589
            endingColumnNumber = "9223372036854775807"
590
            startingLineNumber = "87"
591
            endingLineNumber = "87"
592
            landmarkName = "-back"
593
            landmarkType = "7">
574
            startingLineNumber = "242"
575
            endingLineNumber = "242"
576
            landmarkName = "WDTemplateNavigateController"
577
            landmarkType = "3">
594 578
         </BreakpointContent>
595 579
      </BreakpointProxy>
596 580
   </Breakpoints>

+ 8 - 7
display-center/display-center/ViewController.m

@ -17,6 +17,13 @@
17 17
#import <IpuRNKit/IpuRNViewControllerUtil.h>
18 18
#import <IpuRNKit/IpuRNBaseViewController.h>
19 19
20
#import <WadeMobile/WDTemplateNavigateController.h>
21
22
#define ButtonWH 40
23
#define Padding 5
24
#define ScreenWidth  CGRectGetWidth([UIScreen mainScreen].bounds)
25
#define ScreenHeight CGRectGetHeight([UIScreen mainScreen].bounds)
26
20 27
@interface ViewController ()
21 28
22 29
@property(nonatomic,strong)IPUDragButton *dragButton;
@ -27,18 +34,12 @@
27 34
28 35
- (void)viewDidLoad {
29 36
    [super viewDidLoad];
30
    
31
    self.dragButton = [IPUDragButton sharedButton];
37
    self.dragButton = [[IPUDragButton alloc] initWithFrame:CGRectMake(ScreenWidth-Padding-ButtonWH, ScreenHeight-3*ButtonWH, ButtonWH, ButtonWH)];
32 38
    [self.dragButton addTarget:self action:@selector(back) forControlEvents:UIControlEventTouchUpInside];
33 39
    [self.view addSubview:self.dragButton];
34
    
35 40
    //    [IpuRNManager updateRNResource];
36 41
}
37 42
38
- (void)viewDidAppear:(BOOL)animated {
39
    [super viewDidAppear:animated];
40
}
41
42 43
/*
43 44
 悬浮按钮返回事件
44 45
 */