浏览代码

修复移动版超客读取缓存数据为空的bug

liufl5 6 年之前
父节点
当前提交
90a5b9371f
共有 19 个文件被更改,包括 61 次插入60 次删除
  1. 5 5
      WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  2. 3 3
      WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  3. 13 12
      WadeMobileFunc/WadeMobileFunc/WDFMobileStorage.m
  4. 1 1
      display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  5. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  6. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  7. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  8. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  9. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  10. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  11. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  12. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  13. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  14. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Text/RCTText.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  15. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  16. 4 4
      display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  17. 16 16
      display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  18. 二进制
      display-center/display-center.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  19. 1 1
      display-center/display-center.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

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

@ -26,12 +26,12 @@
26 26
                  moduleName = "WadeMobileFunc"
27 27
                  usesParentBreakpointCondition = "Yes"
28 28
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
29
                  timestampString = "585644696.346984"
29
                  timestampString = "585738019.271003"
30 30
                  startingColumnNumber = "9223372036854775807"
31 31
                  endingColumnNumber = "9223372036854775807"
32 32
                  startingLineNumber = "291"
33 33
                  endingLineNumber = "291"
34
                  offsetFromSymbolStart = "1132">
34
                  offsetFromSymbolStart = "1142">
35 35
               </Location>
36 36
               <Location
37 37
                  shouldBeEnabled = "Yes"
@ -41,12 +41,12 @@
41 41
                  moduleName = "WadeMobileFunc"
42 42
                  usesParentBreakpointCondition = "Yes"
43 43
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
44
                  timestampString = "585644696.349786"
44
                  timestampString = "585738019.273556"
45 45
                  startingColumnNumber = "9223372036854775807"
46 46
                  endingColumnNumber = "9223372036854775807"
47 47
                  startingLineNumber = "292"
48 48
                  endingLineNumber = "292"
49
                  offsetFromSymbolStart = "52">
49
                  offsetFromSymbolStart = "39">
50 50
               </Location>
51 51
               <Location
52 52
                  shouldBeEnabled = "Yes"
@ -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 = "585644696.352769"
59
                  timestampString = "585738019.275722"
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>50</integer>
10
			<integer>2</integer>
11 11
		</dict>
12 12
		<key>WadeMobileFunc4Appstore.xcscheme</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>52</integer>
15
			<integer>5</integer>
16 16
		</dict>
17 17
		<key>WadeMobileFuncAggregate.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>51</integer>
20
			<integer>4</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

+ 13 - 12
WadeMobileFunc/WadeMobileFunc/WDFMobileStorage.m

