hanjing лет назад: 6
Родитель
Сommit
381b8075de

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java

@@ -50,9 +50,9 @@ public class NetModule {
         Retrofit retrofit = new Retrofit.Builder()
                 .client(okhttpClient)
                 .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
+//                .baseUrl("http://ss.17xmy.com/v1/")
 //                .baseUrl("http://10.8.220.239:8080/v1/")
 //                .baseUrl("http://10.8.240.193:8080/v1/")
-//                .baseUrl("http://ss.17xmy.com/v1/")
                 .addConverterFactory(StringConverterFactory.create())
                 .addConverterFactory(FastJsonConverterFactory.create())
 //                .addConverterFactory(GsonConverterFactory.create(EntityUtils.gson))//

+ 9 - 2
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2959,12 +2959,19 @@ public class Jump2View {
     public void gotoGameVipRecharge(Applications app) {
         String url = Config.getUrlByPath(Config.PATH_DIRECTIONAL_RECHARGE + "/" + app.getGame_discount_id(), "authorization", SpUtils.getToken(SheepApp.getInstance()), "ssnocache", "1");
         WebParams webParams = new WebParams(url, "抢购优惠").setShowTitle(false);
-        Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), webParams);
+        Jump2View.getInstance().goWeb(SheepApp.getInstance(), webParams);
     }
+
     public void gotoGameVipRecharge(int discountId, String packageName, String token) {
         String url = Config.getUrlByPath(Config.PATH_DIRECTIONAL_RECHARGE + "/" + discountId, "packagename", packageName, "authorization", token, "ssnocache", "1");
         WebParams webParams = new WebParams(url, "抢购优惠").setShowTitle(false);
-        Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), webParams);
+        Jump2View.getInstance().goWeb(SheepApp.getInstance(), webParams, true);
+    }
+
+    public void gotoGameGoldCoins(String token) {
+        String url = Config.getUrlByPath(Config.PATH_DIRECTIONAL_MAKEGOLD, "authorization", token, "ssnocache", "1");
+        WebParams webParams = new WebParams(url, "金丹传说").setShowTitle(false);
+        Jump2View.getInstance().goWeb(SheepApp.getInstance(), webParams, true);
     }
 
     /**

+ 7 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/MiddleSchemeAct.java

@@ -62,6 +62,7 @@ public class MiddleSchemeAct extends Activity {
                     if (SheepApp.getInstance().mActivityCount == 0
                             && !"game_coupon".equals(uri.getQueryParameter("type"))
                             && !"game_detail".equals(uri.getQueryParameter("type"))
+                            && !"makegold".equals(uri.getQueryParameter("type"))
                             && !"discountrecharge".equals(uri.getQueryParameter("type"))) {
                         ActionUtil.getInstance().addNextAction("scheme", uri);
                         tryGoSplashAct(SheepApp.getInstance(), uri);
@@ -87,6 +88,7 @@ public class MiddleSchemeAct extends Activity {
         String json = uri.getQueryParameter("data");
         if (!type.equals("h5game")
                 && !type.equals("discountrecharge")
+                && !type.equals("makegold")
                 && !type.equals("game_detail")) {
             json = BaseMessageConverter.decrypt(json);
         }
@@ -125,6 +127,11 @@ public class MiddleSchemeAct extends Activity {
                 Jump2View.getInstance().gotoGameVipRecharge(discountId, packageName, token);
                 break;
             }
+            case "makegold": {
+                String token = json;
+                Jump2View.getInstance().gotoGameGoldCoins(token);
+                break;
+            }
             //sheep://small.kfzs.com/xmy?type=jhl&data={"Jump":"1"}
             case "jump_home_list"://跳转homeList
             case "jhl":

+ 1 - 1
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.SSRechargeActivity");
+            ComponentName appName = new ComponentName(gowhere, "com.yog.kothoth.view.activity.SSPaymentActivity");
             Intent intent = new Intent();
             intent.setComponent(appName);
             intent.putExtra("action", TextUtils.isEmpty(orderno) ? 777 : 666);

+ 1 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -67,6 +67,7 @@ public class Config {
     public static final String PATH_DIRECTIONAL_VOUCHER = STATION_SMALL_SHEEP_GAME_COINS + "/cash-coupon-list";
     //代金券
     public static final String PATH_DIRECTIONAL_RECHARGE = STATION_SMALL_SHEEP_GAME_COINS + "/recharge";
+    public static final String PATH_DIRECTIONAL_MAKEGOLD = STATION_SMALL_SHEEP_GAME_COINS + "/invincible-big-turntable";
 
     public static final String PATH_MY_GAME_COUPON = STATION_SMALL_SHEEP_GAME_COUPON + "/game-coupon";
     //新春活动