google支付修改

This commit is contained in:
18401019693
2022-09-28 13:43:53 +08:00
parent 0d473bdd9f
commit 8d98c6b5cc
12 changed files with 635 additions and 309 deletions

View File

@@ -1,85 +1,56 @@
package com.yunbao.main.activity;
import static com.yunbao.common.CommonAppContext.logger;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.webkit.JavascriptInterface;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.SkuDetails;
import com.facebook.appevents.AppEventsConstants;
import com.google.android.gms.ads.identifier.AdvertisingIdClient;
import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
import com.google.android.gms.common.GooglePlayServicesRepairableException;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.GoogleBillingUtil;
import com.yunbao.common.utils.OnGoogleBillingListener;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.utils.GoogleBillingUtilNew;
import com.yunbao.main.R;
import com.yunbao.main.utils.HXLinePagerIndicator;
import com.yunbao.main.views.TestWebViewClient;
import net.lucode.hackware.magicindicator.MagicIndicator;
import net.lucode.hackware.magicindicator.buildins.UIUtil;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import static android.util.Log.i;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
@SuppressLint("ValidFragment")
public class GoogleFragment extends Fragment {
private View view;
public static String mOrderid,mProductId,MoneyUsds;
public static String mOrderid, mProductId, MoneyUsds;
private WebView rlWebview;
private String url;
String adid = null;
@SuppressLint("ValidFragment")
public GoogleFragment(String urls) {
url = urls;
Log.e("google","111aa");
Log.e("google", "111aa");
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
//通过参数中的布局填充获取对应布局
view =inflater.inflate(R.layout.activity_recharge,container,false);
view = inflater.inflate(R.layout.activity_recharge, container, false);
rlWebview = (WebView) view.findViewById(R.id.rlWebview);
Log.e("ttt",url);
Log.e("ttt", url);
rlWebview.loadUrl(url);
initGooglePay();
new Thread(new Runnable() {
@@ -87,7 +58,7 @@ public class GoogleFragment extends Fragment {
try {
try {
adid = AdvertisingIdClient.getAdvertisingIdInfo(getActivity()).getId();
Log.e("vssss",adid);
Log.e("vssss", adid);
} catch (IOException e) {
e.printStackTrace();
} catch (GooglePlayServicesNotAvailableException e) {
@@ -141,9 +112,9 @@ public class GoogleFragment extends Fragment {
// rlWebview.setWebContentsDebuggingEnabled(true);
rlWebview.addJavascriptInterface(new JsInteration(),"androidObject");
rlWebview.addJavascriptInterface(new JsInteration(), "androidObject");
TestWebViewClient testWebViewClient = new TestWebViewClient(getActivity(),rlWebview);
TestWebViewClient testWebViewClient = new TestWebViewClient(getActivity(), rlWebview);
rlWebview.setWebViewClient(testWebViewClient);
@@ -151,206 +122,221 @@ public class GoogleFragment extends Fragment {
}
String TAG = "GooglePay";
//我们自己的订单号
ProgressDialog progressDialog;
private void initGooglePay() {
GoogleBillingUtil.isDebug(true);
GoogleBillingUtil.setIsAutoAcknowledgePurchase(true);//设置自动确认购买
googleBillingUtil = GoogleBillingUtil.getInstance()
.addOnGoogleBillingListener(getActivity(), mOnMyGoogleBillingListener)
.build(getActivity());
// GoogleBillingUtil.isDebug(true);
// GoogleBillingUtil.setIsAutoAcknowledgePurchase(true);//设置自动确认购买
// googleBillingUtil = GoogleBillingUtil.getInstance()
// .addOnGoogleBillingListener(getActivity(), mOnMyGoogleBillingListener)
// .build(getActivity());
GoogleBillingUtilNew.getInstance().initGooglePay(getActivity());
}
private OnGoogleBillingListener mOnMyGoogleBillingListener=new OnGoogleBillingListener(){
@Override
public void onSetupSuccess(boolean isSelf) {
super.onSetupSuccess(isSelf);
Log.d(TAG,"内购服务初始化完成");
}
@Override
public void onQuerySuccess(@NonNull String skuType, @NonNull List<SkuDetails> list, boolean isSelf) {
googleBillingUtil.purchaseInApp(getActivity(),mProductId);
// private OnGoogleBillingListener mOnMyGoogleBillingListener = new OnGoogleBillingListener() {
// @Override
// public void onSetupSuccess(boolean isSelf) {
// super.onSetupSuccess(isSelf);
// Log.d(TAG, "内购服务初始化完成");
// }
//
// @Override
// public void onQuerySuccess(@NonNull String skuType, @NonNull List<SkuDetails> list, boolean isSelf) {
//
// googleBillingUtil.purchaseInApp(getActivity(), mProductId);
//
//
// }
//
// @Override
// public boolean onPurchaseSuccess(@NonNull Purchase purchase, boolean isSelf) {
// StringBuffer tempBuffer = new StringBuffer();
//
// if (progressDialog != null && progressDialog.isShowing()) {
// progressDialog.dismiss();
// }
// if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
// tempBuffer.append("购买成功:");
// Log.e(TAG, purchase.getOrderId() + "ProductId" + mProductId + "OrderNumber" + mOrderid);
//
// //通知自己服务器
//// if (mOrderid == null || purchase.getOrderId() == null){
//// return false;
//// }
//// googleBillingUtil.consumeAsync(GooglePayActivity.this,purchase.getPurchaseToken());
// CommonHttpUtil.notifyGoogle(purchase.getPurchaseToken(), purchase.getOrderId(), mProductId, mOrderid, adid, new HttpCallback() {
// @Override
// public void onSuccess(int code, String msg, String[] info) {
// if (code == 0) {
// try {
//// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=1";
//// rlWebview.loadUrl(r_url);
// Bundle params = new Bundle();
// params.putString("currency", "HKD");
// params.putString("money", MoneyUsds);
// logger.logEvent("FB_iap_Play", params);
//
//
// Bundle fb_params = new Bundle();
// fb_params.putString(AppEventsConstants.EVENT_PARAM_CURRENCY, "HKD");
// fb_params.putString(AppEventsConstants.EVENT_PARAM_CONTENT_ID, mProductId);
//
// //fb官方事件记录充值
// logger.logEvent(AppEventsConstants.EVENT_NAME_PURCHASED,
// Double.parseDouble(MoneyUsds),
// fb_params);
//
// //Google官方充值通知
// Bundle google_params = new Bundle();
// google_params.putString("currency", "HKD");
// google_params.putString("product_id", mProductId);
// google_params.putString("transaction_id", mOrderid);
// google_params.putString("value", MoneyUsds);
// google_params.putString("price", MoneyUsds);
// google_params.putString("quantity", "1");
//
// mFirebaseAnalytics.logEvent("FS_iap_Play", google_params);
//
//
// AdjustEvent adjustEvent1 = new AdjustEvent("cgssol");
// Adjust.trackEvent(adjustEvent1);
// CommonHttpUtil.setAdvertisingChannels("cgssol", new HttpCallback() {
// @Override
// public void onSuccess(int code, String msg, String[] info) {
// if (code == 0) {
// logger.logEvent("FB_iap_users", null);
// mFirebaseAnalytics.logEvent("FS_iap_users", null);
// }
// }
// });
//
//// AdjustEvent adjustEvent2 = new AdjustEvent("tr8lb9");
//// adjustEvent2.setRevenue(Double.parseDouble(MoneyUsds),"HKD");
//// adjustEvent2.addCallbackParameter("GOrderid",purchase.getOrderId());
//// adjustEvent2.addCallbackParameter("POrderid",mOrderid);
//// adjustEvent2.addCallbackParameter("Uid",CommonAppConfig.getInstance().getUid());
//// adjustEvent2.addCallbackParameter("GADid",adid);
//// adjustEvent2.setOrderId(mOrderid);
//// Adjust.trackEvent(adjustEvent2);
//
// ToastUtil.show("购买成功");
// getActivity().onBackPressed();
// } catch (Exception e) {
// e.printStackTrace();
// }
// } else {
//// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=0";
//// rlWebview.loadUrl(r_url);
// ToastUtil.show("购买失败,请联系客服");
// getActivity().onBackPressed();
// }
// }
// });
//
// } else {
//
// progressDialog.setTitle("正在處理");
// progressDialog.setMessage("系統檢測到您的卡是慢速卡,正在處理您的訂單,大概需要一分鐘,請勿離開,若因離開此頁面導致支付失敗,請聯系在線客服");
// progressDialog.setCancelable(false);
// progressDialog.show();
// tempBuffer.append("暂未支付:");
// }
// String details = String.format(Locale.getDefault(), "%s \n", purchase.getSku());
// tempBuffer.append(details);
// Log.d(TAG, tempBuffer.toString());
// return true;//自动消耗(只有当isSelf为true,并且支付状态为PURCHASED时该值才会生效)
// }
//
// @Override
// public boolean onRecheck(@NonNull String skuType, @NonNull Purchase purchase, boolean isSelf) {
// StringBuffer tempBuffer = new StringBuffer();
// tempBuffer.append("检测到未处理的订单($skuType):${purchase.sku}()");
// Log.d(TAG, tempBuffer.toString());
// return true;
// }
//
// @Override
// public void onBillingServiceDisconnected() {
// super.onBillingServiceDisconnected();
// }
//
// @Override
// public void onConsumeSuccess(@NonNull String purchaseToken, boolean isSelf) {
// Log.d(TAG, "消耗商品成功:$purchaseToken");
//
// }
//
// @Override
// public void onAcknowledgePurchaseSuccess(boolean isSelf) {
// Log.d(TAG, "确认购买商品成功");
//
// }
//
// @Override
// public void onFail(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, int responseCode, boolean isSelf) {
// Log.d(TAG, "操作失败:tag=${" + tag.name() + "responseCode=" + responseCode);
//// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=0";
//// rlWebview.loadUrl(r_url);
//// ToastUtil.show("购买失败,请联系客服");
//
// }
//
// @Override
// public void onError(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, boolean isSelf) {
// Log.d(TAG, "发生错误:tag=" + tag.name());
//// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=0";
//// rlWebview.loadUrl(r_url);
//// ToastUtil.show("购买失败,请联系客服");
// }
//
// };
}
@Override
public boolean onPurchaseSuccess(@NonNull Purchase purchase, boolean isSelf) {
StringBuffer tempBuffer =new StringBuffer();
if(progressDialog!=null&&progressDialog.isShowing()){
progressDialog.dismiss();
}
if(purchase.getPurchaseState()==Purchase.PurchaseState.PURCHASED){
tempBuffer.append("购买成功:");
Log.e(TAG,purchase.getOrderId()+"ProductId"+mProductId+"OrderNumber"+mOrderid);
//通知自己服务器
// if (mOrderid == null || purchase.getOrderId() == null){
// return false;
// }
// googleBillingUtil.consumeAsync(GooglePayActivity.this,purchase.getPurchaseToken());
CommonHttpUtil.notifyGoogle(purchase.getPurchaseToken(),purchase.getOrderId(),mProductId,mOrderid, adid,new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if(code==0){
try {
// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=1";
// rlWebview.loadUrl(r_url);
Bundle params = new Bundle();
params.putString("currency", "HKD");
params.putString("money", MoneyUsds);
logger.logEvent("FB_iap_Play", params);
Bundle fb_params = new Bundle();
fb_params.putString(AppEventsConstants.EVENT_PARAM_CURRENCY, "HKD");
fb_params.putString(AppEventsConstants.EVENT_PARAM_CONTENT_ID,mProductId);
//fb官方事件记录充值
logger.logEvent(AppEventsConstants.EVENT_NAME_PURCHASED,
Double.parseDouble(MoneyUsds),
fb_params);
//Google官方充值通知
Bundle google_params = new Bundle();
google_params.putString("currency", "HKD");
google_params.putString("product_id",mProductId);
google_params.putString("transaction_id",mOrderid);
google_params.putString("value",MoneyUsds);
google_params.putString("price",MoneyUsds);
google_params.putString("quantity","1");
mFirebaseAnalytics.logEvent("FS_iap_Play", google_params);
AdjustEvent adjustEvent1 = new AdjustEvent("cgssol");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("cgssol", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if(code == 0) {
logger.logEvent("FB_iap_users", null);
mFirebaseAnalytics.logEvent("FS_iap_users", null);
}
}
});
// AdjustEvent adjustEvent2 = new AdjustEvent("tr8lb9");
// adjustEvent2.setRevenue(Double.parseDouble(MoneyUsds),"HKD");
// adjustEvent2.addCallbackParameter("GOrderid",purchase.getOrderId());
// adjustEvent2.addCallbackParameter("POrderid",mOrderid);
// adjustEvent2.addCallbackParameter("Uid",CommonAppConfig.getInstance().getUid());
// adjustEvent2.addCallbackParameter("GADid",adid);
// adjustEvent2.setOrderId(mOrderid);
// Adjust.trackEvent(adjustEvent2);
ToastUtil.show("购买成功");
getActivity().onBackPressed();
}catch (Exception e){
e.printStackTrace();
}
}else {
// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=0";
// rlWebview.loadUrl(r_url);
ToastUtil.show("购买失败,请联系客服");
getActivity().onBackPressed();
}
}
});
}else{
progressDialog.setTitle("正在處理");
progressDialog.setMessage("系統檢測到您的卡是慢速卡,正在處理您的訂單,大概需要一分鐘,請勿離開,若因離開此頁面導致支付失敗,請聯系在線客服");
progressDialog.setCancelable(false);
progressDialog.show();
tempBuffer.append("暂未支付:");
}
String details = String.format(Locale.getDefault(),"%s \n", purchase.getSku());
tempBuffer.append(details);
Log.d(TAG,tempBuffer.toString());
return true ;//自动消耗(只有当isSelf为true,并且支付状态为PURCHASED时该值才会生效)
}
@Override
public boolean onRecheck(@NonNull String skuType, @NonNull Purchase purchase, boolean isSelf) {
StringBuffer tempBuffer =new StringBuffer();
tempBuffer.append("检测到未处理的订单($skuType):${purchase.sku}()");
Log.d(TAG,tempBuffer.toString());
return true;
}
@Override
public void onBillingServiceDisconnected() {
super.onBillingServiceDisconnected();
}
@Override
public void onConsumeSuccess(@NonNull String purchaseToken, boolean isSelf) {
Log.d(TAG,"消耗商品成功:$purchaseToken");
}
@Override
public void onAcknowledgePurchaseSuccess(boolean isSelf) {
Log.d(TAG,"确认购买商品成功");
}
@Override
public void onFail(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, int responseCode, boolean isSelf) {
Log.d(TAG,"操作失败:tag=${" + tag.name() + "responseCode=" + responseCode);
// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=0";
// rlWebview.loadUrl(r_url);
// ToastUtil.show("购买失败,请联系客服");
}
@Override
public void onError(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, boolean isSelf) {
Log.d(TAG,"发生错误:tag="+tag.name());
// String r_url = CommonAppConfig.HOST +"?g=Appapi&m=Mall&a=paysuss&status=0";
// rlWebview.loadUrl(r_url);
// ToastUtil.show("购买失败,请联系客服");
}
};
private GoogleBillingUtil googleBillingUtil;
// private GoogleBillingUtil googleBillingUtil;
//js调用原生
public class JsInteration {
@JavascriptInterface
public void androidNewGoToGooglePay(String ProductId, String OrderNumber,String MoneyUsd) {
Log.e(TAG,"ProductId"+ProductId+"OrderNumber"+OrderNumber+"MoneyUsd"+MoneyUsd);
public void androidNewGoToGooglePay(String ProductId, String OrderNumber, String MoneyUsd) {
Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
mProductId = ProductId;
mOrderid = OrderNumber;
MoneyUsds = MoneyUsd;
googleBillingUtil.purchaseInApp(getActivity(),mProductId);
// googleBillingUtil.purchaseInApp(getActivity(), mProductId);
GoogleBillingUtilNew.getInstance().setBillingListener(new GoogleBillingUtilNew.GoogleBillingListener() {
@Override
public void onPaySuccess(List<Purchase> list) {
for (Purchase purchase : list) {
Log.e("谷歌支付", purchase.toString());
}
}
@Override
public void onPayFailed(int code, String msg) {
}
}).checkSku(ProductId)
;
//下单
Bundle params = new Bundle();
params.putString(AppEventsConstants.EVENT_PARAM_CONTENT_ID, mProductId);
params.putString(AppEventsConstants.EVENT_PARAM_CURRENCY, "HKD");
logger.logEvent(AppEventsConstants.EVENT_NAME_INITIATED_CHECKOUT,Double.parseDouble(MoneyUsds),
logger.logEvent(AppEventsConstants.EVENT_NAME_INITIATED_CHECKOUT, Double.parseDouble(MoneyUsds),
params);
}
@JavascriptInterface
public void androidMethodBack() {
getActivity().onBackPressed();
}
@JavascriptInterface
public void androidGoBack() {
getActivity().onBackPressed();
@@ -358,14 +344,12 @@ public class GoogleFragment extends Fragment {
}
public void release() {
if (googleBillingUtil != null){
googleBillingUtil.onDestroy(getActivity());
//退出程序的时候可以调用(实验性)
GoogleBillingUtil.endConnection();
}
// if (googleBillingUtil != null) {
// googleBillingUtil.onDestroy(getActivity());
// //退出程序的时候可以调用(实验性)
// GoogleBillingUtil.endConnection();
// }
}
}

View File

@@ -211,7 +211,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
// });
List<Purchase> data = googleBillingUtil.queryPurchasesInApp(MainActivity.this);
if(data!=null&&data.size()>0) {
Log.e(TAG, data.get(0).getSku());
Log.e(TAG," data.get(0).getSku()");
}
}
@@ -237,7 +237,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
tempBuffer.append("暂未支付:");
}
String details = String.format(Locale.getDefault(), "%s \n", purchase.getSku());
String details = String.format(Locale.getDefault(), "%s \n", "purchase.getSku()");
tempBuffer.append(details);
Log.d(TAG, tempBuffer.toString());
return true;//自动消耗(只有当isSelf为true,并且支付状态为PURCHASED时该值才会生效)
@@ -246,9 +246,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public boolean onRecheck(@NonNull String skuType, @NonNull Purchase purchase, boolean isSelf) {
Log.e(TAG, purchase.getSku() + "s" + purchase.getOrderId() + "sds" + purchase.getPurchaseToken());
Log.e(TAG, "purchase.getSku()" + "s" + purchase.getOrderId() + "sds" + purchase.getPurchaseToken());
//谷歌掉单处理
CommonHttpUtil.Google_sec_pay(purchase.getPurchaseToken(), purchase.getOrderId(), purchase.getSku(), new HttpCallback() {
CommonHttpUtil.Google_sec_pay(purchase.getPurchaseToken(), purchase.getOrderId(), "purchase.getSku()", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {

View File

@@ -1,25 +1,34 @@
package com.yunbao.main.activity;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import android.content.Context;
import android.graphics.Color;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Handler;
import android.util.Log;
import android.view.View;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.android.billingclient.api.BillingResult;
import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.PurchasesResponseListener;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.fragment.LoadingDialog;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.GoogleBillingUtilNew;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
@@ -35,15 +44,15 @@ import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTit
import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import java.util.List;
@Route(path = RouteUtil.PATH_COIN)
public class MyWalletActivity extends AbsActivity {
ViewPager vp_content;
static MyWalletActivity mw;
Fragment[] fragments = null;
private Handler payHandler = new Handler();
@Override
protected int getLayoutId() {
return R.layout.activity_my_wallet;
@@ -51,6 +60,7 @@ public class MyWalletActivity extends AbsActivity {
@Override
protected void main() {
super.main();
mw = MyWalletActivity.this;
setTitle(WordUtil.getString(R.string.wallet));
@@ -58,38 +68,73 @@ public class MyWalletActivity extends AbsActivity {
Adjust.trackEvent(adjustEvent1);
mFirebaseAnalytics.logEvent("FS_initiated_checkout", null);
logger.logEvent("FB_initiated_checkout");
vp_content = (ViewPager)findViewById(R.id.vp_content);
GoogleBillingUtilNew.getInstance().initGooglePay(mContext);
vp_content = (ViewPager) findViewById(R.id.vp_content);
TextView rView = (TextView) findViewById(R.id.rView);
rView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
rView.setOnClickListener(v -> {
LoadingDialog loadingDialog = new LoadingDialog();
loadingDialog.show(getSupportFragmentManager(), "LoadingDialog");
loadingDialog.setShowText(getString(R.string.order_query));
GoogleBillingUtilNew.getInstance().queryPurchasesAsync(new PurchasesResponseListener() {
@Override
public void onQueryPurchasesResponse(@NonNull BillingResult billingResult, @NonNull List<Purchase> list) {
if (list.size() == 0) {
loadingDialog.setShowText(getString(R.string.order_query_success));
payHandler.postDelayed(() -> loadingDialog.dismiss(), 2000);
} else {
loadingDialog.setShowText(getString(R.string.order_query));
//消费订单
GoogleBillingUtilNew.getInstance().consume(list);
for (int i = 0; i < list.size(); i++) {
int finalI = i;
payHandler.post(new Runnable() {
@Override
public void run() {
//谷歌掉单处理
CommonHttpUtil
.Google_sec_pay(list.get(finalI).getPurchaseToken(),
list.get(finalI).getOrderId(),
list.get(finalI).getProducts().toString(),
new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (finalI == list.size() - 1) {
loadingDialog.setShowText(getString(R.string.order_query_success));
payHandler.postDelayed(() -> loadingDialog.dismiss(), 2000);
}
}
});
}
});
}
}
}
}
});
});
final String[] titles = {WordUtil.getString(R.string.diamond), WordUtil.getString(R.string.coins),WordUtil.getString(R.string.golden_beans)};
if(getIntent().getStringExtra("tag")!=null) {
Log.i("tss","首充");
final String[] titles = {WordUtil.getString(R.string.diamond), WordUtil.getString(R.string.coins), WordUtil.getString(R.string.golden_beans)};
if (getIntent().getStringExtra("tag") != null) {
Log.i("tss", "首充");
if (CommonAppConfig.IS_GOOGLE_PLAY == false) {
//链接版本
fragments = new Fragment[]{new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
// fragments = new Fragment[]{new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
}else{
} else {
rView.setVisibility(View.VISIBLE);
fragments = new Fragment[]{new GoogleFragment( CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+"&package_name=pd"),
new GoogleFragment(CommonAppConfig.HOST +"/index.php?g=Appapi&m=Mall&a=googlepaygole&uid="+CommonAppConfig.getInstance().getUid()+"&token="+CommonAppConfig.getInstance().getToken()+"&package_name=pd"),
fragments = new Fragment[]{new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"),
new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"),
new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
}
}else{
} else {
if (CommonAppConfig.IS_GOOGLE_PLAY == false) {
Log.i("tss", "不是首充");
//链接版本
fragments = new Fragment[]{new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()), new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
}else{
} else {
rView.setVisibility(View.VISIBLE);
fragments = new Fragment[]{new GoogleFragment( CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+"&package_name=pd"),
new GoogleFragment(CommonAppConfig.HOST +"/index.php?g=Appapi&m=Mall&a=googlepaygole&uid="+CommonAppConfig.getInstance().getUid()+"&token="+CommonAppConfig.getInstance().getToken()+"&package_name=pd"),
fragments = new Fragment[]{new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"),
new GoogleFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"),
new WalletFragment(CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken())};
}
}
@@ -108,7 +153,7 @@ public class MyWalletActivity extends AbsActivity {
ColorTransitionPagerTitleView colorTransitionPagerTitleView = new ColorTransitionPagerTitleView(context);
colorTransitionPagerTitleView.setNormalColor(Color.GRAY);
colorTransitionPagerTitleView.setSelectedColor(Color.BLACK);
colorTransitionPagerTitleView.setTextAppearance(MyWalletActivity.this,R.style.TabLayoutTextStyle);
colorTransitionPagerTitleView.setTextAppearance(MyWalletActivity.this, R.style.TabLayoutTextStyle);
colorTransitionPagerTitleView.setText(titles[index]);
colorTransitionPagerTitleView.setOnClickListener(new View.OnClickListener() {
@Override
@@ -139,6 +184,7 @@ public class MyWalletActivity extends AbsActivity {
public Fragment getItem(int position) {
return fragments[position];
}
@Override
public int getCount() {
return fragments.length;
@@ -150,11 +196,12 @@ public class MyWalletActivity extends AbsActivity {
}
});
ViewPagerHelper.bind(magicIndicator, vp_content);
magicIndicator.onPageSelected(getIntent().getIntExtra("p",0));
vp_content.setCurrentItem(getIntent().getIntExtra("p",0));
magicIndicator.onPageSelected(getIntent().getIntExtra("p", 0));
vp_content.setCurrentItem(getIntent().getIntExtra("p", 0));
}
public static void dis(){
public static void dis() {
mw.finish();
}