@ -80,13 +80,13 @@ static NSString* const DES_KEY = @"87382947";
80 80
81 81
- (void)getMemoryCache:(NSArray *)param {
82 82
    id key = param[0];
83
    id defvalue = param[1];
84
//    id defaultValue = param[1];
85
//    if ([defaultValue isKindOfClass:[NSNull class]]) {
86
//        defaultValue = @"";
87
//    }
88
//    NSString *defvalue = [NSString stringWithFormat:@"%@", defaultValue];
83 89
    
84
    id defaultValue = param[1];
85
    if ([defaultValue isKindOfClass:[NSNull class]]) {
86
        defaultValue = @"";
87
    }
88
    
89
    NSString *defvalue = [NSString stringWithFormat:@"%@", defaultValue];
90 90
    if ([key isKindOfClass:[NSArray class]]) {
91 91
        NSArray *keys = key;
92 92
        WDDataMap *map = [[WDDataMap alloc]init];
@ -221,14 +221,15 @@ static NSString* const DES_KEY = @"87382947";
221 221
    if (param.count > 2) {
222 222
        isEncrypt = [param[2] boolValue];
223 223
    }
224
    
225 224
    id key = param[0];
226
    id defaultValue = param[1];
227
    if ([defaultValue isKindOfClass:[NSNull class]]) {
228
        defaultValue = @"";
229
    }
225
    id defValue = param[1];
226
    
227
//    id defaultValue = param[1];
228
//    if ([defaultValue isKindOfClass:[NSNull class]]) {
229
//        defaultValue = @"";
230
//    }
231
//    NSString *defValue = [NSString stringWithFormat:@"%@", defaultValue];
230 232
    
231
    NSString *defValue = [NSString stringWithFormat:@"%@", defaultValue];
232 233
    id value = [self getOfflineCache:key defValue:defValue];
233 234
    /* 处理异常的结果 */
234 235
    if (!value || value == [NSNull null]) {

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

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

@ -12,12 +12,12 @@
12 12
		<key>RCTBlob-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>10</integer>
15
			<integer>8</integer>
16 16
		</dict>
17 17
		<key>RCTBlob.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>25</integer>
20
			<integer>23</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>26</integer>
10
			<integer>24</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>27</integer>
10
			<integer>25</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

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

@ -12,12 +12,12 @@
12 12
		<key>RCTImage-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>11</integer>
15
			<integer>9</integer>
16 16
		</dict>
17 17
		<key>RCTImage.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>28</integer>
20
			<integer>26</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -12,12 +12,12 @@
12 12
		<key>RCTLinking-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>12</integer>
15
			<integer>10</integer>
16 16
		</dict>
17 17
		<key>RCTLinking.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>29</integer>
20
			<integer>27</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -12,12 +12,12 @@
12 12
		<key>RCTAnimation-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>9</integer>
15
			<integer>7</integer>
16 16
		</dict>
17 17
		<key>RCTAnimation.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>37</integer>
20
			<integer>35</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -12,12 +12,12 @@
12 12
		<key>RCTNetwork-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>13</integer>
15
			<integer>11</integer>
16 16
		</dict>
17 17
		<key>RCTNetwork.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>38</integer>
20
			<integer>36</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -12,12 +12,12 @@
12 12
		<key>RCTSettings-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>14</integer>
15
			<integer>12</integer>
16 16
		</dict>
17 17
		<key>RCTSettings.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>39</integer>
20
			<integer>37</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

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

@ -12,7 +12,7 @@
12 12
		<key>RCTText-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>16</integer>
15
			<integer>14</integer>
16 16
		</dict>
17 17
		<key>RCTText.xcscheme</key>
18 18
		<dict>
@ -22,7 +22,7 @@
22 22
		<key>RCTText.xcscheme_^#shared#^_</key>
23 23
		<dict>
24 24
			<key>orderHint</key>
25
			<integer>15</integer>
25
			<integer>13</integer>
26 26
		</dict>
27 27
	</dict>
28 28
</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>40</integer>
10
			<integer>38</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

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

@ -12,12 +12,12 @@
12 12
		<key>RCTWebSocket-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>17</integer>
15
			<integer>15</integer>
16 16
		</dict>
17 17
		<key>RCTWebSocket.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>41</integer>
20
			<integer>39</integer>
21 21
		</dict>
22 22
		<key>fishhook-tvOS.xcscheme</key>
23 23
		<dict>
@ -27,12 +27,12 @@
27 27
		<key>fishhook-tvOS.xcscheme_^#shared#^_</key>
28 28
		<dict>
29 29
			<key>orderHint</key>
30
			<integer>5</integer>
30
			<integer>3</integer>
31 31
		</dict>
32 32
		<key>fishhook.xcscheme</key>
33 33
		<dict>
34 34
			<key>orderHint</key>
35
			<integer>42</integer>
35
			<integer>40</integer>
36 36
		</dict>
37 37
	</dict>
38 38
</dict>

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

@ -12,7 +12,7 @@
12 12
		<key>React-tvOS.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>19</integer>
15
			<integer>17</integer>
16 16
		</dict>
17 17
		<key>React.xcscheme</key>
18 18
		<dict>
@ -22,7 +22,7 @@
22 22
		<key>React.xcscheme_^#shared#^_</key>
23 23
		<dict>
24 24
			<key>orderHint</key>
25
			<integer>18</integer>
25
			<integer>16</integer>
26 26
		</dict>
27 27
		<key>cxxreact-tvOS.xcscheme</key>
28 28
		<dict>
@ -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>1</integer>
36 36
		</dict>
37 37
		<key>cxxreact.xcscheme</key>
38 38
		<dict>
39 39
			<key>orderHint</key>
40
			<integer>31</integer>
40
			<integer>29</integer>
41 41
		</dict>
42 42
		<key>double-conversion-tvOS.xcscheme</key>
43 43
		<dict>
@ -47,12 +47,12 @@
47 47
		<key>double-conversion-tvOS.xcscheme_^#shared#^_</key>
48 48
		<dict>
49 49
			<key>orderHint</key>
50
			<integer>4</integer>
50
			<integer>2</integer>
51 51
		</dict>
52 52
		<key>double-conversion.xcscheme</key>
53 53
		<dict>
54 54
			<key>orderHint</key>
55
			<integer>35</integer>
55
			<integer>33</integer>
56 56
		</dict>
57 57
		<key>jschelpers-tvOS.xcscheme</key>
58 58
		<dict>
@ -62,12 +62,12 @@
62 62
		<key>jschelpers-tvOS.xcscheme_^#shared#^_</key>
63 63
		<dict>
64 64
			<key>orderHint</key>
65
			<integer>6</integer>
65
			<integer>4</integer>
66 66
		</dict>
67 67
		<key>jschelpers.xcscheme</key>
68 68
		<dict>
69 69
			<key>orderHint</key>
70
			<integer>32</integer>
70
			<integer>30</integer>
71 71
		</dict>
72 72
		<key>jsinspector-tvOS.xcscheme</key>
73 73
		<dict>
@ -77,12 +77,12 @@
77 77
		<key>jsinspector-tvOS.xcscheme_^#shared#^_</key>
78 78
		<dict>
79 79
			<key>orderHint</key>
80
			<integer>7</integer>
80
			<integer>5</integer>
81 81
		</dict>
82 82
		<key>jsinspector.xcscheme</key>
83 83
		<dict>
84 84
			<key>orderHint</key>
85
			<integer>33</integer>
85
			<integer>31</integer>
86 86
		</dict>
87 87
		<key>privatedata-tvOS.xcscheme</key>
88 88
		<dict>
@ -92,12 +92,12 @@
92 92
		<key>privatedata-tvOS.xcscheme_^#shared#^_</key>
93 93
		<dict>
94 94
			<key>orderHint</key>
95
			<integer>8</integer>
95
			<integer>6</integer>
96 96
		</dict>
97 97
		<key>privatedata.xcscheme</key>
98 98
		<dict>
99 99
			<key>orderHint</key>
100
			<integer>36</integer>
100
			<integer>34</integer>
101 101
		</dict>
102 102
		<key>third-party-tvOS.xcscheme</key>
103 103
		<dict>
@ -107,12 +107,12 @@
107 107
		<key>third-party-tvOS.xcscheme_^#shared#^_</key>
108 108
		<dict>
109 109
			<key>orderHint</key>
110
			<integer>20</integer>
110
			<integer>18</integer>
111 111
		</dict>
112 112
		<key>third-party.xcscheme</key>
113 113
		<dict>
114 114
			<key>orderHint</key>
115
			<integer>34</integer>
115
			<integer>32</integer>
116 116
		</dict>
117 117
		<key>yoga-tvOS.xcscheme</key>
118 118
		<dict>
@ -122,12 +122,12 @@
122 122
		<key>yoga-tvOS.xcscheme_^#shared#^_</key>
123 123
		<dict>
124 124
			<key>orderHint</key>
125
			<integer>21</integer>
125
			<integer>19</integer>
126 126
		</dict>
127 127
		<key>yoga.xcscheme</key>
128 128
		<dict>
129 129
			<key>orderHint</key>
130
			<integer>30</integer>
130
			<integer>28</integer>
131 131
		</dict>
132 132
	</dict>
133 133
	<key>SuppressBuildableAutocreation</key>

二进制
display-center/display-center.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate


+ 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>22</integer>
10
			<integer>20</integer>
11 11
		</dict>
12 12
	</dict>
13 13
	<key>SuppressBuildableAutocreation</key>