Browse Source

规范代码,防止空指针及数组越界异常

liufl5 6 years ago
parent
commit
e405b070ed
41 changed files with 635 additions and 210 deletions
  1. 13 0
      SuperMenu/Res/local/biz/css/welcome.css
  2. 0 0
      SuperMenu/Res/local/biz/img/welcome.png
  3. 78 0
      SuperMenu/Res/local/css/welcome.css
  4. BIN
      SuperMenu/Res/local/img/logo.png
  5. BIN
      SuperMenu/Res/local/img/welcome.png
  6. 16 8
      SuperMenu/Res/local/welcome.html
  7. 0 0
      SuperMenu/Res/local1/css/hum.css
  8. 0 0
      SuperMenu/Res/local1/css/project.css
  9. 15 0
      SuperMenu/Res/local1/welcome.html
  10. BIN
      SuperMenu/Res/local1/welcome.png
  11. BIN
      SuperMenu/SuperMenu.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  12. 15 63
      SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  13. 1 1
      SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  14. 1 1
      SuperMenu/SuperMenu/Info.plist
  15. 3 3
      WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  16. 1 1
      WadeMobileFunc/WadeMobileFunc/WDFMobileContacts.m
  17. 30 0
      WadeMobileFunc/WadeMobileFunc/WDFMobileDatabase.m
  18. 56 11
      WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m
  19. 8 2
      WadeMobileFunc/WadeMobileFunc/WDFUploadDownload.m
  20. 1 1
      display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  21. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  22. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  23. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  24. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  25. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  26. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  27. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  28. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  29. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  30. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/PushNotificationIOS/RCTPushNotification.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. 7 7
      display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  35. 31 26
      display-center/Res/config/count-config.xml
  36. 4 4
      display-center/Res/config/mobile-config.xml
  37. 0 47
      display-center/Res/count-config.xml
  38. 116 4
      display-center/display-center.xcodeproj/project.pbxproj
  39. BIN
      display-center/display-center.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  40. 224 16
      display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  41. 1 1
      display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

+ 13 - 0
SuperMenu/Res/local/biz/css/welcome.css

@ -0,0 +1,13 @@
1
@charset "utf-8";
2
html, body{
3
  margin: 0;
4
  padding: 0;
5
  border: 0;
6
  height: 100%;
7
  width: 100%;
8
  overflow: hidden;
9
}
10
.page-welcome, .page-welcome img{
11
  height: 100%;
12
  width: 100%;
13
}

SuperMenu/Res/local/welcome.png → SuperMenu/Res/local/biz/img/welcome.png


+ 78 - 0
SuperMenu/Res/local/css/welcome.css

@ -0,0 +1,78 @@
1
html {
2
  font-size: 85.33333px;
3
}
4
5
@media screen and (min-width: 320px) and (max-width: 960px) {
6
  html {
7
    font-size: 26.66667vw;
8
  }
9
}
10
11
@media screen and (min-width: 640px) {
12
  html {
13
    font-size: 170.66667px;
14
  }
15
}
16
17
html,
18
body,
19
.welcome-info,
20
.welcome-img {
21
  padding: 0;
22
  margin: 0;
23
  position: relative;
24
  display: block;
25
  width: 100%;
26
  height: 100%;
27
  overflow: auto;
28
}
29
30
body {
31
  font-family: Arial, Helvetica, sans-serif;
32
  font-size: .15rem;
33
  background-color: #fff;
34
}
35
.logo {
36
  margin: .27rem .27rem 0;
37
  height: .31rem;
38
  background: url("../img/logo.png") no-repeat left center;
39
  background-size: .89rem auto;
40
}
41
42
.welcome-img {
43
  margin: 1rem .275rem 0;
44
  width: auto;
45
  height: 3.95rem;
46
  background: url("../img/welcome.png") no-repeat center center;
47
  background-size: 3.16rem auto;
48
}
49
50
.copyright {
51
  margin-top: .4rem;
52
  font-size: .16rem;
53
  color: #000;
54
  text-align: center;
55
}
56
/* 宽度为360时,高度小于650时,生效 */
57
/* 屏幕比大于这个值时,生效,这时屏幕显得宽  */
58
@media screen and (min-device-aspect-ratio: 360/640){ /*  .5625 */
59
  .welcome-img {
60
   margin-top: .6rem;
61
  }
62
  .copyright {
63
    margin-top: .3rem;
64
  }
65
}
66
/* 宽度为375时,高度大于700时,生效 */
67
/* 屏幕比小于这个值时,生效,这时屏幕显得长  */
68
@media screen and (max-device-aspect-ratio: 375/700){  /*  .5367  */
69
  .logo {
70
    margin-top: .5rem;
71
  }
72
  .welcome-img {
73
    margin-top: 1.2rem;
74
  }
75
  .copyright {
76
    margin-top: .7rem;
77
  }
78
}

BIN
SuperMenu/Res/local/img/logo.png


BIN
SuperMenu/Res/local/img/welcome.png


+ 16 - 8
SuperMenu/Res/local/welcome.html

@ -1,15 +1,23 @@
1
<!DOCTYPE html>
1
<!doctype html>
2 2
<html>
3 3
<head>
4
    <meta charset="utf-8">
5
    <title>欢迎页面</title>
6
    <meta name="viewport"
7
          content="width=device-width, initial-scale=1.0,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
8
    <link rel="stylesheet" type="text/css" href="./css/hum.css">
9
    <link rel="stylesheet" type="text/css" href="./css/project.css">
4
  <title>welcome</title>
5
6
  <meta charset="utf-8">
7
  <meta name="viewport"
8
        content="width=device-width, initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0, user-scalable=no"/>
9
  <!-- 宽度自动适配 -->
10
  <meta content="telephone=no" name="format-detection"/> <!-- 不识别页面上的数字为可拨打号码 -->
11
  <link rel="stylesheet" type="text/css" href="css/welcome.css">
10 12
</head>
11 13
<body>
12
<div class="page-welcome">
14
<div class="welcome-info">
15
  <div class="logo"></div>
16
  <div class="welcome-img">
17
  </div>
18
  <div class="copyright">
19
    中国移动通信集团版权所有
20
  </div>
13 21
</div>
14 22
</body>
15 23
</html>

SuperMenu/Res/local/css/hum.css → SuperMenu/Res/local1/css/hum.css


SuperMenu/Res/local/css/project.css → SuperMenu/Res/local1/css/project.css


+ 15 - 0
SuperMenu/Res/local1/welcome.html

