Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWeb.java

@@ -95,7 +95,8 @@ public class FgtWeb extends BaseFgtWeb {
     }
 
     public void initView() {
-        mWebView = new WebView(SheepApp.getInstance());
+//        mWebView = new WebView(SheepApp.getInstance());
+        mWebView = new WebView(getActivity());
         webContainer.addView(mWebView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         ViewUtil.setImage(act_web_loading_iv, R.drawable.gif_sheep_loading);
 

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -102,7 +102,8 @@ public class FgtWebX5 extends BaseFgtWebX5 {
     }
 
     public void initView() {
-        mWebView = new WebView(SheepApp.getInstance());
+//        mWebView = new WebView(SheepApp.getInstance());
+        mWebView = new WebView(getActivity());
         webContainer.addView(mWebView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         ViewUtil.setImage(act_web_loading_iv, R.drawable.gif_sheep_loading);
 

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -885,7 +885,7 @@ public class KFZSJs {
 
     @JavascriptInterface
     public void discountRechargeBack(String packageName) {
-        ComponentName appName = new ComponentName(packageName, "com.yog.kothoth.view.activity.SSPaymentActivity");
+        ComponentName appName = new ComponentName(packageName, "com.yog.kothoth.view.activity.SSRechargeActivity");
         Intent intent = new Intent();
         intent.setComponent(appName);
         intent.putExtra("action", 777);

app/src/main/java/com/sheep/gamegroup/view/activity/RechargeResultAct.java

@@ -83,7 +83,7 @@ public class RechargeResultAct extends BaseActivity {
     @Override
     public void finish() {
         if (!TextUtils.isEmpty(gowhere)) {
-            ComponentName appName = new ComponentName(gowhere, "com.yog.kothoth.view.activity.SSPaymentActivity");
+            ComponentName appName = new ComponentName(gowhere, "com.yog.kothoth.view.activity.SSRechargeActivity");
             Intent intent = new Intent();
             intent.setComponent(appName);
             intent.putExtra("action", TextUtils.isEmpty(orderno) ? 777 : 666);

app/src/sheep/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -1,10 +1,16 @@
 package com.sheep.jiuyan.samllsheep.wxapi;
+
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.sheep.gamegroup.event.WXLoginAuthEvent;
 import com.sheep.jiuyan.samllsheep.wxutil.WXAPIUtil;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.umeng.socialize.weixin.view.WXCallbackActivity;
 
+import org.greenrobot.eventbus.EventBus;
+
 public class WXEntryActivity extends WXCallbackActivity {
 
     @Override
@@ -20,4 +26,18 @@ public class WXEntryActivity extends WXCallbackActivity {
         finish();
     }
 
+    @Override
+    public void onResp(BaseResp resp) {
+        if (resp instanceof SendAuth.Resp) {
+            if (resp.errCode == BaseResp.ErrCode.ERR_OK) {
+                String code = ((SendAuth.Resp) resp).code;
+                EventBus.getDefault().post(new WXLoginAuthEvent(code));
+            } else{
+                EventBus.getDefault().post(new WXLoginAuthEvent(null));
+            }
+        } else {
+            super.onResp(resp);
+        }
+    }
+
 }

app/src/sheeptestjiguang/java/com/sheep/jiuyan/samllsheep/test/wxapi/WXEntryActivity.java

@@ -1,10 +1,16 @@
 package com.sheep.jiuyan.samllsheep.wxapi;
+
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.sheep.gamegroup.event.WXLoginAuthEvent;
 import com.sheep.jiuyan.samllsheep.wxutil.WXAPIUtil;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.umeng.socialize.weixin.view.WXCallbackActivity;
 
+import org.greenrobot.eventbus.EventBus;
+
 public class WXEntryActivity extends WXCallbackActivity {
 
     @Override
@@ -20,5 +26,18 @@ public class WXEntryActivity extends WXCallbackActivity {
         finish();
     }
 
+    @Override
+    public void onResp(BaseResp resp) {
+        if (resp instanceof SendAuth.Resp) {
+            if (resp.errCode == BaseResp.ErrCode.ERR_OK) {
+                String code = ((SendAuth.Resp) resp).code;
+                EventBus.getDefault().post(new WXLoginAuthEvent(code));
+            } else{
+                EventBus.getDefault().post(new WXLoginAuthEvent(null));
+            }
+        } else {
+            super.onResp(resp);
+        }
+    }
 
 }