recharge

app/src/main/AndroidManifest.xml

@@ -443,6 +443,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.SignRechargeAct"
             android:theme="@style/AppActionTheme"
+            android:exported="true"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActUserNoviceGuidance"
@@ -618,6 +619,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.RechargeAct"
             android:theme="@style/AppActionTheme"
+            android:exported="true"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.RechargeQAct"

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

@@ -241,12 +241,12 @@ public class KFZSJs {
         CommonUtil.getInstance().alipay(activity, payInfo, b, new AbsObserver<String>() {
             @Override
             public void onNext(String result) {
-                activity.loadJs(String.format(Locale.CHINA, "alipay onNext('%s')", result));
+                activity.loadJs(String.format(Locale.CHINA, "onAlipayResult('%s')", result));
             }
 
             @Override
             public void onError(Throwable e) {
-                activity.loadJs(String.format(Locale.CHINA, "alipay onError('%s')", e.getMessage()));
+                activity.loadJs(String.format(Locale.CHINA, "onAlipayResult('%s')", e.getMessage()));
             }
         });
     }

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

@@ -46,6 +46,7 @@ import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
@@ -371,7 +372,8 @@ public class ActGcGameAppDetail extends BaseActivity {
     @OnClick(R.id.gc_game_app_detail_bt3)
     public void onGoDirectionalPay(View v) {
         CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_DIRECTIONAL_RECHARGE_URL, url -> {
-            url = url + "/" + gameEntity.getApp().getGame_discount_id() + "?authorization=";
+            url = "http://10.8.220.229:8080/#/recharge";
+            url = url + "/" + gameEntity.getApp().getGame_discount_id() + "?authorization="+ SpUtils.getToken(this);
             WebParams webParams = new WebParams(url, "抢购优惠").setShowTitle(false);
             Jump2View.getInstance().goWeb(this, webParams);
         });

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

@@ -265,6 +265,7 @@ public class ActMyMoney extends BaseActivity {
             case R.id.my_money_dingxiang_amount://定向货币详情
             case R.id.my_money_dingxiang_tag://定向货币详情
                 CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_DIRECTIONAL_LIST_URL, url -> {
+                    url = "http://10.8.220.229:8080/#/game-list";
                     url = url + "?authorization=" + SpUtils.getToken(this);
                     WebParams webParams = new WebParams(url, "定向消费").setShowTitle(false);
                     Jump2View.getInstance().goWeb(this, webParams);

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

@@ -203,7 +203,8 @@ public class ActPay extends BaseActivity {
     }
 
     public void onDirectionalPayClicked(View v) {
-        CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_DIRECTIONAL_LIST_URL, url -> {
+        CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_DIRECTIONAL_PAY_URL, url -> {
+            url = "http://10.8.220.229:8080/#/payment";
             url = url + "?authorization=" + token + "&order=" + payOrder.getOrderNo();
             WebParams webParams = new WebParams(url, "定向优惠").setShowTitle(false).setForResult(true).setAction(ACTION_FOR_H5_PAY);
             Jump2View.getInstance().goWeb(this, webParams);

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

@@ -113,6 +113,7 @@ public class ActWebX5 extends BaseActWeb {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 //            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
+        mWebView.clearCache(true);
         if (TextUtils.isEmpty(jsUrl)) {
             loadUrl(url);
         } else {

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.content.Intent;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.EditText;
@@ -41,6 +42,8 @@ public class RechargeAct extends BaseActivity {
     int mPayType = -1;//选择支付方式的id
     String mAmount = null;//支付的金额
 
+    private boolean forResult = false;
+
     @BindView(R.id.rechargeprice_greidview)
     MyGridview rechargeprice_greidview;
     @BindView(R.id.recharge_greidview)
@@ -62,6 +65,9 @@ public class RechargeAct extends BaseActivity {
 
     @Override
     public void initView() {
+        if (getIntent().hasExtra("forResult")) {
+            forResult = true;
+        }
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitle(this, "充值")
@@ -86,7 +92,7 @@ public class RechargeAct extends BaseActivity {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 select = position;
                 rechargePriceAdapter.setInPut(false);
-                RechargePriceEntity  rechargePriceEntity = (RechargePriceEntity) parent.getItemAtPosition(position);
+                RechargePriceEntity rechargePriceEntity = (RechargePriceEntity) parent.getItemAtPosition(position);
                 etRechargePrice.setText("" + rechargePriceEntity.getPrice());
                 for (int i = 0; i < mPriceEntityList.size(); i++) {
                     if (position == i) {
@@ -161,12 +167,12 @@ public class RechargeAct extends BaseActivity {
                     public void onNext(BaseMessage baseMessage) {
                         hideProgress();
                         List<RechargeEntity> list = baseMessage.getDatas(RechargeEntity.class);
-                        if(list != null && list.size() > 0){
+                        if (list != null && list.size() > 0) {
                             mPayType = list.get(0).getId();
                             rechargeAdapter.setSelect(0);
                         }
                         rechargeAdapter.addAll(list);
-                        if(!list.isEmpty()) {
+                        if (!list.isEmpty()) {
                             mPayType = list.get(0).getId();
                             rechargeAdapter.setSelect(0);
                             rechargeAdapter.notifyDataSetChanged();
@@ -215,7 +221,7 @@ public class RechargeAct extends BaseActivity {
                 }
 
                 mAmount = etRechargePrice.getText().toString().trim();
-                if(android.text.TextUtils.isEmpty(mAmount)){
+                if (android.text.TextUtils.isEmpty(mAmount)) {
                     G.showToast("请选择充值金额");
                     return;
                 }
@@ -251,7 +257,13 @@ public class RechargeAct extends BaseActivity {
 //						String resultInfo = payResult.getResult();// 同步返回需要验证的信息
 
                         String resultStatus = payResult.getResultStatus();
-                        Jump2View.getInstance().goRechargeResultAct(RechargeAct.this, resultStatus);
+                        if (forResult && "9000".equals(resultStatus)) {
+                            Intent intent = new Intent();
+                            intent.putExtra("amount", Integer.parseInt(mAmount));
+                            setResult(777, intent);
+                        } else {
+                            Jump2View.getInstance().goRechargeResultAct(RechargeAct.this, resultStatus);
+                        }
                         finish();
                     }
                 });
@@ -264,12 +276,12 @@ public class RechargeAct extends BaseActivity {
     }
 
     private void addDatas() {
-        mPriceEntityList.add(new RechargePriceEntity(false,"10元", 10));
-        mPriceEntityList.add(new RechargePriceEntity(false,"20元", 20));
-        mPriceEntityList.add(new RechargePriceEntity(false,"50元", 50));
-        mPriceEntityList.add(new RechargePriceEntity(false,"100元", 100));
-        mPriceEntityList.add(new RechargePriceEntity(false,"200元", 200));
-        mPriceEntityList.add(new RechargePriceEntity(false,"500元", 500));
+        mPriceEntityList.add(new RechargePriceEntity(false, "10元", 10));
+        mPriceEntityList.add(new RechargePriceEntity(false, "20元", 20));
+        mPriceEntityList.add(new RechargePriceEntity(false, "50元", 50));
+        mPriceEntityList.add(new RechargePriceEntity(false, "100元", 100));
+        mPriceEntityList.add(new RechargePriceEntity(false, "200元", 200));
+        mPriceEntityList.add(new RechargePriceEntity(false, "500元", 500));
     }
 
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -503,6 +503,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 break;
             case R.id.voucher_layout:
                 CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_VOUCHER_LIST_URL, url -> {
+                    url = "http://10.8.220.229:8080/#/invincible-big-turntable";
                     url = url + "?authorization=" + SpUtils.getToken(getActivity());
                     WebParams webParams = new WebParams(url, "我的代金券").setShowTitle(false);
                     Jump2View.getInstance().goWeb(getActivity(), webParams);