@ -0,0 +1,15 @@
1
<!DOCTYPE html>
2
<html>
3
<head>
4
    <meta charset="utf-8">
5
    <title>欢迎页面</title>
6
    <meta name="viewport"
7
          content="width=device-width, initial-scale=1.0,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
8
    <link rel="stylesheet" type="text/css" href="./css/hum.css">
9
    <link rel="stylesheet" type="text/css" href="./css/project.css">
10
</head>
11
<body>
12
<div class="page-welcome">
13
</div>
14
</body>
15
</html>

BIN
SuperMenu/Res/local1/welcome.png


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


+ 15 - 63
SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -26,7 +26,7 @@
26 26
            ignoreCount = "0"
27 27
            continueAfterRunningActions = "No"
28 28
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
29
            timestampString = "563173238.047488"
29
            timestampString = "563856473.537748"
30 30
            startingColumnNumber = "9223372036854775807"
31 31
            endingColumnNumber = "9223372036854775807"
32 32
            startingLineNumber = "142"
@ -42,7 +42,7 @@
42 42
            ignoreCount = "0"
43 43
            continueAfterRunningActions = "No"
44 44
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
45
            timestampString = "563173238.047769"
45
            timestampString = "563856473.537817"
46 46
            startingColumnNumber = "9223372036854775807"
47 47
            endingColumnNumber = "9223372036854775807"
48 48
            startingLineNumber = "154"
@ -58,7 +58,7 @@
58 58
            ignoreCount = "0"
59 59
            continueAfterRunningActions = "No"
60 60
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
61
            timestampString = "563173238.04803"
61
            timestampString = "563856473.537866"
62 62
            startingColumnNumber = "9223372036854775807"
63 63
            endingColumnNumber = "9223372036854775807"
64 64
            startingLineNumber = "181"
@ -74,7 +74,7 @@
74 74
            ignoreCount = "0"
75 75
            continueAfterRunningActions = "No"
76 76
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
77
            timestampString = "563173238.048281"
77
            timestampString = "563856473.537909"
78 78
            startingColumnNumber = "9223372036854775807"
79 79
            endingColumnNumber = "9223372036854775807"
80 80
            startingLineNumber = "189"
@ -90,7 +90,7 @@
90 90
            ignoreCount = "0"
91 91
            continueAfterRunningActions = "No"
92 92
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
93
            timestampString = "563173238.048528"
93
            timestampString = "563856473.537951"
94 94
            startingColumnNumber = "9223372036854775807"
95 95
            endingColumnNumber = "9223372036854775807"
96 96
            startingLineNumber = "203"
@ -106,7 +106,7 @@
106 106
            ignoreCount = "0"
107 107
            continueAfterRunningActions = "No"
108 108
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
109
            timestampString = "563173238.048772"
109
            timestampString = "563856473.537991"
110 110
            startingColumnNumber = "9223372036854775807"
111 111
            endingColumnNumber = "9223372036854775807"
112 112
            startingLineNumber = "229"
@ -122,7 +122,7 @@
122 122
            ignoreCount = "0"
123 123
            continueAfterRunningActions = "No"
124 124
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
125
            timestampString = "563173238.049022"
125
            timestampString = "563856473.538031"
126 126
            startingColumnNumber = "9223372036854775807"
127 127
            endingColumnNumber = "9223372036854775807"
128 128
            startingLineNumber = "263"
@ -138,7 +138,7 @@
138 138
            ignoreCount = "0"
139 139
            continueAfterRunningActions = "No"
140 140
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
141
            timestampString = "563173238.049268"
141
            timestampString = "563856473.538071"
142 142
            startingColumnNumber = "9223372036854775807"
143 143
            endingColumnNumber = "9223372036854775807"
144 144
            startingLineNumber = "272"
@ -154,12 +154,12 @@
154 154
                  moduleName = "SuperMenu"
155 155
                  usesParentBreakpointCondition = "Yes"
156 156
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
157
                  timestampString = "563173238.258345"
157
                  timestampString = "563857459.106406"
158 158
                  startingColumnNumber = "9223372036854775807"
159 159
                  endingColumnNumber = "9223372036854775807"
160 160
                  startingLineNumber = "272"
161 161
                  endingLineNumber = "272"
162
                  offsetFromSymbolStart = "60">
162
                  offsetFromSymbolStart = "39">
163 163
               </Location>
164 164
               <Location
165 165
                  shouldBeEnabled = "Yes"
@ -169,12 +169,12 @@
169 169
                  moduleName = "SuperMenu"
170 170
                  usesParentBreakpointCondition = "Yes"
171 171
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/SuperMenu/SuperMenu/multiple/AppManagePlugin.m"
172
                  timestampString = "563173238.2600369"
172
                  timestampString = "563857459.108134"
173 173
                  startingColumnNumber = "9223372036854775807"
174 174
                  endingColumnNumber = "9223372036854775807"
175 175
                  startingLineNumber = "274"
176 176
                  endingLineNumber = "274"
177
                  offsetFromSymbolStart = "72">
177
                  offsetFromSymbolStart = "69">
178 178
               </Location>
179 179
            </Locations>
180 180
         </BreakpointContent>
@ -218,7 +218,7 @@
218 218
            ignoreCount = "0"
219 219
            continueAfterRunningActions = "No"
220 220
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
221
            timestampString = "563173238.049597"
221
            timestampString = "563856473.5381581"
222 222
            startingColumnNumber = "9223372036854775807"
223 223
            endingColumnNumber = "9223372036854775807"
224 224
            startingLineNumber = "79"
@ -474,7 +474,7 @@
474 474
            ignoreCount = "0"
475 475
            continueAfterRunningActions = "No"
476 476
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
477
            timestampString = "563173238.05036"
477
            timestampString = "563856473.538385"
478 478
            startingColumnNumber = "9223372036854775807"
479 479
            endingColumnNumber = "9223372036854775807"
480 480
            startingLineNumber = "215"
@ -769,38 +769,6 @@
769 769
            endingLineNumber = "42"
770 770
            landmarkName = "-doTask:"
771 771
            landmarkType = "7">
772
            <Locations>
773
               <Location
774
                  shouldBeEnabled = "Yes"
775
                  ignoreCount = "0"
776
                  continueAfterRunningActions = "No"
777
                  symbolName = "__21-[LoadFKTask doTask:]_block_invoke"
778
                  moduleName = "WadeMobile"
779
                  usesParentBreakpointCondition = "Yes"
