Browse Source

backWithCallback插件代码逻辑优化

liuql6 5 years ago
parent
commit
077335fa00
18 changed files with 52 additions and 52 deletions
  1. 5 11
      IPUMobileFunc/IPUMobileFunc/IPUMobileUIPlugin.m
  2. 1 1
      display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  3. 1 1
      display-center/ReactNative/node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  4. 2 2
      display-center/ReactNative/node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  5. 1 1
      display-center/ReactNative/node_modules/react-native-webview/ios/RNCWebView.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  6. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  7. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  8. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  9. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  10. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  11. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  12. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  13. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/Text/RCTText.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  14. 4 4
      display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  15. 16 16
      display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  16. 1 1
      display-center/display-center.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  17. 6 0
      display-center/display-center.xcworkspace/contents.xcworkspacedata
  18. BIN
      display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/UserInterfaceState.xcuserstate

+ 5 - 11
IPUMobileFunc/IPUMobileFunc/IPUMobileUIPlugin.m

@ -674,17 +674,9 @@
674 674
    NSString *result = param[0];    // 回调数据
675 675
    IPUFlipperView *flipperView = (IPUFlipperView *)[(UIView *)[self.mobileDelegate getCurrentView] superview];
676 676
    UIView *formerView = nil;
677
    if (!param[1] || [param[1] isKindOfClass:[NSNull class]]) {
678
        formerView = [flipperView getFormerView];   // 获取上一个视图
679
        [flipperView backWithCount:1];
680
    } else {
681
        // 多层级返回
682
        NSString *pageAction = param[1];
683
        NSInteger count = [flipperView getViewOffert:pageAction view:&formerView];
684
            
685
        [flipperView backWithCount:count];
686
    }
687
677
    NSString *pageAction = param.count > 1 ? param[1] : nil;
678
    NSInteger offeset = [flipperView getViewOffert:pageAction view:&formerView];
679
    
688 680
    if ([formerView isKindOfClass:[UIWebView class]] ||
689 681
        [formerView isKindOfClass:NSClassFromString(@"WKWebView")]) {   // 上一个视图注入js
690 682
        // 构造需要注入的js
@ -694,6 +686,8 @@
694 686
        // ReactNative RCTRootView 预留
695 687
        // ...
696 688
    }
689
    
690
    [flipperView backWithCount:offeset];
