directational h5 pay

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,26 +21,26 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        AcceptTaskRecordDao.createTable(db, ifNotExists);
-        AccountDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        DownLoadInfoDao.createTable(db, ifNotExists);
         ProcessRecordDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         SdkLoginUserDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        AcceptTaskRecordDao.createTable(db, ifNotExists);
+        AccountDao.createTable(db, ifNotExists);
         SearchRecordDao.createTable(db, ifNotExists);
+        DownLoadInfoDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        AcceptTaskRecordDao.dropTable(db, ifExists);
-        AccountDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        DownLoadInfoDao.dropTable(db, ifExists);
         ProcessRecordDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         SdkLoginUserDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        AcceptTaskRecordDao.dropTable(db, ifExists);
+        AccountDao.dropTable(db, ifExists);
         SearchRecordDao.dropTable(db, ifExists);
+        DownLoadInfoDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(AcceptTaskRecordDao.class);
-        registerDaoClass(AccountDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(DownLoadInfoDao.class);
         registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(AcceptTaskRecordDao.class);
+        registerDaoClass(AccountDao.class);
         registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(DownLoadInfoDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
-import com.sheep.gamegroup.greendao.download.Account;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
+import com.sheep.gamegroup.greendao.download.Account;
 import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
-import com.sheep.gamegroup.greendao.download.AccountDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
 import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
+import com.sheep.gamegroup.greendao.download.AccountDao;
 import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.SearchRecordDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig acceptTaskRecordDaoConfig;
-    private final DaoConfig accountDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig downLoadInfoDaoConfig;
     private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig acceptTaskRecordDaoConfig;
+    private final DaoConfig accountDaoConfig;
     private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig downLoadInfoDaoConfig;
 
-    private final AcceptTaskRecordDao acceptTaskRecordDao;
-    private final AccountDao accountDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final DownLoadInfoDao downLoadInfoDao;
     private final ProcessRecordDao processRecordDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final SdkLoginUserDao sdkLoginUserDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final AcceptTaskRecordDao acceptTaskRecordDao;
+    private final AccountDao accountDao;
     private final SearchRecordDao searchRecordDao;
+    private final DownLoadInfoDao downLoadInfoDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
-        accountDao = new AccountDao(accountDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
         processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
+        accountDao = new AccountDao(accountDaoConfig, this);
         searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
 
-        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
-        registerDao(Account.class, accountDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(DownLoadInfo.class, downLoadInfoDao);
         registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
+        registerDao(Account.class, accountDao);
         registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(DownLoadInfo.class, downLoadInfoDao);
     }
     
     public void clear() {
-        acceptTaskRecordDaoConfig.clearIdentityScope();
-        accountDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        downLoadInfoDaoConfig.clearIdentityScope();
         processRecordDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         sdkLoginUserDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        acceptTaskRecordDaoConfig.clearIdentityScope();
+        accountDaoConfig.clearIdentityScope();
         searchRecordDaoConfig.clearIdentityScope();
+        downLoadInfoDaoConfig.clearIdentityScope();
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
-    }
-
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public ScreenShotRecordDao getScreenShotRecordDao() {
         return screenShotRecordDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
+    }
+
 }

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

@@ -16,6 +16,8 @@ public class WebParams implements Serializable {
     private String title = "加载中";//页面默认标题
     private boolean needJsInteract = true;
     private boolean showTitle = true;
+    private boolean forResult = false;
+    private int action;
     private String tokenKey = "authorization";
 
     public WebParams(String url) {
@@ -43,6 +45,15 @@ public class WebParams implements Serializable {
         return this;
     }
 
+    public boolean isForResult() {
+        return forResult;
+    }
+
+    public WebParams setForResult(boolean forResult) {
+        this.forResult = forResult;
+        return this;
+    }
+
     public WebParams setTokenKey(String tokenKey) {
         this.tokenKey = tokenKey;
         return this;
@@ -66,6 +77,15 @@ public class WebParams implements Serializable {
         return this;
     }
 
+    public int getAction() {
+        return action;
+    }
+
+    public WebParams setAction(int action) {
+        this.action = action;
+        return this;
+    }
+
     public String getUrl() {
         return url;
     }

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

@@ -995,7 +995,11 @@ public class Jump2View {
         webParams.setUrl(url);
         Intent intent = new Intent(context, ActWebX5.class);
         intent.putExtra(WebParams.class.getSimpleName(), webParams);
-        context.startActivity(intent);
+        if(webParams.isForResult()){
+            ((Activity)context).startActivityForResult(intent, webParams.getAction());
+        } else {
+            context.startActivity(intent);
+        }
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.util.js;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.text.TextUtils;
 import android.webkit.JavascriptInterface;
 
@@ -116,12 +117,27 @@ public class KFZSJs {
         shareLink(url, null, null, null, type);
         return "";
     }
+
+    @JavascriptInterface
+    public void paymentCompleted(String from, boolean ret, String msg, String orderNo) {
+        if (from.equals("sdk")) {
+            Intent intent = new Intent();
+            intent.putExtra("ret", ret);
+            intent.putExtra("msg", msg);
+            intent.putExtra("order_no", orderNo);
+            activity.setResult(Activity.RESULT_OK);
+            activity.setIntent(intent);
+        }
+        activity.finish();
+    }
+
     //h5调用分享 window.kfzsjs.shareLink(link, iconUrl, title, des);
     @JavascriptInterface
     public void shareLink(String link, String iconUrl, String title, String des) {
         shareLink(link, iconUrl, title, des, ShareLinkConfig.ALL);
     }
-    private void shareLink(String link, String iconUrl, String title, String des,@ShareLinkConfig.SHARE_TYPE String shareType) {
+
+    private void shareLink(String link, String iconUrl, String title, String des, @ShareLinkConfig.SHARE_TYPE String shareType) {
         activity.runOnUiThread(() -> new ShareLinkConfig().setLink(link).setIconUrl(iconUrl).setTitle(title).setDes(des).setShareType(shareType).toShare(activity));
     }
 
@@ -142,10 +158,12 @@ public class KFZSJs {
     public String getIMEI() {
         return DeviceUtil.getDeviceId(SheepApp.getInstance());
     }
+
     @JavascriptInterface
     public String getPhoneModel() {
         return SysAppUtil.getSystemModel();
     }
+
     @JavascriptInterface
     public void showTitleBar(final boolean isShow) {
         activity.runOnUiThread(new Runnable() {
@@ -175,6 +193,7 @@ public class KFZSJs {
             }
         });
     }
+
     @JavascriptInterface
     public void skip2QQ() {
         ApiUtil.getNewAboutUsComplainQq(new Action1<String>() {
@@ -194,9 +213,10 @@ public class KFZSJs {
             }
         });
     }
+
     @JavascriptInterface
     public void setH5Type(final String h5Type) {
-        if(h5Type == null)
+        if (h5Type == null)
             return;
         activity.runOnUiThread(new Runnable() {
             @Override
@@ -207,7 +227,7 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
-    public void alipay(String payInfo, boolean b){
+    public void alipay(String payInfo, boolean b) {
         CommonUtil.getInstance().alipay(activity, payInfo, b, new AbsObserver<String>() {
             @Override
             public void onNext(String result) {
@@ -220,35 +240,38 @@ public class KFZSJs {
             }
         });
     }
+
     @JavascriptInterface
-    public void postMissionApply(int root_id){
+    public void postMissionApply(int root_id) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("root_id", root_id);
         SheepApp.getInstance().getNetComponent().getApiService().postMissionApply(jsonObject)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                            }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                    }
 
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                G.showToast(baseMessage);
-                            }
-                        });
-        switch (root_id){
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                    }
+                });
+        switch (root_id) {
             case 2://领取元旦活动后，跳转邀请界面
                 Jump2View.getInstance().goActInvitation(activity);
                 break;
         }
     }
+
     @JavascriptInterface
-    public void buyVip(int level, int pay_type){
+    public void buyVip(int level, int pay_type) {
         buyVip(activity, new BuyVipReq());
     }
+
     //购买vip
-    public static void buyVip(Activity activity, BuyVipReq item){
+    public static void buyVip(Activity activity, BuyVipReq item) {
         ApiJSONUtil.postBuyVip(item.getLevel(), item.getPay_type())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
@@ -259,13 +282,13 @@ public class KFZSJs {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         TempUserResp result = baseMessage.getData(TempUserResp.class);
-                        if(result != null && !TextUtils.isEmpty(result.getPay_url())) {
-                            switch (item.getPay_type()){
+                        if (result != null && !TextUtils.isEmpty(result.getPay_url())) {
+                            switch (item.getPay_type()) {
                                 case BuyVipReq.PAY_TYPE_ALIPAY:
                                     CommonUtil.getInstance().alipay(activity, result.getPay_url(), true, new AbsObserver<String>() {
                                         @Override
                                         public void onNext(String result) {
-                                            switch (result){
+                                            switch (result) {
                                                 case "9000":
                                                     G.showToast(R.string.pay_success);
                                                     break;

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

@@ -23,9 +23,11 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
+import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Lp;
 import com.sheep.gamegroup.model.entity.UserAssets;
+import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeBalanceLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeLog;
@@ -39,9 +41,11 @@ import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
+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 com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.afinal.simplecache.ApiKey;
@@ -102,11 +106,13 @@ public class ActMyMoney extends BaseActivity {
     protected int getLayoutId() {
         return R.layout.act_my_money;
     }
+
     public static final String[] tabNames = {"充值记录", "提现记录", "收支明细"};
+
     @Override
     public void initView() {
         TitleBarUtils.getInstance()
-                .setTitle(this,"我的资产")
+                .setTitle(this, "我的资产")
                 .setTitleFinish(this);
         //顶部背景添加弧度
         GlideImageLoader.setImage(act_my_money_bg_iv, ViewUtil.getNetImgByName("home_blue_bg_hb"), R.mipmap.home_blue_bg);
@@ -116,7 +122,7 @@ public class ActMyMoney extends BaseActivity {
         mAdapter.add(new FgtRechargeLog(), tabNames[2]);
         for (int i = 0; i < mAdapter.getCount(); i++) {
             Fragment fragment = mAdapter.getItem(i);
-            if(fragment instanceof BaseRefreshLoadMoreFragment){
+            if (fragment instanceof BaseRefreshLoadMoreFragment) {
                 ((BaseRefreshLoadMoreFragment) fragment).setSmartRefreshLayout(refresh);
             }
         }
@@ -146,13 +152,14 @@ public class ActMyMoney extends BaseActivity {
 //            }
 //        });
     }
-    private void new_tab(){
+
+    private void new_tab() {
         indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[0], true)));
         indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[1], true)));
         indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[2], false)));
         //Tablayout自定义view绑定ViewPager
         viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
-        indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager){
+        indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager) {
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
                 super.onTabReselected(tab);
@@ -183,13 +190,16 @@ public class ActMyMoney extends BaseActivity {
         });
 
     }
+
     private int refreshDataCount = 0;
+
     //刷新数据
-    public void refreshData(){
+    public void refreshData() {
         refreshData(viewPager.getCurrentItem());
     }
+
     //刷新数据
-    public void refreshData(int position){
+    public void refreshData(int position) {
         boolean isRefresh = false;
         if (refreshDataCount != 0) {
             Fragment item = mAdapter.getItem(position);
@@ -199,9 +209,10 @@ public class ActMyMoney extends BaseActivity {
             }
         }
         refreshDataCount++;
-        if(!isRefresh)
+        if (!isRefresh)
             notifyDataSetChanged();
     }
+
     //加载更多数据
     private void loadMoreData() {
         Fragment item = mAdapter.getItem(viewPager.getCurrentItem());
@@ -219,11 +230,11 @@ public class ActMyMoney extends BaseActivity {
         }
     }
 
-    private View tab_icon(String name,boolean isShow){
-        View newtab =  LayoutInflater.from(this).inflate(R.layout.tab_item,null);
+    private View tab_icon(String name, boolean isShow) {
+        View newtab = LayoutInflater.from(this).inflate(R.layout.tab_item, null);
         TextView tv = newtab.findViewById(R.id.tabtext);
         View tab_line = newtab.findViewById(R.id.tab_line);
-        tab_line.setVisibility(isShow ? View.VISIBLE: View.INVISIBLE);
+        tab_line.setVisibility(isShow ? View.VISIBLE : View.INVISIBLE);
         tv.setText(name);
         return newtab;
     }
@@ -236,7 +247,12 @@ public class ActMyMoney extends BaseActivity {
     public void initListener() {
 
     }
-    @OnClick({ R.id.my_money_withdraw_tv, R.id.my_money_recharge_tv, R.id.my_money_dingxiang_amount_iv})
+
+    @OnClick({R.id.my_money_withdraw_tv,
+            R.id.my_money_recharge_tv,
+            R.id.my_money_dingxiang_amount_iv,
+            R.id.my_money_dingxiang_amount,
+            R.id.my_money_dingxiang_tag})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.my_money_withdraw_tv://提现
@@ -246,41 +262,46 @@ public class ActMyMoney extends BaseActivity {
                 Jump2View.getInstance().goRechargeAct(ActMyMoney.this, "我的资产");
                 break;
             case R.id.my_money_dingxiang_amount_iv://定向货币详情
-                ViewUtil.showOrienteeringDetails(ActMyMoney.this);
+            case R.id.my_money_dingxiang_amount://定向货币详情
+            case R.id.my_money_dingxiang_tag://定向货币详情
+                String url = Config.URL_DIRECTIONAL_LIST + "?authorization=" + SpUtils.getToken(this);
+                WebParams webParams = new WebParams(url, "定向消费").setShowTitle(false);
+                Jump2View.getInstance().goWeb(this, webParams);
                 break;
         }
     }
+
     @Override
     public void initData() {
         showProgress();
         resetData();
         SheepApp.getInstance().getNetComponent().getApiService().getMyAssets()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(this) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.MY_ASSETS);
-                                if(isNewData){
-                                    CommonUtil.getInstance().updateUserInfo(null);
-                                }
-                                UserAssets userAssets = baseMessage.getData(UserAssets.class);
-
-                                loadData(userAssets);
-                                hideProgress();
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                G.showToast(baseMessage);
-                                resetData();
-                                hideProgress();
-                            }
-                        });
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(this) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.MY_ASSETS);
+                        if (isNewData) {
+                            CommonUtil.getInstance().updateUserInfo(null);
+                        }
+                        UserAssets userAssets = baseMessage.getData(UserAssets.class);
+
+                        loadData(userAssets);
+                        hideProgress();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                        resetData();
+                        hideProgress();
+                    }
+                });
     }
 
     private void loadData(UserAssets userAssets) {
-        if(my_money_total_money == null){
+        if (my_money_total_money == null) {
             return;
         }
         my_money_total_money.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getSheep_bi_total())));
@@ -290,8 +311,9 @@ public class ActMyMoney extends BaseActivity {
         my_money_available_amount.setText(getString(R.string.available_amount, NumberFormatUtils.retainMost2W(userAssets.getCash_withdrawal())));
         my_money_dingxiang_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getDirectional_currency())));
     }
+
     private void resetData() {
-        if(my_money_total_money == null){
+        if (my_money_total_money == null) {
             return;
         }
         my_money_total_money.setText(getString(R.string.total_money, "0.00"));
@@ -301,6 +323,7 @@ public class ActMyMoney extends BaseActivity {
         my_money_available_amount.setText(getString(R.string.available_amount, "0.00"));
         my_money_dingxiang_amount.setText(getString(R.string.total_money, "0.00"));
     }
+
     //点击优惠购物
     public void onClickCoupons(View view) {
         Jump2View.getInstance().gotoYfShop(this);

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

@@ -12,13 +12,17 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.PayOrder;
+import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+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 java.util.List;
 import java.util.Locale;
@@ -31,8 +35,9 @@ import io.reactivex.schedulers.Schedulers;
  * realicing@sina.com
  * 支付界面
  */
-public class ActPay extends BaseActivity{
+public class ActPay extends BaseActivity {
 
+    public final static int ACTION_FOR_H5_PAY = 1003;
 
     @Override
     protected boolean needButterKnife() {
@@ -53,6 +58,7 @@ public class ActPay extends BaseActivity{
     private List<View> payOrderViewList = ListUtil.emptyList();
     private List<View> successViewList = ListUtil.emptyList();
     private List<View> failedViewList = ListUtil.emptyList();
+
     @Override
     public void initView() {
         ImageView title_img_back = findViewById(R.id.title_img_back);
@@ -87,6 +93,7 @@ public class ActPay extends BaseActivity{
         setViewListVisible(failedViewList, View.INVISIBLE);
         resetView();
     }
+
     //设置viewList中的view是否可见
     private void setViewListVisible(List<View> viewList, int visible) {
         for (View view : viewList) {
@@ -112,21 +119,21 @@ public class ActPay extends BaseActivity{
         Intent intent = getIntent();
         Bundle bundle = intent.getExtras();
         String order_no = null;
-        if(bundle != null) {
+        if (bundle != null) {
             order_no = bundle.getString("order_no");
             token = bundle.getString("token");
         }
-        if(TextUtils.isEmpty(order_no)){//传过来的数据有问题
+        if (TextUtils.isEmpty(order_no)) {//传过来的数据有问题
             status = STATUS_INIT_ERROR_ORDER_NO;
             G.showToast(R.string.coming_soon);
             return;
         }
-        if(TextUtils.isEmpty(order_no)){//传过来的数据有问题
+        if (TextUtils.isEmpty(order_no)) {//传过来的数据有问题
             status = STATUS_INIT_ERROR_TOKEN;
             G.showToast(R.string.coming_soon);
             return;
         }
-        if(BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG)
             G.showToast(String.format(Locale.CHINA, "%s\t%s", order_no, token));
         //初始化PayOrder
         SheepApp.getInstance().getNetComponent().getApiService().sdkFindOrder(token, order_no)
@@ -152,6 +159,7 @@ public class ActPay extends BaseActivity{
                     }
                 });
     }
+
     //加载PayOrder
     private void loadPayOrder() {
         ViewUtil.setText(pay_msg_tv, payOrder.getName());
@@ -160,6 +168,7 @@ public class ActPay extends BaseActivity{
         ViewUtil.setColorMapText(pay_amount2, amountText, "元", "#FFFFFF");
         ViewUtil.setText(pay_info, getString(R.string.sheep_order_no, payOrder.getName(), payOrder.getOrderNo()));
     }
+
     //点击底部按钮
     public void onClickBottomBtn(View view) {
         switch (status) {
@@ -191,7 +200,34 @@ public class ActPay extends BaseActivity{
                 break;
         }
     }
+
+    public void onDirectionalPayClicked(View v) {
+        String url = Config.URL_DIRECTIONAL_PAY + "?authorization=" + token + "&order=" + payOrder.getOrderNo();
+        WebParams webParams = new WebParams(url, "定向优惠").setShowTitle(false).setForResult(true).setAction(ACTION_FOR_H5_PAY);
+        Jump2View.getInstance().goWeb(this, webParams);
+    }
+
+    public void onActivityResult(int requestCode, int resultCode, Intent in) {
+        if (resultCode == RESULT_OK) {
+            if (requestCode == ACTION_FOR_H5_PAY) {
+                if (in.getBooleanExtra("ret", false)) {
+                    status = STATUS_PAY_ORDER_SUCCESS;
+                    showPaySuccess();
+                } else {
+                    status = STATUS_PAY_ORDER_ERROR;
+                    showPayFailed();
+                }
+                G.showToast(in.getStringExtra("msg"));
+                Intent intent = new Intent();
+                intent.putExtra(EXTRA_NAME_ORDERNO, in.getStringExtra("order_no"));
+                intent.putExtra(EXTRA_NAME_STATUS, status);
+                setResult(RESULT_CODE, intent);
+            }
+        }
+    }
+
     private String failedReason;
+
     //点击查看失败原因
     public void onClickFailedReason(View view) {
         G.showToast(failedReason);
@@ -201,6 +237,7 @@ public class ActPay extends BaseActivity{
     public void onBackPressed() {
         onClickCancel(null);
     }
+
     private int status = STATUS_INIT;//状态 正常状态大于0 错误状态小于0
     public static final int STATUS_INIT = 0;//初始状态
     public static final int STATUS_GET_ORDER_SUCCESS = 1;//获取order成功
@@ -210,6 +247,7 @@ public class ActPay extends BaseActivity{
     public static final int STATUS_INIT_ERROR_ORDER_NO = -3;//初始化时获取到的order_no为空
     public static final int STATUS_INIT_ERROR_TOKEN = -4;//初始化时获取到的token为空
     public static final int STATUS_GET_ORDER_SUCCESS_ERROR = -5;//获取order接口成功，但是无数据
+
     //点击返回
     public void onClickBackImg(View view) {
         onClickCancel(null);
@@ -217,7 +255,7 @@ public class ActPay extends BaseActivity{
 
     //取消订单
     public void onClickCancel(View view) {
-        if(status == STATUS_PAY_ORDER_SUCCESS || status < STATUS_INIT){//支付成功或者各种失败的情况下直接退出界面
+        if (status == STATUS_PAY_ORDER_SUCCESS || status < STATUS_INIT) {//支付成功或者各种失败的情况下直接退出界面
             setStatusResult();
             finish();
             return;
@@ -231,22 +269,26 @@ public class ActPay extends BaseActivity{
                     }
                 }));
     }
+
     public static final int RESULT_CODE = 666;
     public static final String EXTRA_NAME_STATUS = "status";
     public static final String EXTRA_NAME_ORDERNO = "orderno";
+
     //返回结果给sdk
-    private void setStatusResult(){
+    private void setStatusResult() {
         Intent intent = new Intent();
         intent.putExtra(EXTRA_NAME_ORDERNO, payOrder.getOrderNo());
         intent.putExtra(EXTRA_NAME_STATUS, status);
         setResult(RESULT_CODE, intent);
     }
+
     //展示支付失败界面
     private void showPayFailed() {
         setViewListVisible(payOrderViewList, View.INVISIBLE);
         setViewListVisible(failedViewList, View.VISIBLE);
         pay_commit.setText("返回商家");
     }
+
     //展示支付成功界面
     private void showPaySuccess() {
         setViewListVisible(payOrderViewList, View.INVISIBLE);

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

@@ -39,4 +39,7 @@ public class Config {
     //用户收货地址的 key
     public static final String KEY_USER_ADDRESS_URL = "user_address_url";
 
+    public static final String URL_DIRECTIONAL_LIST = "http://10.8.220.229:8080/#/game-list";
+    public static final String URL_DIRECTIONAL_PAY = "http://10.8.220.229:8080/#/payment";
+
 }

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

@@ -216,6 +216,7 @@
                             android:textSize="12sp" />
 
                         <TextView
+                            android:id="@+id/my_money_dingxiang_tag"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"

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

@@ -153,7 +153,7 @@
         android:id="@+id/pay_commit"
         android:layout_width="match_parent"
         android:layout_height="36dp"
-        android:layout_alignParentBottom="true"
+        android:layout_above="@+id/directional_pay_btn"
         android:layout_margin="12dp"
         android:background="@drawable/shape_blue_solid_rectangle_18"
         android:gravity="center"
@@ -162,6 +162,19 @@
         android:textColor="#ffffffff"
         android:textSize="18sp" />
 
+    <TextView
+        android:id="@+id/directional_pay_btn"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="12dp"
+        android:background="@drawable/shape_blue_solid_rectangle_18"
+        android:gravity="center"
+        android:text="定向优惠"
+        android:onClick="onDirectionalPayClicked"
+        android:textColor="#ffffffff"
+        android:textSize="18sp" />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"