common out pay order

app/src/main/java/com/sheep/gamegroup/model/entity/GameTaskOrderEnty.java

@@ -7,6 +7,9 @@ import java.io.Serializable;
  */
 
 public class GameTaskOrderEnty implements Serializable {
+
+    private String title;
+
     private String account;//游戏帐号或QQ号
 
     private double amount;//number($double)充值金额
@@ -34,6 +37,14 @@ public class GameTaskOrderEnty implements Serializable {
 
     private String remark;//失败原因
 
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getRemark() {
         return remark;
     }

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

@@ -39,7 +39,6 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
@@ -88,7 +87,7 @@ public class FgtWeb extends BaseFgtWeb {
 
     private String finallyUrl;
 
-    public String getFirstUrl(){
+    public String getFirstUrl() {
         return finallyUrl;
     }
 
@@ -386,7 +385,10 @@ public class FgtWeb extends BaseFgtWeb {
                 //微信H5支付核心代码
                 if (url.startsWith(Config.SHEEP_PAY)) {
                     String order_no = StringUtils.getQueryParameter(url, Config.YF_SHOP_ORDER_NUMBER_KEY);
-                    Jump2View.getInstance().goActPay(SheepApp.getInstance().getCurrentActivity(), order_no, SpUtils.getToken(SheepApp.getInstance()));
+//                    Jump2View.getInstance().goPay(SheepApp.getInstance().getCurrentActivity(), order_no, SpUtils.getToken(SheepApp.getInstance()));
+                    String redirectUrl = StringUtils.getQueryParameter(url, Config.YF_SHOP_ORDER_REDIRECT_URL);
+                    Jump2View.getInstance().goPay(SheepApp.getInstance().getCurrentActivity(), order_no, SpUtils.getToken(SheepApp.getInstance()));
+                    webViewLoadUrl(view, redirectUrl);
                     return true;
                 } else if (url.startsWith(Config.SHEEP)) {
                     MiddleSchemeAct.parseAndJumpUri(SheepApp.getInstance().getCurrentActivity(), Uri.parse(url));
@@ -464,8 +466,9 @@ public class FgtWeb extends BaseFgtWeb {
                 }
                 if ((url.startsWith(Config.SMALL_STATION_URL_SHEEP)
                         || url.startsWith(Config.YF_SHOP_HOME)
+                        || url.startsWith("http://t.shop.17xmy.com/")
                         || url.startsWith("http://10.8"))
-                        &&(!url.contains(webParams.getTokenKey()))) {
+                        && (!url.contains(webParams.getTokenKey()))) {
                     loadUrl = StringUtils.addUrlQuery(url, webParams.getTokenKey(), SpUtils.getToken(SheepApp.getInstance()));
                 }
                 loadUrl = StringUtils.addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);

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

@@ -13,7 +13,6 @@ import android.provider.MediaStore;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,15 +25,12 @@ import android.widget.ProgressBar;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.dateview.DateUtil;
 import com.sheep.gamegroup.model.entity.WebParams;
-import com.sheep.gamegroup.module.webview.util.WebResourceRequestAdapter;
-import com.sheep.gamegroup.module.webview.util.WebResourceResponseAdapter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Constant;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -72,7 +68,6 @@ import butterknife.BindView;
 import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import cn.modificator.waterwave_progress.WidgetUtil;
 import okhttp3.Call;
-import ren.yale.android.cachewebviewlib.WebViewCacheInterceptorInst;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -395,7 +390,9 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                 //微信H5支付核心代码
                 if (url.startsWith(Config.SHEEP_PAY)) {
                     String order_no = StringUtils.getQueryParameter(url, Config.YF_SHOP_ORDER_NUMBER_KEY);
-                    Jump2View.getInstance().goActPay(SheepApp.getInstance().getCurrentActivity(), order_no, SpUtils.getToken(SheepApp.getInstance()));
+                    String redirectUrl = StringUtils.getQueryParameter(url, Config.YF_SHOP_ORDER_REDIRECT_URL);
+                    Jump2View.getInstance().goPay(SheepApp.getInstance().getCurrentActivity(), order_no, SpUtils.getToken(SheepApp.getInstance()));
+                    webViewLoadUrl(view, redirectUrl);
                     return true;
                 } else if (url.startsWith(Config.SHEEP)) {
                     MiddleSchemeAct.parseAndJumpUri(SheepApp.getInstance().getCurrentActivity(), Uri.parse(url));
@@ -471,6 +468,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                 }
                 if ((url.startsWith(Config.SMALL_STATION_URL_SHEEP)
                         || url.startsWith(Config.YF_SHOP_HOME)
+                        || url.startsWith("http://t.shop.17xmy.com/")
                         || url.startsWith("http://10.8"))
                         &&(!url.contains(webParams.getTokenKey()))) {
                     loadUrl = StringUtils.addUrlQuery(url, webParams.getTokenKey(), SpUtils.getToken(SheepApp.getInstance()));

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2507,11 +2507,22 @@ public class Jump2View {
      * @param order_no 订单编号
      * @param token    登录token
      */
-    public void goActPay(Activity activity, String order_no, String token) {
-        activity.startActivityForResult(new Intent(activity, ActPay.class)
-                        .putExtra("order_no", order_no)
-                        .putExtra("token", token),
-                ActPay.RESULT_CODE);
+    public void goPay(Activity activity, String order_no, String token) {
+//        activity.startActivityForResult(new Intent(activity, ActPay.class)
+//                        .putExtra("order_no", order_no)
+//                        .putExtra("token", token),
+//                ActPay.RESULT_CODE);
+
+        String url = Config.getUrlByPath(Config.PATH_PAYMENT_PAY +
+                "?authorization=" + token +
+                "&orderNo=" + order_no +
+                "&stamp=" + System.currentTimeMillis());
+        LogUtil.logI("payurl: " + url);
+        WebParams webParams = new WebParams(url, "支付")
+                .setShowTitle(false)
+                .setForResult(true)
+                .setAction(Constant.INTENT_PAY);
+        Jump2View.getInstance().goWeb(activity, webParams);
     }
 
     /**

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -30,7 +30,6 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
-import com.kfzs.cfyl.share_library.util.CallBackAPI;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.absBase.AbsObserver;
@@ -44,8 +43,6 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.Version;
 import com.sheep.gamegroup.model.entity.Video;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.plugin.model.Plugin;
-import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
 import com.sheep.gamegroup.usage.AppUsageManager;
@@ -512,7 +509,7 @@ public class TestUtil {
                 G.showToast("" + NotificationsUtils.isEnableV26(activity));
                 break;
             case "测试支付":
-                Jump2View.getInstance().goActPay(activity, "6460393611589586944", SpUtils.getToken(activity));
+                Jump2View.getInstance().goPay(activity, "6460393611589586944", SpUtils.getToken(activity));
                 break;
             case "测试内部h5": {
 //                Jump2View.getInstance().goWeb(activity, StringUtils.getCopyText().toString(), "小绵羊官网");

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

@@ -87,6 +87,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
 
+import static com.sheep.gamegroup.view.activity.ActPay.RESULT_CODE;
+
 /**
  * Created by realicing on 2018/11/23.
  * realicing@sina.com
@@ -449,6 +451,15 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
+    public void onPayCompleted(String orderNo, int status){
+        Intent intent = new Intent();
+        intent.putExtra("orderno", orderNo);
+        intent.putExtra("status", status);
+        activity.setResult(RESULT_CODE, intent);
+        activity.finish();
+    }
+
+    @JavascriptInterface
     public void gotoPersonCenter() {
         Jump2View.getInstance().goPersonnalCenterView(activity, null);
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGameTaskOrderList.java

@@ -93,6 +93,8 @@ public class AdpGameTaskOrderList extends BaseAdapter {
             payType = "绵羊币(" + gameTaskOrderEnty.getAmount() +")";
         }
         holder.pay_type_tv.setText(payType);
+        ViewUtil.setText(holder.title_tv, gameTaskOrderEnty.getTitle());
+        ViewUtil.setVisibility(holder.title_tv, !TextUtils.isEmpty(gameTaskOrderEnty.getTitle()));
         holder.date_tv.setText("提交时间："+TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(gameTaskOrderEnty.getCreate_time()))+"");
         holder.price_tv.setText("提交金额："+gameTaskOrderEnty.getAmount());
         holder.order_type_tv.setText("订单状态：");
@@ -172,7 +174,7 @@ public class AdpGameTaskOrderList extends BaseAdapter {
 
     class ViewHolder{
         LinearLayout pay_layout;
-        TextView date_tv, price_tv, pay_type_tv,order_type_tv, order_end_time_tv, pay_tyoe_show_tv, pay_tv,pay_cancel_tv;
+        TextView title_tv, date_tv, price_tv, pay_type_tv,order_type_tv, order_end_time_tv, pay_tyoe_show_tv, pay_tv,pay_cancel_tv;
         ImageView question_img;
         View line_view;
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -20,6 +20,7 @@ public class Config {
     public final static String YF_SHOP_HOME_SHEEP = "http://shop.17xmy.com/mobile/?pf=android.sheep.app";//小绵羊加载的有范商城主页地址
     public final static String YF_SHOP_HOME_SHEEP_TEST = "http://t.shop.17xmy.com/mobile/?pf=android.sheep.app";//小绵羊加载的有范商城主页地址
     public static final String YF_SHOP_ORDER_NUMBER_KEY = "order_number";
+    public static final String YF_SHOP_ORDER_REDIRECT_URL = "redirect_url";
     public final static String PATH_YF_SHOP_ORDER = "user.php?act=order_list";
     public final static String PATH_YF_SHOP_CART = "flow.php";
     public final static String PATH_YF_SHOP_FOCUS = "user.php?act=collection_list";
@@ -44,6 +45,8 @@ public class Config {
     //游戏金币
     private static final String STATION_SMALL_SHEEP_GAME_COINS = "/small_sheep_game_coins/#";
     private static final String STATION_SMALL_SHEEP_GAME_COUPON = "/small_sheep_coupon/#";
+    //统一支付
+    private static final String STATION_SMALL_SHEEP_PAYMENT = "/small_sheep_payment/#";
     //定向奖励
     private static final String STATION_APPOINT_TASK = "/appoint_task/#";
     //随便打
@@ -80,6 +83,10 @@ public class Config {
     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";
+    //统一支付小绵羊内部
+    public static final String PATH_PAYMENT_PAYMENT = STATION_SMALL_SHEEP_PAYMENT + "/payment";
+    //统一支付小绵羊外部 如：有饭商城
+    public static final String PATH_PAYMENT_PAY = STATION_SMALL_SHEEP_PAYMENT + "/pay";
     //我的卡包
     public static final String PATH_MY_CARD = STATION_IQIYI_VIP_MEMBER + "/my-card-bag";
     //大转盘地址 key

app/src/main/res/layout/adp_gametask_order_layout.xml

@@ -8,6 +8,10 @@
     android:layout_margin="@dimen/common_margin_10">
 
     <TextView
+        android:id="@+id/title_tv"
+        style="@style/style_nomal_tv" />
+
+    <TextView
         android:id="@+id/date_tv"
         style="@style/style_nomal_tv"
         android:text="提交时间："/>