697 691
}
698 692
699 693
- (void)openWindow:(NSArray *)param {

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

@ -9,7 +9,7 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>24</integer>
12
			<integer>26</integer>
13 13
		</dict>
14 14
	</dict>
15 15
	<key>SuppressBuildableAutocreation</key>

+ 1 - 1
display-center/ReactNative/node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -9,7 +9,7 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>21</integer>
12
			<integer>23</integer>
13 13
		</dict>
14 14
	</dict>
15 15
	<key>SuppressBuildableAutocreation</key>

+ 2 - 2
display-center/ReactNative/node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>1</integer>
12
			<integer>2</integer>
13 13
		</dict>
14 14
		<key>RNVectorIcons.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>22</integer>
19
			<integer>24</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

+ 1 - 1
display-center/ReactNative/node_modules/react-native-webview/ios/RNCWebView.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -9,7 +9,7 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>20</integer>
12
			<integer>22</integer>
13 13
		</dict>
14 14
	</dict>
15 15
	<key>SuppressBuildableAutocreation</key>

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

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>15</integer>
12
			<integer>17</integer>
13 13
		</dict>
14 14
		<key>ART.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>27</integer>
19
			<integer>29</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

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

@ -9,7 +9,7 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>28</integer>
12
			<integer>30</integer>
13 13
		</dict>
14 14
	</dict>
15 15
	<key>SuppressBuildableAutocreation</key>

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

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>3</integer>
12
			<integer>4</integer>
13 13
		</dict>
14 14
		<key>RCTImage.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>26</integer>
19
			<integer>28</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

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

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>8</integer>
12
			<integer>10</integer>
13 13
		</dict>
14 14
		<key>RCTLinking.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>30</integer>
19
			<integer>32</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

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

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>5</integer>
12
			<integer>6</integer>
13 13
		</dict>
14 14
		<key>RCTAnimation.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>25</integer>
19
			<integer>27</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

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

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>2</integer>
12
			<integer>3</integer>
13 13
		</dict>
14 14
		<key>RCTNetwork.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>23</integer>
19
			<integer>25</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

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

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>0</integer>
12
			<integer>1</integer>
13 13
		</dict>
14 14
		<key>RCTSettings.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>31</integer>
19
			<integer>33</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

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

@ -9,14 +9,14 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>12</integer>
12
			<integer>14</integer>
13 13
		</dict>
14 14
		<key>RCTText.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>32</integer>
19
			<integer>34</integer>
20 20
		</dict>
21 21
	</dict>
22 22
	<key>SuppressBuildableAutocreation</key>

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

@ -9,28 +9,28 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>14</integer>
12
			<integer>16</integer>
13 13
		</dict>
14 14
		<key>RCTWebSocket.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>33</integer>
19
			<integer>35</integer>
20 20
		</dict>
21 21
		<key>fishhook-tvOS.xcscheme_^#shared#^_</key>
22 22
		<dict>
23 23
			<key>isShown</key>
24 24
			<false/>
25 25
			<key>orderHint</key>
26
			<integer>17</integer>
26
			<integer>19</integer>
27 27
		</dict>
28 28
		<key>fishhook.xcscheme_^#shared#^_</key>
29 29
		<dict>
30 30
			<key>isShown</key>
31 31
			<false/>
32 32
			<key>orderHint</key>
33
			<integer>29</integer>
33
			<integer>31</integer>
34 34
		</dict>
35 35
	</dict>
36 36
	<key>SuppressBuildableAutocreation</key>

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

@ -9,112 +9,112 @@
9 9
			<key>isShown</key>
10 10
			<false/>
11 11
			<key>orderHint</key>
12
			<integer>4</integer>
12
			<integer>5</integer>
13 13
		</dict>
14 14
		<key>React.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>isShown</key>
17 17
			<false/>
18 18
			<key>orderHint</key>
19
			<integer>9</integer>
19
			<integer>11</integer>
20 20
		</dict>
21 21
		<key>cxxreact-tvOS.xcscheme_^#shared#^_</key>
22 22
		<dict>
23 23
			<key>isShown</key>
24 24
			<false/>
25 25
			<key>orderHint</key>
26
			<integer>11</integer>
26
			<integer>13</integer>
27 27
		</dict>
28 28
		<key>cxxreact.xcscheme_^#shared#^_</key>
29 29
		<dict>
30 30
			<key>isShown</key>
31 31
			<false/>
32 32
			<key>orderHint</key>
33
			<integer>34</integer>
33
			<integer>36</integer>
34 34
		</dict>
35 35
		<key>double-conversion-tvOS.xcscheme_^#shared#^_</key>
36 36
		<dict>
37 37
			<key>isShown</key>
38 38
			<false/>
39 39
			<key>orderHint</key>
40
			<integer>13</integer>
40
			<integer>15</integer>
41 41
		</dict>
42 42
		<key>double-conversion.xcscheme_^#shared#^_</key>
43 43
		<dict>
44 44
			<key>isShown</key>
45 45
			<false/>
46 46
			<key>orderHint</key>
47
			<integer>36</integer>
47
			<integer>38</integer>
48 48
		</dict>
49 49
		<key>jsi-tvOS.xcscheme_^#shared#^_</key>
50 50
		<dict>
51 51
			<key>isShown</key>
52 52
			<false/>
53 53
			<key>orderHint</key>
54
			<integer>16</integer>
54
			<integer>18</integer>
55 55
		</dict>
56 56
		<key>jsi.xcscheme_^#shared#^_</key>
57 57
		<dict>
58 58
			<key>isShown</key>
59 59
			<false/>
60 60
			<key>orderHint</key>
61
			<integer>39</integer>
61
			<integer>41</integer>
62 62
		</dict>
63 63
		<key>jsiexecutor-tvOS.xcscheme_^#shared#^_</key>
64 64
		<dict>
65 65
			<key>isShown</key>
66 66
			<false/>
67 67
			<key>orderHint</key>
68
			<integer>18</integer>
68
			<integer>20</integer>
69 69
		</dict>
70 70
		<key>jsiexecutor.xcscheme_^#shared#^_</key>
71 71
		<dict>
72 72
			<key>isShown</key>
73 73
			<false/>
74 74
			<key>orderHint</key>
75
			<integer>40</integer>
75
			<integer>42</integer>
76 76
		</dict>
77 77
		<key>jsinspector-tvOS.xcscheme_^#shared#^_</key>
78 78
		<dict>
79 79
			<key>isShown</key>
80 80
			<false/>
81 81
			<key>orderHint</key>
82
			<integer>7</integer>
82
			<integer>9</integer>
83 83
		</dict>
84 84
		<key>jsinspector.xcscheme_^#shared#^_</key>
85 85
		<dict>
86 86
			<key>isShown</key>
87 87
			<false/>
88 88
			<key>orderHint</key>
89
			<integer>37</integer>
89
			<integer>39</integer>
90 90
		</dict>
91 91
		<key>third-party-tvOS.xcscheme_^#shared#^_</key>
92 92
		<dict>
93 93
			<key>isShown</key>
94 94
			<false/>
95 95
			<key>orderHint</key>
96
			<integer>10</integer>
96
			<integer>12</integer>
97 97
		</dict>
98 98
		<key>third-party.xcscheme_^#shared#^_</key>
99 99
		<dict>
100 100
			<key>isShown</key>
101 101
			<false/>
102 102
			<key>orderHint</key>
103
			<integer>38</integer>
103
			<integer>40</integer>
104 104
		</dict>
105 105
		<key>yoga-tvOS.xcscheme_^#shared#^_</key>
106 106
		<dict>
107 107
			<key>isShown</key>
108 108
			<false/>
109 109
			<key>orderHint</key>
110
			<integer>6</integer>
110
			<integer>8</integer>
111 111
		</dict>
112 112
		<key>yoga.xcscheme_^#shared#^_</key>
113 113
		<dict>
114 114
			<key>isShown</key>
115 115
			<false/>
116 116
			<key>orderHint</key>
117
			<integer>35</integer>
117
			<integer>37</integer>
118 118
		</dict>
119 119
	</dict>
120 120
	<key>SuppressBuildableAutocreation</key>

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

@ -7,7 +7,7 @@
7 7
		<key>display-center.xcscheme_^#shared#^_</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>19</integer>
10
			<integer>21</integer>
11 11
		</dict>
12 12
	</dict>
13 13
	<key>SuppressBuildableAutocreation</key>

+ 6 - 0
display-center/display-center.xcworkspace/contents.xcworkspacedata

@ -2,6 +2,12 @@
2 2
<Workspace
3 3
   version = "1.0">
4 4
   <FileRef
5
      location = "group:../IPUMobileFunc/IPUMobileFunc.xcodeproj">
6
   </FileRef>
7
   <FileRef
8
      location = "group:../../iOS/IPUMobile/IPUMobile.xcodeproj">
9
   </FileRef>
10
   <FileRef
5 11
      location = "group:display-center.xcodeproj">
6 12
   </FileRef>
7 13
</Workspace>

BIN
display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/UserInterfaceState.xcuserstate