瀏覽代碼

修复调用closeIpuApp没有跳转到登录界面的bug

liufl5 6 年之前
父節點
當前提交
d0c12b0f6b

+ 2 - 0
IpuCommon/Frameworks/WadeMobile.framework/Headers/IpuTemplateSubController.h

@ -11,6 +11,8 @@
11 11
12 12
@interface IpuTemplateSubController : WDTemplateController
13 13
14
@property(nonatomic,strong)WDPlugin* plugin;
15
14 16
///*
15 17
// 子应用需要传启动参数的情况,add by lfl
16 18
// */

二進制
IpuCommon/Frameworks/WadeMobile.framework/WadeMobile


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

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

二進制
SuperMenu/SuperMenu.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate


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

@ -1070,8 +1070,8 @@
1070 1070
            endingColumnNumber = "9223372036854775807"
1071 1071
            startingLineNumber = "263"
1072 1072
            endingLineNumber = "263"
1073
            landmarkName = "AppManagePlugin"
1074
            landmarkType = "3">
1073
            landmarkName = "-openNativeApp:"
1074
            landmarkType = "7">
1075 1075
         </BreakpointContent>
1076 1076
      </BreakpointProxy>
1077 1077
      <BreakpointProxy

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

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

+ 13 - 3
SuperMenu/SuperMenu/multiple/AppManagePlugin.m

@ -109,12 +109,22 @@
109 109
    if (args && args.count>0 && args[0]!=[NSNull null]) {
110 110
        callbackStr = args[0];
111 111
    }
112
    
112 113
    UIViewController *vc = (UIViewController *)self.wademobile;
113
    if([vc isKindOfClass:[IpuTemplateSubController class]])
114
        [vc dismissViewControllerAnimated:YES completion:^{
114
    if([vc isKindOfClass:[IpuTemplateSubController class]]){
115
        IpuTemplateSubController *vc1 = (IpuTemplateSubController*)[self getViewController];
116
        [vc1 dismissViewControllerAnimated:YES completion:^{
115 117
            [IpuMultipleManager setMultiple:NO];
116
            [self callback:callbackStr];
118
            [vc1.plugin callback:callbackStr];
117 119
        }];
120
    }
121
    
122
//    UIViewController *vc = (UIViewController *)self.wademobile;
123
//    if([vc isKindOfClass:[IpuTemplateSubController class]])
124
//        [vc dismissViewControllerAnimated:YES completion:^{
125
//            [IpuMultipleManager setMultiple:NO];
126
//            [self callback:callbackStr];
127
//        }];
118 128
}
119 129
120 130
- (void) openRemoteURL:(NSArray *)param {

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