780
                  urlString = "file:///Users/mac/work/asiainfo/ios/WadeMobile/WadeMobile/frame/task/LoadFKTask.m"
781
                  timestampString = "563173238.530953"
782
                  startingColumnNumber = "9223372036854775807"
783
                  endingColumnNumber = "9223372036854775807"
784
                  startingLineNumber = "43"
785
                  endingLineNumber = "43"
786
                  offsetFromSymbolStart = "440">
787
               </Location>
788
               <Location
789
                  shouldBeEnabled = "Yes"
790
                  ignoreCount = "0"
791
                  continueAfterRunningActions = "No"
792
                  symbolName = "__copy_helper_block_"
793
                  moduleName = "WadeMobile"
794
                  usesParentBreakpointCondition = "Yes"
795
                  urlString = "file:///Users/mac/work/asiainfo/ios/WadeMobile/WadeMobile/frame/task/LoadFKTask.m"
796
                  timestampString = "563173238.532867"
797
                  startingColumnNumber = "9223372036854775807"
798
                  endingColumnNumber = "9223372036854775807"
799
                  startingLineNumber = "25"
800
                  endingLineNumber = "25"
801
                  offsetFromSymbolStart = "24">
802
               </Location>
803
            </Locations>
804 772
         </BreakpointContent>
805 773
      </BreakpointProxy>
806 774
      <BreakpointProxy
@ -890,7 +858,7 @@
890 858
            ignoreCount = "0"
891 859
            continueAfterRunningActions = "No"
892 860
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
893
            timestampString = "563173238.051544"
861
            timestampString = "563856473.538676"
894 862
            startingColumnNumber = "9223372036854775807"
895 863
            endingColumnNumber = "9223372036854775807"
896 864
            startingLineNumber = "133"
@ -899,21 +867,5 @@
899 867
            landmarkType = "7">
900 868
         </BreakpointContent>
901 869
      </BreakpointProxy>
902
      <BreakpointProxy
903
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
904
         <BreakpointContent
905
            shouldBeEnabled = "Yes"
906
            ignoreCount = "0"
907
            continueAfterRunningActions = "No"
908
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
909
            timestampString = "563177261.802665"
910
            startingColumnNumber = "9223372036854775807"
911
            endingColumnNumber = "9223372036854775807"
912
            startingLineNumber = "70"
913
            endingLineNumber = "70"
914
            landmarkName = "-initAppConfig:"
915
            landmarkType = "7">
916
         </BreakpointContent>
917
      </BreakpointProxy>
918 870
   </Breakpoints>
919 871
</Bucket>

+ 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>3</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>2.2</string>
20
	<string>1.0.4</string>
21 21
	<key>CFBundleSignature</key>
22 22
	<string>????</string>
23 23
	<key>CFBundleVersion</key>

+ 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>24</integer>
10
			<integer>50</integer>
11 11
		</dict>
12 12
		<key>WadeMobileFunc4Appstore.xcscheme</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>26</integer>
15
			<integer>52</integer>
16 16
		</dict>
17 17
		<key>WadeMobileFuncAggregate.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>25</integer>
20
			<integer>51</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

+ 1 - 1
WadeMobileFunc/WadeMobileFunc/WDFMobileContacts.m

@ -26,7 +26,7 @@
26 26
 * 对应JS接口: Mobile.getContacts:function(callback,err)
27 27
 */
