yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改中英文

Browse Source
This commit is contained in:
18401019693
2023-10-12 16:19:27 +08:00
parent e081f1e058
commit c5d537fb4d
96 changed files with 319 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java
View File

@@ -129,7 +129,7 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(mContext.getString(R.string.net_error));
}
});
}

3
common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java
View File

@@ -13,6 +13,7 @@ import com.yunbao.common.bean.WishModel;
import com.yunbao.common.event.LiveNewWishListCloseEvent;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.DayWishItemViewHolder;
import com.yunbao.common.views.LunarWishItemViewHolder;
import com.yunbao.common.views.SeasonalWishItemViewHolder;
@@ -53,7 +54,7 @@ public class LiveNewWishAdapter extends RecyclerView.Adapter {
if (wishList.get(i)!=null){
if (!TextUtils.isEmpty(wishList.get(i).getLid()) && !TextUtils.isEmpty(model.getLid())
&& TextUtils.equals(wishList.get(i).getLid(), model.getLid())) {
ToastUtil.show(R.string.too_many_gifts);
ToastUtil.show(WordUtil.isNewZh()?"重複添加禮物":"Too many gifts");
isAdd = true;
}
}

5
common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java
View File

@@ -17,7 +17,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
import com.scwang.smartrefresh.layout.header.ClassicsHeader;
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.yunbao.common.R;
@@ -188,7 +187,7 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
if (mRecyclerView != null) {
RecyclerView.Adapter adapter = mRecyclerView.getAdapter();
if (adapter != null && adapter.getItemCount() > 0) {
ToastUtil.show(R.string.load_failure);
ToastUtil.show(mContext.getString(R.string.load_failure));
} else {
mLoadFailureView.setVisibility(View.VISIBLE);
}
@@ -196,7 +195,7 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
mLoadFailureView.setVisibility(View.VISIBLE);
}
} else {
ToastUtil.show(R.string.load_failure);
ToastUtil.show(mContext.getString(R.string.load_failure));
}
}
if (mDataHelper != null) {

3
common/src/main/java/com/yunbao/common/dialog/LiveNewRolePopup.java
View File

@@ -14,6 +14,7 @@ import com.yunbao.common.event.LiveNewRoleEvent;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -59,7 +60,7 @@ public class LiveNewRolePopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}

10
common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
View File

@@ -155,7 +155,7 @@ public class LiveNewWishListFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
} else if (wishList2.size() == 1) {
@@ -175,7 +175,7 @@ public class LiveNewWishListFragment extends BaseFragment {
public void onCancel() {
if (wishList2.size() > 10) {
ToastUtil.show(R.string.must_hint);
ToastUtil.show(getActivity().getString(R.string.must_hint));
return;
}
LiveNetManager.get(getContext()).
@@ -187,14 +187,14 @@ public class LiveNewWishListFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}
})).show();
} else {
if (wishList2.size() > 10) {
ToastUtil.show(R.string.must_hint);
ToastUtil.show(getContext().getString(R.string.must_hint));
return;
}
LiveNetManager.get(getContext()).
@@ -206,7 +206,7 @@ public class LiveNewWishListFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});

10
common/src/main/java/com/yunbao/common/fragment/ProcessFragment.java
View File

@@ -81,20 +81,20 @@ public class ProcessFragment extends Fragment {
switch (permission) {
case Manifest.permission.READ_EXTERNAL_STORAGE:
case Manifest.permission.WRITE_EXTERNAL_STORAGE:
ToastUtil.show(R.string.permission_storage_refused);
ToastUtil.show(getActivity().getString(R.string.permission_storage_refused));
break;
case Manifest.permission.CAMERA:
ToastUtil.show(R.string.permission_camera_refused);
ToastUtil.show(getActivity().getString(R.string.permission_camera_refused));
break;
case Manifest.permission.RECORD_AUDIO:
ToastUtil.show(R.string.permission_record_audio_refused);
ToastUtil.show(getActivity().getString(R.string.permission_record_audio_refused));
break;
case Manifest.permission.ACCESS_COARSE_LOCATION:
ToastUtil.show(R.string.permission_location_refused);
ToastUtil.show(getActivity().getString(R.string.permission_location_refused));
CommonAppConfig.getInstance().clearLocationInfo();
break;
case Manifest.permission.READ_PHONE_STATE:
ToastUtil.show(R.string.permission_read_phone_state_refused);
ToastUtil.show(getActivity().getString(R.string.permission_read_phone_state_refused));
break;
}
}

