Merge branch 'master' into plugin

bmfe · May 31, 2018 · 1b818a9 · 1b818a9
2 parents 4802f65 + 085f9d8
commit 1b818a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/library-wxshare/src/main/java/com/benmu/erospluginumeng/event/EventAuth.java b/library-wxshare/src/main/java/com/benmu/erospluginumeng/event/EventAuth.java
@@ -34,10 +34,7 @@ public class EventAuth extends EventGate {
 
     @Override
     public void perform(Context context, WeexEventBean weexEventBean) {
-        String param = weexEventBean.getJsParams();
-        if (SharePlatformCatalog.P_WECHATSESSION.equals(param)) {
-            wechat(context, weexEventBean.getJscallback());
-        }
+        wechat(context, weexEventBean.getJscallback());
     }
 
     public void wechat(Context context, JSCallback jscallback) {

diff --git a/library-wxshare/src/main/java/com/benmu/erospluginumeng/event/EventUmeng.java b/library-wxshare/src/main/java/com/benmu/erospluginumeng/event/EventUmeng.java
@@ -10,6 +10,7 @@
 import com.benmu.framework.utils.DebugableUtil;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
+import com.umeng.socialize.Config;
 import com.umeng.socialize.PlatformConfig;
 import com.umeng.socialize.UMShareAPI;
 
@@ -21,6 +22,7 @@ public class EventUmeng {
 
     public void initUM(Context context, String androidAppKey) {
         if (!TextUtils.isEmpty(androidAppKey)) {
+            Config.DEBUG = true;
             UMConfigure.init(context, androidAppKey, "umeng", UMConfigure.DEVICE_TYPE_PHONE, "");
             MobclickAgent.setDebugMode(DebugableUtil.isDebug());
             MobclickAgent.openActivityDurationTrack(false);
@@ -33,7 +35,6 @@ public void initUM(Context context, String androidAppKey) {
     public void initPlatform(Context context, String params) {
         UmengPlagformBean bean = ManagerFactory.getManagerService(ParseManager.class).parseObject
                 (params, UmengPlagformBean.class);
-
         PlatformConfig.setWeixin(bean.getAppKey(), bean.getAppSecret());
 
     }