28 28
- (void)getContacts:(NSArray *)param {
29
    if (param && param.count) {
29
    if (param && param.count>0) {
30 30
        self.access = [param[0] boolValue];
31 31
    }
32 32
    [self getContacts];

+ 30 - 0
WadeMobileFunc/WadeMobileFunc/WDFMobileDatabase.m

@ -20,6 +20,12 @@
20 20
 * 对应JS接口: Mobile.execSQL:function(dbName,sql,bindArgs,limit,offset,callback,err)
21 21
 */
22 22
- (void)execSql:(NSArray *)args {
23
    if (!args) {
24
        return;
25
    }
26
    if (args.count<5) {
27
        return;
28
    }
23 29
    // 1.获取参数
24 30
    NSDictionary *params = nil;
25 31
    @try {
@ -106,6 +112,12 @@
106 112
 * 对应JS接口: Mobile.insert:function(dbName,table,datas,callback,err)
107 113
 */
108 114
- (void)insertData:(NSArray *)args {
115
    if (!args) {
116
        return;
117
    }
118
    if (args.count<3) {
119
        return;
120
    }
109 121
    // 1.1.获取参数
110 122
    NSDictionary *params = nil;                      // 获取字段信息
111 123
    @try {
@ -172,6 +184,12 @@
172 184
 * 对应JS接口: Mobile.update:function(dbName,table,datas,condSQL,conds,callback,err)
173 185
 */
174 186
- (void)updateData:(NSArray *)args {
187
    if (!args) {
188
        return;
189
    }
190
    if (args.count<5) {
191
        return;
192
    }
175 193
    // 1.获取参数
176 194
    NSMutableDictionary *columns = nil;                      // 获取修改字段信息
177 195
    NSDictionary *params = nil;                     // 获取参数
@ -241,6 +259,12 @@
241 259
 * 对应JS接口: Mobile.delete:function(dbName,table,condSQL,conds,callback,err)
242 260
 */
243 261
- (void)deleteData:(NSArray *)args {
262
    if (!args) {
263
        return;
264
    }
265
    if (args.count<4) {
266
        return;
267
    }
244 268
    // 1.获取参数
245 269
    NSDictionary *params = nil;
246 270
    @try {
@ -299,6 +323,12 @@
299 323
 * 对应JS接口: Mobile.select:function(dbName,table,columns,condSQL,conds,limit,offset,callback,err)
300 324
 */
301 325
- (void)selectData:(NSArray *)args {
326
    if (!args) {
327
        return;
328
    }
329
    if (args.count<7) {
330
        return;
331
    }
302 332
    // 1.1.获取参数:查询字段列
303 333
    NSArray *columns = args[2];
304 334
    if (![columns isKindOfClass:[NSArray class]]) {

+ 56 - 11
WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m

@ -44,7 +44,14 @@
44 44
 新webview中打开页面
45 45
 */
46 46
- (void)openNewPage:(NSArray *)param {
47
    NSString *pageAction = param[0];
47
    NSString *pageAction;
48
    if (param && param.count>0) {
49
        if (param[0] != [NSNull null]) {
50
            pageAction = param[0];
51
        }else{
52
            pageAction = nil;
53
        }
54
    }
48 55
    WDDataMap *pageParam = nil;
49 56
    if ([param count] > 1) {
50 57
        pageParam = [[WDDataMap alloc] initWithString:param[1]];
@ -83,7 +90,10 @@
83 90
 * @param : param 参数
84 91
 */
85 92
- (void)openDialog:(NSArray *)param {
86
    NSString *pageAction = param[0];
93
    NSString *pageAction;
94
    if (param && param.count>0) {
95
        pageAction = param[0];
96
    }
87 97
    WDDataMap *pageParam = nil;
88 98
    if ([param count] > 1) {
89 99
        if (nil == param[1] || [@"" isEqual:param[1]]) {
@ -93,8 +103,14 @@
93 103
        }
94 104
    }
95 105
    
96
    NSString *wRatio = [param[2] stringValue];
97
    NSString *hRatio = [param[3] stringValue];
106
    NSString *wRatio;
107
    NSString *hRatio;
108
    if (param && param.count>2) {
109
        wRatio = [param[2] stringValue];
110
    }
111
    if (param && param.count>3) {
112
        hRatio = [param[3] stringValue];
113
    }
98 114
    
99 115
    //展示视图
100 116
    [self openDialog:pageAction params:pageParam wRatio:wRatio hRatio:hRatio];
@ -138,7 +154,7 @@
138 154
    [dialog dismissViewControllerAnimated:YES completion:nil];
139 155
    WDPlugin *plugin = [dialog plugin];
140 156
    NSString *data = nil;
141
    if (param.count) {
157
    if (param && param.count>0) {
142 158
        data = param[0];
143 159
    }
144 160
    if(![[NSNull null] isEqual:data]){
@ -147,9 +163,14 @@
147 163
}
148 164
149 165
- (void)openBrowser:(NSArray *)param {
150
    NSString *url = param[0];
166
    NSString *url;
167
    if (param && param.count>0) {
168
        url = param[0];
169
    }
151 170
    //    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url] options:@{} completionHandler:nil];
152
    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]];
171
    if (url) {
172
        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]];
173
    }
153 174
}
154 175
155 176
- (void)openUrl111:(NSArray *)param {
@ -208,7 +229,10 @@
208 229
 * modify by kevin
209 230
 */
210 231
- (void) openTemplate:(NSArray*)param {
211
    NSString* pageAction = param[0];
232
    NSString* pageAction;
233
    if (param && param.count>0) {
234
        pageAction = param[0];
235
    }
212 236
    WDDataMap* pageParam = nil;
213 237
    if([param count] > 1 && ! [WDPlugin isNull:param[1]] && [WDStringUtility isDataMap:param[1]]){
214 238
        //        NSMutableDictionary* dict = [[NSMutableDictionary alloc]initWithDictionary:param[1]];
@ -260,7 +284,14 @@
260 284
}
261 285
262 286
- (void)getTemplate:(NSArray *)param {
263
    NSString *pageAction = param[0];
287
    NSString *pageAction;
288
    if (param && param.count>0) {
289
        if (param[0] != [NSNull null]) {
290
            pageAction = param[0];
291
        }else{
292
            pageAction = nil;
293
        }
294
    }
264 295
    WDDataMap *pageParam = nil;
265 296
    if ([param count] > 1) {
266 297
        pageParam = [[WDDataMap alloc] initWithString:param[1]];
@ -283,8 +314,22 @@
283 314
 * add by kevin
284 315
 */
285 316
- (void)openPage:(NSArray *)param {
286
    NSString *pageAction = param[0];
287
    NSString *dataParam = param[1];
317
    NSString *pageAction;
318
    if (param && param.count>0) {
319
        if (param[0]==[NSNull null]) {
320
            pageAction = nil;
321
        }else{
322
            pageAction = param[0];
323
        }
324
    }
325
    NSString *dataParam;
326
    if (param && param.count>1) {
327
        if (param[1]==[NSNull null]) {
328
            dataParam = nil;
329
        }else{
330
            dataParam = param[1];
331
        }
332
    }
288 333
    
289 334
    BOOL isCurr = NO;
290 335
    if ([param count] > 2 && param[2] != [NSNull null]) {

+ 8 - 2
WadeMobileFunc/WadeMobileFunc/WDFUploadDownload.m

@ -25,8 +25,14 @@
25 25
 * 对应JS接口: Mobile.uploadWithServlet:function(filePath,dataAction,param,callback,err)
26 26
 */
27 27
- (void)uploadWithServletByUnirest:(NSArray *)args {
28
    NSArray *filePaths = args[0];
29
    NSString *dataAction = args[1];
28
    NSArray *filePaths;
29
    if (args && args.count>0) {
30
        filePaths = args[0];
31
    }
32
    NSString *dataAction;
33
    if (args && args.count>1) {
34
        dataAction = args[1];
35
    }
30 36
    NSDictionary *params = nil;
31 37
    @try {
32 38
        params = [WDJsonHelper toDictionary:args[2]];

+ 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>29</integer>
10
			<integer>24</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>32</integer>
20
			<integer>25</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -7,7 +7,7 @@
7 7
		<key>RCTActionSheet.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>33</integer>
10
			<integer>23</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</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>35</integer>
20
			<integer>28</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>36</integer>
10
			<integer>29</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>37</integer>
10
			<integer>30</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>38</integer>
20
			<integer>31</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>39</integer>
20
			<integer>32</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>46</integer>
20
			<integer>40</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>47</integer>
20
			<integer>41</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -17,7 +17,7 @@
17 17
		<key>RCTPushNotification.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>48</integer>
20
			<integer>42</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>49</integer>
20
			<integer>43</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>50</integer>
10
			<integer>44</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>51</integer>
20
			<integer>45</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>52</integer>
35
			<integer>38</integer>
36 36
		</dict>
37 37
	</dict>
38 38
</dict>

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

@ -37,7 +37,7 @@
37 37
		<key>cxxreact.xcscheme</key>
38 38
		<dict>
39 39
			<key>orderHint</key>
40
			<integer>34</integer>
40
			<integer>27</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>41</integer>
55
			<integer>34</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>42</integer>
70
			<integer>35</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>43</integer>
85
			<integer>36</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>45</integer>
100
			<integer>39</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>44</integer>
115
			<integer>37</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>40</integer>
130
			<integer>33</integer>
131 131
		</dict>
132 132
	</dict>
133 133
</dict>

+ 31 - 26
display-center/Res/config/count-config.xml

@ -2,6 +2,12 @@
2 2
<config>
3 3
    
4 4
    
5
    <monitor class="IpuPluginMonitor">
6
        <count class="WDPlugin">
7
            <method>executeJs:</method>
8
            <method>callback:</method>
9
        </count>
10
    </monitor>
5 11
    
6 12
    
7 13
    
@ -9,32 +15,31 @@
9 15
    
10 16
    
11 17
    
12
    
13
    <monitor class="com.ai.ipu.count.monitor.impl.IpuPageMonitor">
14
        <count class="com.wade.mobile.func.MobileUI">
15
            <method>openPage</method>
16
            <method>openTemplate</method>
17
        </count>
18
    </monitor>
19
    
20
    <monitor class="com.ai.ipu.count.monitor.impl.IpuScanMonitor">
21
        <count class="com.ai.ipu.scan.func.IpuScan">
22
            <method>scanSingle</method>
23
        </count>
24
    </monitor>
25
    
26
    <monitor class="com.ai.ipu.count.monitor.impl.IpuPluginMonitor">
27
        <count class="com.wade.mobile.frame.plugin.PluginManager">
28
            <method>execute</methoxxd>
29
        </count>
30
    </monitor>
31
    
32
     <monitor class="com.ai.ipu.count.monitor.impl.IpuDataMonitor">
33
        <count class="com.wade.mobile.func.MobileNetWork">
34
           	<method>dataRequest</method>
35
        </count>
36
    </monitor>
37
     
18
<!--    <monitor class="com.ai.ipu.count.monitor.impl.IpuPageMonitor">-->
19
<!--        <count class="com.wade.mobile.func.MobileUI">-->
20
<!--            <method>openPage</method>-->
21
<!--            <method>openTemplate</method>-->
22
<!--        </count>-->
23
<!--    </monitor>-->
24
<!--    -->
25
<!--    <monitor class="com.ai.ipu.count.monitor.impl.IpuScanMonitor">-->
26
<!--        <count class="com.ai.ipu.scan.func.IpuScan">-->
27
<!--            <method>scanSingle</method>-->
28
<!--        </count>-->
29
<!--    </monitor>-->
30
<!--    -->
31
<!--    <monitor class="com.ai.ipu.count.monitor.impl.IpuPluginMonitor">-->
32
<!--        <count class="com.wade.mobile.frame.plugin.PluginManager">-->
33
<!--            <method>execute</method>-->
34
<!--        </count>-->
35
<!--    </monitor>-->
36
<!--    -->
37
<!--    <monitor class="com.ai.ipu.count.monitor.impl.IpuDataMonitor">-->
38
<!--        <count class="com.wade.mobile.func.MobileNetWork">-->
39
<!--               <method>dataRequest</method>-->
40
<!--        </count>-->
41
<!--    </monitor>-->
42
38 43
     
39 44
     
40 45
     

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

@ -2,8 +2,8 @@
2 2
<configs>
3 3
    <!--lfl-->
4 4
<!--    <config name="res_host" value="http://192.168.31.239:8080/res"/>-->
5
<!--    <config name="request_host" value="http://192.168.31.239:8080"/>-->
6
<!--    <config name="request_path" value="/show"/>-->
5
    <config name="request_host" value="http://192.168.31.239:8080"/>
6
    <config name="request_path" value="/show"/>
7 7
8 8
<!--    <config name="request_host" value="http://172.20.10.4:8080"/>-->
9 9
<!--    <config name="request_path" value="/show"/>-->
@ -14,8 +14,8 @@
14 14
<!--    <config name="res_host"     value="10.13.10.135:8080"/>-->
15 15
<!--    <config name="request_path" value="/show-server"/>-->
16 16
17
    <config name="request_host" value="http://www.aiipu.com:8083"/>
18
    <config name="request_path" value="/show"/>
17
<!--    <config name="request_host" value="http://www.aiipu.com:8083"/>-->
18
<!--    <config name="request_path" value="/show"/>-->
19 19
20 20
    <config name="request_servlet" value="/mobiledata"/>
21 21
    <config name="loading_page" value="Res/local/welcome.html"/>

+ 0 - 47
display-center/Res/count-config.xml

@ -1,47 +0,0 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<config>
3
    
4
    
5
    <monitor class="IpuPluginMonitor">
6
        <count class="WDPlugin">
7
            <method>executeJs:</method>
8
            <method>callback:</method>
9
        </count>
10
    </monitor>
11
    
12
    
13
    
14
    
15
    
16
    
17
    
18
<!--    <monitor class="com.ai.ipu.count.monitor.impl.IpuPageMonitor">-->
19
<!--        <count class="com.wade.mobile.func.MobileUI">-->
20
<!--            <method>openPage</method>-->
21
<!--            <method>openTemplate</method>-->
22
<!--        </count>-->
23
<!--    </monitor>-->
24
<!--    -->
25
<!--    <monitor class="com.ai.ipu.count.monitor.impl.IpuScanMonitor">-->
26
<!--        <count class="com.ai.ipu.scan.func.IpuScan">-->
27
<!--            <method>scanSingle</method>-->
28
<!--        </count>-->
29
<!--    </monitor>-->
30
<!--    -->
31
<!--    <monitor class="com.ai.ipu.count.monitor.impl.IpuPluginMonitor">-->
32
<!--        <count class="com.wade.mobile.frame.plugin.PluginManager">-->
33
<!--            <method>execute</method>-->
34
<!--        </count>-->
35
<!--    </monitor>-->
36
<!--    -->
37
<!--     <monitor class="com.ai.ipu.count.monitor.impl.IpuDataMonitor">-->
38
<!--        <count class="com.wade.mobile.func.MobileNetWork">-->
39
<!--               <method>dataRequest</method>-->
40
<!--        </count>-->
41
<!--    </monitor>-->
42
43
     
44
     
45
     
46
     
47
</config>

+ 116 - 4
display-center/display-center.xcodeproj/project.pbxproj

@ -84,6 +84,48 @@
84 84
/* End PBXBuildFile section */
85 85
86 86
/* Begin PBXContainerItemProxy section */
87
		045C4524219BC97F0064331A /* PBXContainerItemProxy */ = {
88
			isa = PBXContainerItemProxy;
89
			containerPortal = 045C44F0219BC97E0064331A /* WadeMobile.xcodeproj */;
90
			proxyType = 2;
91
			remoteGlobalIDString = 614A1CD61B2142130099793B;
92
			remoteInfo = WadeMobile;
93
		};
94
		045C4526219BC97F0064331A /* PBXContainerItemProxy */ = {
95
			isa = PBXContainerItemProxy;
96
			containerPortal = 045C44F0219BC97E0064331A /* WadeMobile.xcodeproj */;
97
			proxyType = 2;
98
			remoteGlobalIDString = 614A1CE11B2142130099793B;
99
			remoteInfo = WadeMobileTests;
100
		};
101
		045C4528219BC97F0064331A /* PBXContainerItemProxy */ = {
102
			isa = PBXContainerItemProxy;
103
			containerPortal = 045C44F0219BC97E0064331A /* WadeMobile.xcodeproj */;
104
			proxyType = 2;
105
			remoteGlobalIDString = E2D93A741B89BA2800D1DE7C;
106
			remoteInfo = WadeMobileBundle;
107
		};
108
		045C452A219BC97F0064331A /* PBXContainerItemProxy */ = {
109
			isa = PBXContainerItemProxy;
110
			containerPortal = 045C44F0219BC97E0064331A /* WadeMobile.xcodeproj */;
111
			proxyType = 2;
112
			remoteGlobalIDString = 0A791C221FD102C0003CD586;
113
			remoteInfo = WadeMobileTestUnit;
114
		};
115
		045C4533219BC9940064331A /* PBXContainerItemProxy */ = {
116
			isa = PBXContainerItemProxy;
117
			containerPortal = 045C452C219BC9930064331A /* WadeMobileFunc.xcodeproj */;
118
			proxyType = 2;
119
			remoteGlobalIDString = E2DE1AD41B42DD9500762141;
120
			remoteInfo = WadeMobileFunc;
121
		};
122
		045C4535219BC9940064331A /* PBXContainerItemProxy */ = {
123
			isa = PBXContainerItemProxy;
124
			containerPortal = 045C452C219BC9930064331A /* WadeMobileFunc.xcodeproj */;
125
			proxyType = 2;
126
			remoteGlobalIDString = 0AE1E0841C7EE95900FCCD24;
127
			remoteInfo = WadeMobileFuncTests;
128
		};
87 129
		B25B8FDF21901B0C001A240E /* PBXContainerItemProxy */ = {
88 130
			isa = PBXContainerItemProxy;
89 131
			containerPortal = B25B8FD821901B0C001A240E /* RCTWebSocket.xcodeproj */;
@ -414,6 +456,8 @@
414 456
/* Begin PBXFileReference section */
415 457
		0429A206218046E2003CEE83 /* WadeMobileFuncBundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = WadeMobileFuncBundle.bundle; path = ../IpuCommon/Frameworks/WadeMobileFuncBundle.bundle; sourceTree = "<group>"; };
416 458
		0429A2332180484E003CEE83 /* fontawesome-webfont.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "fontawesome-webfont.ttf"; path = "../IpuCommon/Frameworks/fontawesome-webfont.ttf"; sourceTree = "<group>"; };
459
		045C44F0219BC97E0064331A /* WadeMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobile.xcodeproj; path = ../../ios/WadeMobile/WadeMobile.xcodeproj; sourceTree = "<group>"; };
460
		045C452C219BC9930064331A /* WadeMobileFunc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WadeMobileFunc.xcodeproj; path = ../WadeMobileFunc/WadeMobileFunc.xcodeproj; sourceTree = "<group>"; };
417 461
		0460E86220AA9C1300CCFDA4 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
418 462
		B21767F02199632B000242CC /* IpuRN.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IpuRN.m; sourceTree = "<group>"; };
419 463
		B21767F12199632C000242CC /* IpuRN.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IpuRN.h; sourceTree = "<group>"; };
@ -538,6 +582,26 @@
538 582
/* End PBXFrameworksBuildPhase section */
539 583
540 584
/* Begin PBXGroup section */
585
		045C44F1219BC97E0064331A /* Products */ = {
586
			isa = PBXGroup;
587
			children = (
588
				045C4525219BC97F0064331A /* WadeMobile.framework */,
589
				045C4527219BC97F0064331A /* WadeMobileTests.xctest */,
590
				045C4529219BC97F0064331A /* WadeMobileBundle.bundle */,
591
				045C452B219BC97F0064331A /* WadeMobileTestUnit.xctest */,
592
			);
593
			name = Products;
594
			sourceTree = "<group>";
595
		};
596
		045C452D219BC9930064331A /* Products */ = {
597
			isa = PBXGroup;
598
			children = (
599
				045C4534219BC9940064331A /* WadeMobileFunc.framework */,
600
				045C4536219BC9940064331A /* WadeMobileFuncTests.xctest */,
601
			);
602
			name = Products;
603
			sourceTree = "<group>";
604
		};
541 605
		0460E86120AA9C1300CCFDA4 /* Frameworks */ = {
542 606
			isa = PBXGroup;
543 607
			children = (
@ -764,6 +828,8 @@
764 828
		EA8712331ECD8B580045E19A = {
765 829
			isa = PBXGroup;
766 830
			children = (
831
				045C452C219BC9930064331A /* WadeMobileFunc.xcodeproj */,
832
				045C44F0219BC97E0064331A /* WadeMobile.xcodeproj */,
767 833
				B2FC4B14219178DD008F7621 /* anticon.ttf */,
768 834
				B25B8D47218FDD6A001A240E /* bundle */,
769 835
				B2E8BECF2176C2A600A06A13 /* AMap.bundle */,
@ -943,6 +1009,14 @@
943 1009
					ProductGroup = B2FC4AD62191392D008F7621 /* Products */;
944 1010
					ProjectRef = B2FC4AD52191392D008F7621 /* RNCamera.xcodeproj */;
945 1011
				},
1012
				{
1013
					ProductGroup = 045C44F1219BC97E0064331A /* Products */;
1014
					ProjectRef = 045C44F0219BC97E0064331A /* WadeMobile.xcodeproj */;
1015
				},
1016
				{
1017
					ProductGroup = 045C452D219BC9930064331A /* Products */;
1018
					ProjectRef = 045C452C219BC9930064331A /* WadeMobileFunc.xcodeproj */;
1019
				},
946 1020
			);
947 1021
			projectRoot = "";
948 1022
			targets = (
@ -952,6 +1026,48 @@
952 1026
/* End PBXProject section */
953 1027
954 1028
/* Begin PBXReferenceProxy section */
1029
		045C4525219BC97F0064331A /* WadeMobile.framework */ = {
1030
			isa = PBXReferenceProxy;
1031
			fileType = wrapper.framework;
1032
			path = WadeMobile.framework;
1033
			remoteRef = 045C4524219BC97F0064331A /* PBXContainerItemProxy */;
1034
			sourceTree = BUILT_PRODUCTS_DIR;
1035
		};
1036
		045C4527219BC97F0064331A /* WadeMobileTests.xctest */ = {
1037
			isa = PBXReferenceProxy;
1038
			fileType = wrapper.cfbundle;
1039
			path = WadeMobileTests.xctest;
1040
			remoteRef = 045C4526219BC97F0064331A /* PBXContainerItemProxy */;
1041
			sourceTree = BUILT_PRODUCTS_DIR;
1042
		};
1043
		045C4529219BC97F0064331A /* WadeMobileBundle.bundle */ = {
1044
			isa = PBXReferenceProxy;
1045
			fileType = wrapper.cfbundle;
1046
			path = WadeMobileBundle.bundle;
1047
			remoteRef = 045C4528219BC97F0064331A /* PBXContainerItemProxy */;
1048
			sourceTree = BUILT_PRODUCTS_DIR;
1049
		};
1050
		045C452B219BC97F0064331A /* WadeMobileTestUnit.xctest */ = {
1051
			isa = PBXReferenceProxy;
1052
			fileType = wrapper.cfbundle;
1053
			path = WadeMobileTestUnit.xctest;
1054
			remoteRef = 045C452A219BC97F0064331A /* PBXContainerItemProxy */;
1055
			sourceTree = BUILT_PRODUCTS_DIR;
1056
		};
1057
		045C4534219BC9940064331A /* WadeMobileFunc.framework */ = {
1058
			isa = PBXReferenceProxy;
1059
			fileType = wrapper.framework;
1060
			path = WadeMobileFunc.framework;
1061
			remoteRef = 045C4533219BC9940064331A /* PBXContainerItemProxy */;
1062
			sourceTree = BUILT_PRODUCTS_DIR;
1063
		};
1064
		045C4536219BC9940064331A /* WadeMobileFuncTests.xctest */ = {
1065
			isa = PBXReferenceProxy;
1066
			fileType = wrapper.cfbundle;
1067
			path = WadeMobileFuncTests.xctest;
1068
			remoteRef = 045C4535219BC9940064331A /* PBXContainerItemProxy */;
1069
			sourceTree = BUILT_PRODUCTS_DIR;
1070
		};
955 1071
		B25B8FE021901B0C001A240E /* libRCTWebSocket.a */ = {
956 1072
			isa = PBXReferenceProxy;
957 1073
			fileType = archive.ar;
@ -1287,13 +1403,9 @@
1287 1403
			buildActionMask = 2147483647;
1288 1404
			files = (
1289 1405
			);
1290
			inputFileListPaths = (
1291
			);
1292 1406
			inputPaths = (
1293 1407
			);
1294 1408
			name = "Bundle React Native code and images";
1295
			outputFileListPaths = (
1296
			);
1297 1409
			outputPaths = (
1298 1410
			);
1299 1411
			runOnlyForDeploymentPostprocessing = 0;

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


+ 224 - 16
display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -89,22 +89,6 @@
89 89
            shouldBeEnabled = "Yes"
90 90
            ignoreCount = "0"
91 91
            continueAfterRunningActions = "No"
92
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m"
93
            timestampString = "556687327.938972"
94
            startingColumnNumber = "9223372036854775807"
95
            endingColumnNumber = "9223372036854775807"
96
            startingLineNumber = "48"
97
            endingLineNumber = "48"
98
            landmarkName = "-openNewPage:"
99
            landmarkType = "7">
100
         </BreakpointContent>
101
      </BreakpointProxy>
102
      <BreakpointProxy
103
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
104
         <BreakpointContent
105
            shouldBeEnabled = "Yes"
106
            ignoreCount = "0"
107
            continueAfterRunningActions = "No"
108 92
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/WDTemplateWebView.m"
109 93
            timestampString = "556685867.152396"
110 94
            startingColumnNumber = "9223372036854775807"
@ -257,5 +241,229 @@
257 241
            landmarkType = "7">
258 242
         </BreakpointContent>
259 243
      </BreakpointProxy>
244
      <BreakpointProxy
245
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
246
         <BreakpointContent
247
            shouldBeEnabled = "Yes"
248
            ignoreCount = "0"
249
            continueAfterRunningActions = "No"
250
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
251
            timestampString = "563873871.990665"
252
            startingColumnNumber = "9223372036854775807"
253
            endingColumnNumber = "9223372036854775807"
254
            startingLineNumber = "19"
255
            endingLineNumber = "19"
256
            landmarkName = "-httpGet:"
257
            landmarkType = "7">
258
         </BreakpointContent>
259
      </BreakpointProxy>
260
      <BreakpointProxy
261
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
262
         <BreakpointContent
263
            shouldBeEnabled = "Yes"
264
            ignoreCount = "0"
265
            continueAfterRunningActions = "No"
266
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
267
            timestampString = "563873871.9907219"
268
            startingColumnNumber = "9223372036854775807"
269
            endingColumnNumber = "9223372036854775807"
270
            startingLineNumber = "30"
271
            endingLineNumber = "30"
272
            landmarkName = "-httpGetForUrl:errorMsg:"
273
            landmarkType = "7">
274
         </BreakpointContent>
275
      </BreakpointProxy>
276
      <BreakpointProxy
277
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
278
         <BreakpointContent
279
            shouldBeEnabled = "Yes"
280
            ignoreCount = "0"
281
            continueAfterRunningActions = "No"
282
            filePath = "../../ios/WadeMobile/WadeMobile/frame/WDPlugin.m"
283
            timestampString = "563859677.302196"
284
            startingColumnNumber = "9223372036854775807"
285
            endingColumnNumber = "9223372036854775807"
286
            startingLineNumber = "32"
287
            endingLineNumber = "32"
288
            landmarkName = "-callback:"
289
            landmarkType = "7">
290
         </BreakpointContent>
291
      </BreakpointProxy>
292
      <BreakpointProxy
293
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
294
         <BreakpointContent
295
            shouldBeEnabled = "Yes"
296
            ignoreCount = "0"
297
            continueAfterRunningActions = "No"
298
            filePath = "../../ios/WadeMobile/WadeMobile/frame/WDPlugin.m"
299
            timestampString = "563859680.190207"
300
            startingColumnNumber = "9223372036854775807"
301
            endingColumnNumber = "9223372036854775807"
302
            startingLineNumber = "35"
303
            endingLineNumber = "35"
304
            landmarkName = "-callback:isEncode:"
305
            landmarkType = "7">
306
         </BreakpointContent>
307
      </BreakpointProxy>
308
      <BreakpointProxy
309
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
310
         <BreakpointContent
311
            shouldBeEnabled = "Yes"
312
            ignoreCount = "0"
313
            continueAfterRunningActions = "No"
314
            filePath = "../../ios/WadeMobile/WadeMobile/util/net/WDHttpTool.m"
315
            timestampString = "563859852.865063"
316
            startingColumnNumber = "9223372036854775807"
317
            endingColumnNumber = "9223372036854775807"
318
            startingLineNumber = "137"
319
            endingLineNumber = "137"
320
            landmarkName = "+postRequestSync:data:error:"
321
            landmarkType = "7">
322
         </BreakpointContent>
323
      </BreakpointProxy>
324
      <BreakpointProxy
325
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
326
         <BreakpointContent
327
            shouldBeEnabled = "Yes"
328
            ignoreCount = "0"
329
            continueAfterRunningActions = "No"
330
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
331
            timestampString = "563873871.9908381"
332
            startingColumnNumber = "9223372036854775807"
333
            endingColumnNumber = "9223372036854775807"
334
            startingLineNumber = "61"
335
            endingLineNumber = "61"
336
            landmarkName = "-httpRequest:"
337
            landmarkType = "7">
338
         </BreakpointContent>
339
      </BreakpointProxy>
340
      <BreakpointProxy
341
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
342
         <BreakpointContent
343
            shouldBeEnabled = "Yes"
344
            ignoreCount = "0"
345
            continueAfterRunningActions = "No"
346
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
347
            timestampString = "563873871.990886"
348
            startingColumnNumber = "9223372036854775807"
349
            endingColumnNumber = "9223372036854775807"
350
            startingLineNumber = "76"
351
            endingLineNumber = "76"
352
            landmarkName = "-dataRequest:"
353
            landmarkType = "7">
354
         </BreakpointContent>
355
      </BreakpointProxy>
356
      <BreakpointProxy
357
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
358
         <BreakpointContent
359
            shouldBeEnabled = "Yes"
360
            ignoreCount = "0"
361
            continueAfterRunningActions = "No"
362
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
363
            timestampString = "563873871.990927"
364
            startingColumnNumber = "9223372036854775807"
365
            endingColumnNumber = "9223372036854775807"
366
            startingLineNumber = "98"
367
            endingLineNumber = "98"
368
            landmarkName = "-extracted"
369
            landmarkType = "7">
370
         </BreakpointContent>
371
      </BreakpointProxy>
372
      <BreakpointProxy
373
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
374
         <BreakpointContent
375
            shouldBeEnabled = "Yes"
376
            ignoreCount = "0"
377
            continueAfterRunningActions = "No"
378
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
379
            timestampString = "563873871.990968"
380
            startingColumnNumber = "9223372036854775807"
381
            endingColumnNumber = "9223372036854775807"
382
            startingLineNumber = "102"
383
            endingLineNumber = "102"
384
            landmarkName = "-dataRequest:params:"
385
            landmarkType = "7">
386
         </BreakpointContent>
387
      </BreakpointProxy>
388
      <BreakpointProxy
389
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
390
         <BreakpointContent
391
            shouldBeEnabled = "Yes"
392
            ignoreCount = "0"
393
            continueAfterRunningActions = "No"
394
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
395
            timestampString = "563873871.991008"
396
            startingColumnNumber = "9223372036854775807"
397
            endingColumnNumber = "9223372036854775807"
398
            startingLineNumber = "126"
399
            endingLineNumber = "126"
400
            landmarkName = "-dataRequestAsyn:"
401
            landmarkType = "7">
402
         </BreakpointContent>
403
      </BreakpointProxy>
404
      <BreakpointProxy
405
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
406
         <BreakpointContent
407
            shouldBeEnabled = "Yes"
408
            ignoreCount = "0"
409
            continueAfterRunningActions = "No"
410
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
411
            timestampString = "563873871.991047"
412
            startingColumnNumber = "9223372036854775807"
413
            endingColumnNumber = "9223372036854775807"
414
            startingLineNumber = "183"
415
            endingLineNumber = "183"
416
            landmarkName = "-dataStrEncrypt:"
417
            landmarkType = "7">
418
         </BreakpointContent>
419
      </BreakpointProxy>
420
      <BreakpointProxy
421
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
422
         <BreakpointContent
423
            shouldBeEnabled = "Yes"
424
            ignoreCount = "0"
425
            continueAfterRunningActions = "No"
426
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
427
            timestampString = "563873871.991086"
428
            startingColumnNumber = "9223372036854775807"
429
            endingColumnNumber = "9223372036854775807"
430
            startingLineNumber = "197"
431
            endingLineNumber = "197"
432
            landmarkName = "-dataDecrypt:"
433
            landmarkType = "7">
434
         </BreakpointContent>
435
      </BreakpointProxy>
436
      <BreakpointProxy
437
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
438
         <BreakpointContent
439
            shouldBeEnabled = "Yes"
440
            ignoreCount = "0"
441
            continueAfterRunningActions = "No"
442
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileNetwork.m"
443
            timestampString = "563873871.991124"
444
            startingColumnNumber = "9223372036854775807"
445
            endingColumnNumber = "9223372036854775807"
446
            startingLineNumber = "208"
447
            endingLineNumber = "208"
448
            landmarkName = "-dataStrDecrypt:"
449
            landmarkType = "7">
450
         </BreakpointContent>
451
      </BreakpointProxy>
452
      <BreakpointProxy
453
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
454
         <BreakpointContent
455
            shouldBeEnabled = "Yes"
456
            ignoreCount = "0"
457
            continueAfterRunningActions = "No"
458
            filePath = "../../ios/WadeMobile/WadeMobile/frame/WDViewController.m"
459
            timestampString = "563876782.602173"
460
            startingColumnNumber = "9223372036854775807"
461
            endingColumnNumber = "9223372036854775807"
462
            startingLineNumber = "45"
463
            endingLineNumber = "45"
464
            landmarkName = "-viewDidLoad"
465
            landmarkType = "7">
466
         </BreakpointContent>
467
      </BreakpointProxy>
260 468
   </Breakpoints>
261 469
</Bucket>

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

@ -7,7 +7,7 @@
7 7
		<key>display-center.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>23</integer>
10
			<integer>26</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>