6
common/src/main/java/com/yunbao/common/http/HttpCallback.java
View File

@@ -8,10 +8,10 @@ import com.google.gson.Gson;
import com.lzy.okgo.callback.AbsCallback;
import com.lzy.okgo.model.Response;
import com.lzy.okgo.request.base.Request;
import com.yunbao.common.R;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import java.net.ConnectException;
import java.net.SocketException;
@@ -36,7 +36,7 @@ public abstract class HttpCallback extends AbsCallback<JsonBean> {
public void onSuccess(Response<JsonBean> response) {
JsonBean bean = response.body();
String gson = new Gson().toJson(bean);
Log.e("onSuccess",gson);
Log.e("onSuccess", gson);
if (bean != null) {
if (200 == bean.getRet()) {
Data data = bean.getData();
@@ -65,7 +65,7 @@ public abstract class HttpCallback extends AbsCallback<JsonBean> {
t.printStackTrace();
L.e("网络请求错误---->" + t.getClass() + " : " + t.getMessage());
if (t instanceof SocketTimeoutException || t instanceof ConnectException || t instanceof UnknownHostException || t instanceof UnknownServiceException || t instanceof SocketException) {
ToastUtil.show(R.string.load_failure);
ToastUtil.show(WordUtil.isNewZh() ? "網絡請求失敗" : "Network request failed");
}
// if (showLoadingDialog() && mLoadingDialog != null) {
// mLoadingDialog.dismiss();

3
common/src/main/java/com/yunbao/common/manager/RandomPkManager.java
View File

@@ -10,6 +10,7 @@ import com.yunbao.common.bean.RankPkInfoBean;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import java.util.ArrayList;
import java.util.List;
@@ -342,7 +343,7 @@ public class RandomPkManager {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}

207
common/src/main/java/com/yunbao/common/pay/PayPresenter.java
View File

@@ -1,11 +1,11 @@
package com.yunbao.common.pay;
import android.app.Activity;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.android.billingclient.api.Purchase;
@@ -18,13 +18,14 @@ import com.yunbao.common.bean.UserBean;
import com.yunbao.common.event.CoinChangeEvent;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.pay.ali.AliPayBuilder;
import com.yunbao.common.pay.wx.WxPayBuilder;
import com.yunbao.common.utils.GoogleBillingUtil;
import com.yunbao.common.utils.OnGoogleBillingListener;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import org.greenrobot.eventbus.EventBus;
import java.lang.ref.WeakReference;
import java.util.List;
import java.util.Locale;
@@ -48,16 +49,16 @@ public class PayPresenter {
private GoogleBillingUtil googleBillingUtil;
private String TAG="PayPresenter";
private String [] arrPro = {"1"};
private String TAG = "PayPresenter";
private String[] arrPro = {"1"};
private String mOrderid;
public PayPresenter(Activity activity) {
mActivity = new WeakReference<>(activity).get();
}
public void setPayCallback(PayCallback callback){
mPayCallback=callback;
public void setPayCallback(PayCallback callback) {
mPayCallback = callback;
}
public long getBalanceValue() {
@@ -96,9 +97,10 @@ public class PayPresenter {
public void setAliCallbackUrl(String aliCallbackUrl) {
mAliCallbackUrl = aliCallbackUrl;
}
public void pay(String payType, String money, String goodsName, String orderParams) {
if (TextUtils.isEmpty(payType)) {
ToastUtil.show(R.string.wallet_tip_5);
ToastUtil.show(mActivity.getString(R.string.wallet_tip_5));
return;
}
//L.e("《==》支付按钮4--->" +payType);
@@ -128,40 +130,42 @@ public class PayPresenter {
case Constants.PAY_TYPE_GOOGLE://google支付
googlePay(orderParams);
break;
default:
otherPay(orderParams,payType);
break;
default:
otherPay(orderParams, payType);
break;
}
}
//谷歌支付
private void googlePay(String orderParams) {
mOrderid="1";
String pid="2";
if (pid != null && !pid.isEmpty()){
arrPro[0]=pid;
mOrderid = "1";
String pid = "2";
if (pid != null && !pid.isEmpty()) {
arrPro[0] = pid;
initGooglePay();
}
String newParm= StringUtil.contact("Charge.getGoogleOrder",orderParams,"&type=android",
"&appname=",mActivity.getString(R.string.app_name),
"&desc="+mActivity.getPackageName()+"&source=android"
String newParm = StringUtil.contact("Charge.getGoogleOrder", orderParams, "&type=android",
"&appname=", mActivity.getString(R.string.app_name),
"&desc=" + mActivity.getPackageName() + "&source=android"
);
CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if(code==0){
if (code == 0) {
try {
ToastUtil.show("开始支付，请稍后");
org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
mOrderid=jsonObject.getString("orderid");
String pid=jsonObject.getString("pid");
if (pid != null && !pid.isEmpty()){
arrPro[0]=pid;
org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
mOrderid = jsonObject.getString("orderid");
String pid = jsonObject.getString("pid");
if (pid != null && !pid.isEmpty()) {
arrPro[0] = pid;
initGooglePay();
}
}catch (Exception e){ e.printStackTrace(); }
}else {
} catch (Exception e) {
e.printStackTrace();
}
} else {
ToastUtil.show("无法支付，请联系客服");
}
@@ -171,7 +175,7 @@ public class PayPresenter {
private void initGooglePay() {
GoogleBillingUtil.isDebug(true);
GoogleBillingUtil.setSkus(arrPro,null);
GoogleBillingUtil.setSkus(arrPro, null);
GoogleBillingUtil.setIsAutoAcknowledgePurchase(true);//设置自动确认购买
googleBillingUtil = GoogleBillingUtil.getInstance()
.addOnGoogleBillingListener(mActivity, mOnMyGoogleBillingListener)
@@ -179,35 +183,35 @@ public class PayPresenter {
}
private void paypalPay(String orderParams) {
String url1="/index.php?m=App&a=paypal" +orderParams +"&source=android";
String url2= CommonAppConfig.HOST+url1;
String url1 = "/index.php?m=App&a=paypal" + orderParams + "&source=android";
String url2 = CommonAppConfig.HOST + url1;
open(url2);
}
private void payssionPay(String orderParams) {
String url1="/index.php?m=App&a=pay" +orderParams +"&source=android";
String url2= CommonAppConfig.HOST+url1;
String url1 = "/index.php?m=App&a=pay" + orderParams + "&source=android";
String url2 = CommonAppConfig.HOST + url1;
open(url2);
}
private void yunquPay(String orderParams) {
String newParm= StringUtil.contact("Charge.getYunquOrder",orderParams,"&type=android",
"&appname=",mActivity.getString(R.string.app_name),
"&desc="+mActivity.getPackageName()+"&source=android"
String newParm = StringUtil.contact("Charge.getYunquOrder", orderParams, "&type=android",
"&appname=", mActivity.getString(R.string.app_name),
"&desc=" + mActivity.getPackageName() + "&source=android"
);
//L.e("《==》支付URL--->" +newParm);
CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if(code==0){
if (code == 0) {
try {
org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
String payment_url=jsonObject.getString("payment_url");
org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
String payment_url = jsonObject.getString("payment_url");
open(payment_url);
// L.e("《==》支付URL--->" +payment_url);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@@ -216,20 +220,20 @@ public class PayPresenter {
}
private void hfbPay(String orderParams) {
String newParm= StringUtil.contact("Charge.getWxH5Order",orderParams,"&type=android",
"&appname=",mActivity.getString(R.string.app_name),
"&desc="+mActivity.getPackageName()
);
String newParm = StringUtil.contact("Charge.getWxH5Order", orderParams, "&type=android",
"&appname=", mActivity.getString(R.string.app_name),
"&desc=" + mActivity.getPackageName()
);
CommonHttpUtil.getCashierOrder(newParm, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if(code==0){
if (code == 0) {
try {
org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
String redirectUrl=jsonObject.getString("redirectUrl");
org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
String redirectUrl = jsonObject.getString("redirectUrl");
open(redirectUrl);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@@ -237,66 +241,68 @@ public class PayPresenter {
});
}
public void open(String url){
public void open(String url) {
//支付时内部跳转 false要添加
WebViewActivity.forward(mActivity,url,false,false);
WebViewActivity.forward(mActivity, url, false, false);
}
private void hwPay(String orderParams) {
String newParm= StringUtil.contact("Charge.getCashierOrder",orderParams,"&type=android",
"&appname=",mActivity.getString(R.string.app_name),
"&desc="+mActivity.getPackageName()+"&source=android"
String newParm = StringUtil.contact("Charge.getCashierOrder", orderParams, "&type=android",
"&appname=", mActivity.getString(R.string.app_name),
"&desc=" + mActivity.getPackageName() + "&source=android"
);
//L.e("《==》支付URL--->" +newParm);
CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if(code==0){
if (code == 0) {
try {
org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
String payment_url=jsonObject.getString("payment_url");
org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
String payment_url = jsonObject.getString("payment_url");
open(payment_url);
// L.e("《==》支付URL--->" +payment_url);
// L.e("《==》支付URL--->" +payment_url);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
}
});
}
private void otherPay(String orderParams,String payType) {
String newParm= StringUtil.contact("Charge.getOtherPayOrder",orderParams,"&type=android",
"&appname=",mActivity.getString(R.string.app_name),
"&desc="+mActivity.getPackageName()+"&source=android&payType="+payType
private void otherPay(String orderParams, String payType) {
String newParm = StringUtil.contact("Charge.getOtherPayOrder", orderParams, "&type=android",
"&appname=", mActivity.getString(R.string.app_name),
"&desc=" + mActivity.getPackageName() + "&source=android&payType=" + payType
);
CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if(code==0){
if (code == 0) {
try {
org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
String payment_url=jsonObject.getString("payment_url");
org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
String payment_url = jsonObject.getString("payment_url");
open(payment_url);
// L.e("《==》支付URL--->" +payment_url);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
}
});
}
/**
* 支付宝支付
*/
private void aliPay(String money, String goodsName, String orderParams) {
if (mActivity == null || TextUtils.isEmpty(mServiceNameAli)|| TextUtils.isEmpty(mAliCallbackUrl)) {
if (mActivity == null || TextUtils.isEmpty(mServiceNameAli) || TextUtils.isEmpty(mAliCallbackUrl)) {
return;
}
// if (!CommonAppConfig.isAppExist(Constants.PACKAGE_NAME_ALI)) {
// ToastUtil.show(R.string.coin_ali_not_install);
// ToastUtil.show(mContext.getString(R.string.coin_ali_not_install);
// return;
// }
if (TextUtils.isEmpty(mAliPartner) || TextUtils.isEmpty(mAliSellerId) || TextUtils.isEmpty(mAliPrivateKey)) {
@@ -321,7 +327,7 @@ public class PayPresenter {
return;
}
if (!CommonAppConfig.isAppExist(Constants.PACKAGE_NAME_WX)) {
ToastUtil.show(R.string.coin_wx_not_install);
ToastUtil.show(mActivity.getString(R.string.coin_wx_not_install));
return;
}
if (TextUtils.isEmpty(mWxAppID)) {
@@ -351,12 +357,12 @@ public class PayPresenter {
long goldValue = Long.parseLong(goldCoin);
if (balanceValue > mBalanceValue) {
mBalanceValue = balanceValue;
ToastUtil.show(R.string.coin_charge_success);
ToastUtil.show(mActivity.getString(R.string.coin_charge_success));
UserBean u = CommonAppConfig.getInstance().getUserBean();
if (u != null) {
u.setCoin(coin);
}
EventBus.getDefault().post(new CoinChangeEvent(coin,goldCoin, true));
EventBus.getDefault().post(new CoinChangeEvent(coin, goldCoin, true));
}
}
}
@@ -364,11 +370,11 @@ public class PayPresenter {
}
private OnGoogleBillingListener mOnMyGoogleBillingListener=new OnGoogleBillingListener(){
private OnGoogleBillingListener mOnMyGoogleBillingListener = new OnGoogleBillingListener() {
@Override
public void onSetupSuccess(boolean isSelf) {
super.onSetupSuccess(isSelf);
Log.d(TAG,"内购服务初始化完成");
Log.d(TAG, "内购服务初始化完成");
checkSubs();
}
@@ -393,30 +399,30 @@ public class PayPresenter {
// }
// googleBillingUtil.purchaseInApp(mActivity,"zs640");
googleBillingUtil.purchaseInApp(mActivity,googleBillingUtil.getInAppSkuByPosition(0));
googleBillingUtil.purchaseInApp(mActivity, googleBillingUtil.getInAppSkuByPosition(0));
// Log.d(TAG,tempBuffer.toString());
}
@Override
public boolean onPurchaseSuccess(@NonNull Purchase purchase, boolean isSelf) {
StringBuffer tempBuffer =new StringBuffer();
if(purchase.getPurchaseState()==Purchase.PurchaseState.PURCHASED){
StringBuffer tempBuffer = new StringBuffer();
if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
tempBuffer.append("购买成功:");
//通知自己服务器
if (mOrderid == null || purchase.getOrderId() == null){
if (mOrderid == null || purchase.getOrderId() == null) {
return false;
}
String allData="";
allData="OrderId=" +purchase.getOrderId()+
",PackageName="+purchase.getPackageName() +
",Sku=" +"purchase.getSku()"+
",PurchaseTime=" +purchase.getPurchaseTime()+
",PurchaseToken=" +purchase.getPurchaseToken()+
",DeveloperPayload=" +purchase.getDeveloperPayload()+
",OriginalJson=" +purchase.getOriginalJson()+
",PurchaseState=" +purchase.getPurchaseState()+
",Signature="+purchase.getSignature();
String allData = "";
allData = "OrderId=" + purchase.getOrderId() +
",PackageName=" + purchase.getPackageName() +
",Sku=" + "purchase.getSku()" +
",PurchaseTime=" + purchase.getPurchaseTime() +
",PurchaseToken=" + purchase.getPurchaseToken() +
",DeveloperPayload=" + purchase.getDeveloperPayload() +
",OriginalJson=" + purchase.getOriginalJson() +
",PurchaseState=" + purchase.getPurchaseState() +
",Signature=" + purchase.getSignature();
// CommonHttpUtil.notifyGoogle("1",mOrderid,purchase.getOrderId(),allData, new HttpCallback() {
// @Override
// public void onSuccess(int code, String msg, String[] info) {
@@ -433,22 +439,21 @@ public class PayPresenter {
// });
}else{
} else {
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时，该值才会生效)
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();
StringBuffer tempBuffer = new StringBuffer();
tempBuffer.append("检测到未处理的订单($skuType):${purchase.sku}()");
Log.d(TAG,tempBuffer.toString());
Log.d(TAG, tempBuffer.toString());
return true;
}
@@ -459,43 +464,43 @@ public class PayPresenter {
@Override
public void onConsumeSuccess(@NonNull String purchaseToken, boolean isSelf) {
Log.d(TAG,"消耗商品成功:$purchaseToken");
Log.d(TAG, "消耗商品成功:$purchaseToken");
}
@Override
public void onAcknowledgePurchaseSuccess(boolean isSelf) {
Log.d(TAG,"确认购买商品成功");
Log.d(TAG, "确认购买商品成功");
}
@Override
public void onFail(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, int responseCode, boolean isSelf) {
Log.d(TAG,"操作失败:tag=${" + tag.name() + "responseCode=" + responseCode);
Log.d(TAG, "操作失败:tag=${" + tag.name() + "responseCode=" + responseCode);
}
@Override
public void onError(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, boolean isSelf) {
Log.d(TAG,"发生错误:tag="+tag.name());
Log.d(TAG, "发生错误:tag=" + tag.name());
}
};
private void checkSubs() {
int size = googleBillingUtil.getPurchasesSizeSubs(mActivity);
switch (size){
switch (size) {
case 0:
//不具备有效订阅
Log.d(TAG,"有效订阅数:0(无有效订阅)");
Log.d(TAG, "有效订阅数:0(无有效订阅)");
break;
case -1:
//查询失败
Log.d(TAG,"有效订阅数:-1(查询失败)");
Log.d(TAG, "有效订阅数:-1(查询失败)");
break;
default:
//具有有效订阅
Log.d(TAG,"有效订阅数:$size(具备有效订阅)");
Log.d(TAG, "有效订阅数:$size(具备有效订阅)");
break;
}
}
@@ -504,7 +509,7 @@ public class PayPresenter {
mActivity = null;
mPayCallback = null;
if (googleBillingUtil != null){
if (googleBillingUtil != null) {
googleBillingUtil.onDestroy(mActivity);
//退出程序的时候可以调用(实验性)
GoogleBillingUtil.endConnection();

4
common/src/main/java/com/yunbao/common/pay/wx/WxPayBuilder.java
View File

@@ -80,12 +80,12 @@ public class WxPayBuilder {
// req.sign = sign;
// IWXAPI wxApi = WxApiWrapper.getInstance().getWxApi();
// if (wxApi == null) {
// ToastUtil.show(R.string.coin_charge_failed);
// ToastUtil.show(mContext.getString(R.string.coin_charge_failed);
// return;
// }
// boolean result = wxApi.sendReq(req);
// if (!result) {
// ToastUtil.show(R.string.coin_charge_failed);
// ToastUtil.show(mContext.getString(R.string.coin_charge_failed);
// }
}
}

6
common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
View File

@@ -92,7 +92,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
@Override
public void onFailure() {
ToastUtil.show(R.string.img_camera_cancel);
ToastUtil.show(mContext.getString(R.string.img_camera_cancel));
}
};
mAlumbResultCallback = new ActivityResultCallback() {
@@ -103,7 +103,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
@Override
public void onFailure() {
ToastUtil.show(R.string.img_alumb_cancel);
ToastUtil.show(mContext.getString(R.string.img_alumb_cancel));
}
};
mCropResultCallback = new ActivityResultCallback() {
@@ -116,7 +116,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
@Override
public void onFailure() {
ToastUtil.show(R.string.img_crop_cancel);
ToastUtil.show(mContext.getString(R.string.img_crop_cancel));
}
};
}

6
common/src/main/java/com/yunbao/common/utils/ToastUtil.java
View File

@@ -1,5 +1,6 @@
package com.yunbao.common.utils;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
@@ -43,7 +44,7 @@ public class ToastUtil {
public static void show(int res) {
show(CommonAppContext.sInstance.getString(res));
show(WordUtil.getNewString(res));
}
/**
@@ -85,9 +86,10 @@ public class ToastUtil {
}
public static void showDebug(int s){
if(BuildConfig.DEBUG){
show(s);
show("开发模式:"+s);
}
}
public static void show(String s) {
if (TextUtils.isEmpty(s)) {
return;

2
common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java
View File

@@ -179,7 +179,7 @@ public class CustomDrawerPopupView extends DrawerPopupView {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(mContext.getString(R.string.net_error));
}
});
}

3
common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java
View File

@@ -19,6 +19,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
@@ -110,7 +111,7 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
} else {

3
common/src/main/java/com/yunbao/common/views/LiveAnchorMessageCustomPopup.java
View File

@@ -13,6 +13,7 @@ import com.yunbao.common.bean.ListInfoMessageModel;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.OnRecyclerViewScrollListener;
import java.util.List;
@@ -68,7 +69,7 @@ public class LiveAnchorMessageCustomPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});

8
common/src/main/java/com/yunbao/common/views/LiveClarityCustomPopup.java
View File

@@ -116,9 +116,9 @@ public class LiveClarityCustomPopup extends BottomPopupView implements View.OnCl
ViewClicksAntiShake.clicksAntiShake(lineHd, () -> {
if (lineHd.getTag() != null) {
if (isUser) {//用户端
ToastUtil.show(R.string.live_user_ban_hd);
ToastUtil.show(getContext().getString(R.string.live_user_ban_hd));
} else {//主播端
ToastUtil.show(R.string.function_is_suspended);
ToastUtil.show(getContext().getString(R.string.function_is_suspended));
}
return;
}
@@ -151,9 +151,9 @@ public class LiveClarityCustomPopup extends BottomPopupView implements View.OnCl
ViewClicksAntiShake.clicksAntiShake(lineFhd, () -> {
if (lineFhd.getTag() != null) {
if (isUser) {//用户端
ToastUtil.show(R.string.live_user_ban_fhd);
ToastUtil.show(getContext().getString(R.string.live_user_ban_fhd));
} else {//主播端
ToastUtil.show(R.string.function_is_suspended);
ToastUtil.show(getContext().getString(R.string.function_is_suspended));
}
return;
}

3
common/src/main/java/com/yunbao/common/views/LiveNewWishGiftPopup.java
View File

@@ -29,6 +29,7 @@ import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import org.greenrobot.eventbus.Subscribe;
@@ -166,7 +167,7 @@ public class LiveNewWishGiftPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});

4
common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
View File

@@ -326,7 +326,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
List<WishModel2> wishList2 = new ArrayList<>();
Gson gson = new Gson();
if (wishList2.size()>10){
ToastUtil.show(R.string.must_hint);
ToastUtil.show(mContext.getString(R.string.must_hint));
return;
}
LiveNetManager.get(getContext()).
@@ -338,7 +338,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}))

2
common/src/main/java/com/yunbao/common/views/LiveOpenCustomPopup.java
View File

@@ -195,7 +195,7 @@ public class LiveOpenCustomPopup extends CenterPopupView {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});

5
common/src/main/java/com/yunbao/common/views/LiveRobotMessageCustomPopup.java
View File

@@ -24,6 +24,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -130,7 +131,7 @@ public class LiveRobotMessageCustomPopup extends BottomPopupView {
}
});
} else {
ToastUtil.show(R.string.robot_minimum_interval);
ToastUtil.show(getContext().getString(R.string.robot_minimum_interval));
}
@@ -181,7 +182,7 @@ public class LiveRobotMessageCustomPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}

3
common/src/main/java/com/yunbao/common/views/LiveRobotSayHelloCustomPopup.java
View File

@@ -19,6 +19,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -125,7 +126,7 @@ public class LiveRobotSayHelloCustomPopup extends BottomPopupView {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}

3
common/src/main/java/com/yunbao/common/views/LiveRobotSettingCustomPopup.java
View File

@@ -22,6 +22,7 @@ import com.yunbao.common.bean.LiveAiRobotBean;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
public class LiveRobotSettingCustomPopup extends BottomPopupView implements View.OnClickListener {
private static String TAG = "AI机器人";
@@ -251,7 +252,7 @@ public class LiveRobotSettingCustomPopup extends BottomPopupView implements View
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});

3
common/src/main/java/com/yunbao/common/views/RobotMessageViewHolder.java
View File

@@ -16,6 +16,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
public class RobotMessageViewHolder extends RecyclerView.ViewHolder {
@@ -44,7 +45,7 @@ public class RobotMessageViewHolder extends RecyclerView.ViewHolder {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}

3
common/src/main/java/com/yunbao/common/views/RobotSayHelloViewHoler.java
View File

@@ -16,6 +16,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
public class RobotSayHelloViewHoler extends RecyclerView.ViewHolder {
private TextView serialNumber, messageText;
@@ -44,7 +45,7 @@ public class RobotSayHelloViewHoler extends RecyclerView.ViewHolder {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});
}

2
common/src/main/res/values-en-rUS/string.xml
View File

@@ -191,7 +191,7 @@
<string name="live_wrap">Pack</string>
<string name="guard_list">Guardian list</string>
<string name="guard_buy_msg">Guard the anchor</string>
<string name="home_page">homepage</string>
<string name="home_page">Homepage</string>
<string name="home_page_share_1">"%1$s" is also in%2$s, ~ Click to view TA\'s story</string>
<string name="home_page_share_2">TA has%1$s fans. Come and watch!</string>
<string name="im_live_anchor_msg">Hi ~ I\'m the anchor. Come and talk to me.</string>

2
common/src/main/res/values/strings.xml
View File

@@ -191,7 +191,7 @@
<string name="live_wrap">Pack</string>
<string name="guard_list">Guardian list</string>
<string name="guard_buy_msg">Guard the anchor</string>
<string name="home_page">homepage</string>
<string name="home_page">Homepage</string>
<string name="home_page_share_1">"%1$s" is also in%2$s, ~ Click to view TA\'s story</string>
<string name="home_page_share_2">TA has%1$s fans. Come and watch!</string>
<string name="im_live_anchor_msg">Hi ~ I\'m the anchor. Come and talk to me.</string>