|
|
@ -1,7 +1,7 @@ |
|
|
|
package com.fr.design.upm; |
|
|
|
package com.fr.design.upm; |
|
|
|
|
|
|
|
|
|
|
|
import com.fr.config.MarketConfig; |
|
|
|
|
|
|
|
import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader; |
|
|
|
import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader; |
|
|
|
|
|
|
|
import com.fr.design.DesignerEnvManager; |
|
|
|
import com.fr.design.bridge.exec.JSBridge; |
|
|
|
import com.fr.design.bridge.exec.JSBridge; |
|
|
|
import com.fr.design.bridge.exec.JSCallback; |
|
|
|
import com.fr.design.bridge.exec.JSCallback; |
|
|
|
import com.fr.design.extra.PluginOperateUtils; |
|
|
|
import com.fr.design.extra.PluginOperateUtils; |
|
|
@ -411,7 +411,7 @@ public class NewUpmBridge extends UpmBridge { |
|
|
|
@JsAccessible |
|
|
|
@JsAccessible |
|
|
|
public String getLoginInfo(final JsFunction callback) { |
|
|
|
public String getLoginInfo(final JsFunction callback) { |
|
|
|
registerLoginInfo(callback); |
|
|
|
registerLoginInfo(callback); |
|
|
|
return MarketConfig.getInstance().getBbsUsername(); |
|
|
|
return DesignerEnvManager.getEnvManager().getDesignerLoginUsername(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -423,7 +423,7 @@ public class NewUpmBridge extends UpmBridge { |
|
|
|
@JsAccessible |
|
|
|
@JsAccessible |
|
|
|
public void registerLoginInfo(final JsFunction callback) { |
|
|
|
public void registerLoginInfo(final JsFunction callback) { |
|
|
|
JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)); |
|
|
|
JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)); |
|
|
|
String username = MarketConfig.getInstance().getBbsUsername(); |
|
|
|
String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername(); |
|
|
|
if (StringUtils.isEmpty(username)) { |
|
|
|
if (StringUtils.isEmpty(username)) { |
|
|
|
jsCallback.execute(StringUtils.EMPTY); |
|
|
|
jsCallback.execute(StringUtils.EMPTY); |
|
|
|
EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY); |
|
|
|
EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY); |
|
|
|