From 5972772bf16dc580cd6e44ec93dbc76eca4baeb8 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Thu, 20 Oct 2022 21:41:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D=E7=82=BA1.?= =?UTF-8?q?0.5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E9=82=8F?= =?UTF-8?q?=E8=BC=AF=EF=BC=8C=E4=BD=88=E5=B1=80=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/firstcharge/FirstChargeDialog.kt | 39 ++++++++++++--- .../login/fragment/AddUserInfoFragment.java | 2 +- .../ui/webview/CommonWebViewActivity.java | 46 +++++++++++++++--- .../yizhuan/erban/ui/widget/GiftDialog.java | 6 +++ .../com/yizhuan/erban/vip/VipMainActivity.kt | 2 +- .../res/drawable-xhdpi/icon_gift_value.png | Bin 832 -> 0 bytes .../res/drawable-xhdpi/icon_gift_value.webp | Bin 0 -> 1720 bytes app/src/main/res/values/strings.xml | 2 +- .../pay/bean/ChargeBean.java | 6 +-- .../pay/bean/FirstChargeGoods.java | 2 +- .../xchat_android_core/share/ShareModel.java | 28 ++++++----- gradle.properties | 4 +- 12 files changed, 102 insertions(+), 35 deletions(-) delete mode 100644 app/src/main/res/drawable-xhdpi/icon_gift_value.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_gift_value.webp diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt index 21b270d01..f27628773 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt @@ -14,6 +14,7 @@ import android.view.View import android.view.WindowManager import android.widget.PopupWindow import android.widget.TextView +import com.android.billingclient.api.Purchase import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent @@ -21,6 +22,7 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.DialogFirstChargeBinding +import com.yizhuan.erban.ui.pay.BillingManager import com.yizhuan.erban.ui.setting.ModifyPwdActivity import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.xchat_android_core.pay.PayModel @@ -36,7 +38,8 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @ActLayoutRes(R.layout.dialog_first_charge) -class FirstChargeDialog : BaseViewBindingActivity() { +class FirstChargeDialog : BaseViewBindingActivity(), + BillingManager.BillingUpdatesListener { private var goodsList: List? = null @@ -44,6 +47,7 @@ class FirstChargeDialog : BaseViewBindingActivity() { private lateinit var rewardAdapter: RewardAdapter private lateinit var rvDelegate: RVDelegate private lateinit var helpPopupWindow: PopupWindow + private lateinit var billingManager: BillingManager companion object { @JvmStatic @@ -62,6 +66,7 @@ class FirstChargeDialog : BaseViewBindingActivity() { window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, height) window.setGravity(Gravity.CENTER) EventBus.getDefault().register(this) + initBilling() binding.rbPlanA.setOnClickListener { binding.rbPlanA.isChecked = true binding.rbPlanB.isChecked = false @@ -119,6 +124,10 @@ class FirstChargeDialog : BaseViewBindingActivity() { } } + private fun initBilling() { + billingManager = BillingManager(this, this) + } + @SuppressLint("SetTextI18n") private fun initData(goodsList: List) { this.goodsList = goodsList @@ -128,17 +137,17 @@ class FirstChargeDialog : BaseViewBindingActivity() { 1 -> { binding.rbPlanB.visibility = View.GONE binding.rbPlanC.visibility = View.GONE - binding.rbPlanA.text = "${goodsList[0].chargeMoney.toDouble().div(100)}$" + binding.rbPlanA.text = "${goodsList[0].chargeMoney}$" } 2 -> { binding.rbPlanC.visibility = View.GONE - binding.rbPlanA.text = "${goodsList[0].chargeMoney.toDouble().div(100)}$" - binding.rbPlanB.text = "${goodsList[1].chargeMoney.toDouble().div(100)}$" + binding.rbPlanA.text = "${goodsList[0].chargeMoney}$" + binding.rbPlanB.text = "${goodsList[1].chargeMoney}$" } 3 -> { - binding.rbPlanA.text = "${goodsList[0].chargeMoney.toDouble().div(100)}$" - binding.rbPlanB.text = "${goodsList[1].chargeMoney.toDouble().div(100)}$" - binding.rbPlanC.text = "${goodsList[2].chargeMoney.toDouble().div(100)}$" + binding.rbPlanA.text = "${goodsList[0].chargeMoney}$" + binding.rbPlanB.text = "${goodsList[1].chargeMoney}$" + binding.rbPlanC.text = "${goodsList[2].chargeMoney}$" } } } @@ -213,4 +222,20 @@ class FirstChargeDialog : BaseViewBindingActivity() { EventBus.getDefault().unregister(this) } + override fun onBillingClientSetupFinished() { + + } + + override fun onPurchasesUpdated(purchases: MutableList?) { + + } + + override fun onConsumeFinished(token: String?, result: Int) { + + } + + override fun onFailedHandle(result: Int) { + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java index 6612e459d..0f193eba9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java @@ -53,7 +53,7 @@ public class AddUserInfoFragment extends BaseFragment private int gender = -1; private XRadioGroup rgGender; private RadioButton rbMale; - private String avatarUrl = "https://image.lecheng163.com/peko_default_avatar.png"; + private String avatarUrl = "http://beta.img.pekolive.com/logo.png"; public static String INVITE_USER_CODE = ""; diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java index 8309f2408..ddfbaf90a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java @@ -4,6 +4,8 @@ import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; import android.content.ActivityNotFoundException; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -62,7 +64,9 @@ import java.util.HashMap; import java.util.Map; import cn.sharesdk.framework.Platform; +import io.reactivex.SingleObserver; import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; @@ -488,15 +492,41 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O @Override public void onSharePlatformClick(Platform platform) { if (mWebJsBeanInfo != null && mWebJsBeanInfo.getData() != null) { - switch (mWebJsBeanInfo.getType()) { - case WebJsBeanInfo.IMAGE: - if (TextUtils.isEmpty(mWebJsBeanInfo.getData().getImgUrl())) { + if (platform.getName().equals("GooglePlus")) { + try { + ClipboardManager cm = (ClipboardManager) this.getSystemService(Context.CLIPBOARD_SERVICE); + cm.setPrimaryClip(ClipData.newPlainText("text", mWebJsBeanInfo.getData().getLink())); + toast("已複製"); + } catch (Exception e) { + Logger.i("copyText", String.valueOf(e)); + toast(String.valueOf(e)); + } + }else { + switch (mWebJsBeanInfo.getType()) { + case WebJsBeanInfo.IMAGE: + if (TextUtils.isEmpty(mWebJsBeanInfo.getData().getImgUrl())) { + break; + } + ShareModel.get().shareImage(platform, mWebJsBeanInfo.getData().getImgUrl()); break; - } - ShareModel.get().shareImage(platform, mWebJsBeanInfo.getData().getImgUrl()); - break; - default: - ShareModel.get().shareH5(mWebJsBeanInfo.getData(), platform).subscribe(); + default: + ShareModel.get().shareH5(mWebJsBeanInfo.getData(), platform) .subscribe(new SingleObserver() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onSuccess(String s) { + toast(s); + } + + @Override + public void onError(Throwable e) { + toast(e.getMessage()); + } + }); + } } } else { toast(ResUtil.getString(R.string.ui_webview_commonwebviewactivity_011)); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index f54dc83e1..c5b88a427 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -607,6 +607,12 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene } else { giftIndicator.showPosition(GiftIndicator.TYPE_NOBLE); } + // 有塗鴉礼物才显示塗鴉礼物的tab + if(ListUtils.isListEmpty(getDrawGiftInfos())){ + giftIndicator.hidePosition(GiftIndicator.TYPE_DRAW_GIFT); + }else { + giftIndicator.showPosition(GiftIndicator.TYPE_DRAW_GIFT); + } //是否背包礼物 final boolean isKnap = (position == GiftIndicator.TYPE_KNAP); initEasyPop(isKnap); diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt index af72f86f7..9baca7326 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt @@ -330,7 +330,7 @@ class VipMainActivity : BaseViewBindingActivity(), if (showChargeList.size > 0) { bean = showChargeList[0] binding.tvOpenVip.text = "${ - bean?.getMoney()?.toDouble()?.div(100) + bean?.getMoney() }${getString(R.string.me_immediately_become_a_Peko_nobleman)}" } } diff --git a/app/src/main/res/drawable-xhdpi/icon_gift_value.png b/app/src/main/res/drawable-xhdpi/icon_gift_value.png deleted file mode 100644 index 96eb48a6b90dff9a4c07dba1c4059f03809dc683..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 832 zcmV-G1Hb%Px%`bk7VR7gv;mCs8RQ546&XVhnC83>jT2$B%A>Bpj6R0Ik759mS?s%4N+i;}RM zNX1RI(p^QUQ3kGBXwW8GXoYE1AefPheki3V;(Igq-V^uE+<7z4r>+{9H*fBo^Eu~y z@0l}%|8!73E)NeEVE3_7lmj?fvqnT5w_|3)(BvMomReY+rY4!oNq~8B_B4EMgOKMS zWHA&2L`zWIk5pNYaZazaLGWdyy$WpjfG08#>J>chq1L)_8z2Jn*oST~wXsx0X%EN< z7_dGZNB_^{I(LAjc;J=;_6D^$1-UC7a+88=%93T4xCMfGPru- zf2jazvIdya@KrT&|I6Eu@(x$*1&WJ6pB7>cAxsC*jy7Xo--iZ>zNz~kTqC=9MQ*ML3Z_GjNAR8^#(h2>^xgXz|a z%FhEgc32?3@$?~-yqGOHH>(`yxaN^eIX()Hh_4TwfTt#)6lKefZ&toQd4idaG3yMa zYJ(S~_3;3NI-l)?+%DKc&v^G(2^A00d$%P3Ul}Ze=S@M#gLyl^=oW2EcB68^ioc=| z$7#}C&CZHT4-P?!*N|$T>08~WTWw_2De;ZuMM!yuK6cJVv%*d!Ztgn@##jIk%ipq( zWAX^K2srgL?M`o+ZV|k(uLeSlLa9)e9VF1@lhZ&`?p%B(=O6U-z2zvPClI1O$~^v- zS-qLZ;5p6o+5Nlipig`y;5w))y#*=SA-OOyKO_q%*@@}Gy98IyzD-Boj1vLQcGkkf z0Hmr3v!4Tr7Mkjs*zR+=BiOX#VK;>mG(dmZG8m;VuD2ajKl=w4xyf|1S7nU=0000< KMNUMnLSTX*?11wC diff --git a/app/src/main/res/drawable-xhdpi/icon_gift_value.webp b/app/src/main/res/drawable-xhdpi/icon_gift_value.webp new file mode 100644 index 0000000000000000000000000000000000000000..a1496db16bf9c640a0688fb70c9be9433e8d361a GIT binary patch literal 1720 zcmb`Fdpy)x6u|Ec#fV6XN}82t>k%KXd}zkVV@4Y$>ltgjW@?RLjA!yrk<}<_QJW%0 z*r_n(F|E>r#P}GD%=B6#LU|>xnElQ6@zEdk*?;!@?mg%GJNMkrIrrX!$J*Q9Tn~VU z9md7o#llkt0I(ODx&UYcfVH)CQGr9h0Inj|lF$-4j7G&fV33|(-bk@;RS1ER;j8=& z3j^R&AAmFfT>WpX|Cb996dV}{1x-SeMun0C01JXxiTH(M#T@X3v&Bqx!`nhJ#SrTd zzv6(eIEEHZgJN36@qyt~F$*BJB8NtabBRSG~CP0Xu8qN3Vv+o zSyq>nrdw(Zt9aCpLLMWboOG%U`?vWkH(fx-6XWlU#o0Y9Vh(wC2ckvzY|e#NyVrct z^N>vcr&d2c+8J@MxQ(^*4MMi?wtm98JxJJz;$KUvop>5O`jr)t*Q6smtMs2B5XoKg zNaS9$i#ja(rA>Z18mxn>(*4?G>7C6o(n#MlEe0s}by>d=S1je2mv?m2=VW-d87U>l z-xk@dAb=r~LAM?Q4RpD1Nw`cOQi)#He9jMjM!-;3Bq=-q_kULdN2RMI=ZdxFHSC>( zFl}z~nf^BK=~#yzxe$$!9n&MbbfOf|mM$r&DyHX+gK|r$_;Pc9H#^ghT4?`f$D-R6 zxiSn1V+MQ=s8BLVu`L_lC2a&p+i2!V;N_GgWC|T|iP%wBZFNPrR7Z3MPC@Rju@ZyK zkM0laET~&waI!xd&u5Xv<0nY-dro^TN$HKh?O5qKyJ^`&2)(Js3+uX1yH{K8yB3*s zO-DQ|37R>B7CD2lD_aNLao4H)uuq5Z6=cHx8*Ybcs&ul{+q|*UFfQm+a$g zZ{hp2W?Td9{fng6$u?Ufu7ngW(Ij25?tu7Z>&*xZ^c-o>xa-X2SrtHMje3;ag<4>mL9%z-AH!cd< zhl-4&7M~Sxwb@aR@0A~^Sr}1As86uww_a4ewX}`mTxb^6%_ojWjBoML>#M${O4F~L z^`)IZv+>1L4^R70!g9~$jqF&i-C|!M594R0A1~`2+p#X&%{s<*;QV1d+AHdE zzH4w^kMho(bB^jXdcUmeV|pJF%hh搜索昵稱/ID/房間 擴列聊天 房間派對 - 快來創建房間一起開黑吧~ + 快來創建房間一起交友吧 複製鏈接 公會周榜 還沒有公會榜單哦 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java index bba8bc6b7..9660364e6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java @@ -21,7 +21,7 @@ public class ChargeBean implements Serializable{ */ public String chargeProdId; public String prodName; - public int money; + public double money; public int giftGoldNum; public int channel; public String prodDesc; @@ -50,11 +50,11 @@ public class ChargeBean implements Serializable{ this.prodName = prodName; } - public int getMoney() { + public double getMoney() { return money; } - public void setMoney(int money) { + public void setMoney(double money) { this.money = money; } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java index d7da526a8..b5103a1df 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java @@ -8,7 +8,7 @@ import lombok.Data; public class FirstChargeGoods { public FirstChargeGoods() { } - private String chargeMoney; + private Double chargeMoney; private String chargeProdDesc; private String chargeProdId; private String chargeProdTitle; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java index 500f0b169..9414fdc08 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java @@ -73,8 +73,6 @@ public class ShareModel extends BaseModel implements IShareModel { public void subscribe(SingleEmitter emitter) throws Exception { if (null != webViewInfo && platform != null) { Platform.ShareParams sp = new Platform.ShareParams(); - sp.setText(webViewInfo.getDesc()); - sp.setTitle(webViewInfo.getTitle()); if (httpsUrl) { sp.setImageUrl(webViewInfo.getImgUrl().replace("http:", "https:")); } else { @@ -91,14 +89,18 @@ public class ShareModel extends BaseModel implements IShareModel { } else { siteUrl += "?" + params; } - //QQ空间分享 - sp.setSite(webViewInfo.getDesc()); - sp.setSiteUrl(siteUrl); - //QQ分享 - sp.setTitleUrl(siteUrl); - //微信朋友圈分享 - sp.setUrl(siteUrl); - sp.setShareType(Platform.SHARE_WEBPAGE); + //facebook + if (platform.getName().equals(Facebook.NAME)) { + sp.setTitle(webViewInfo.getTitle()); + sp.setText(webViewInfo.getDesc()); + sp.setUrl(siteUrl); + sp.setShareType(Platform.SHARE_WEBPAGE); + } + //line + else if (platform.getName().equals(Line.NAME)) { + sp.setText(webViewInfo.getDesc() + "[" + webViewInfo.getLink() + "]"); + } + platform.setPlatformActionListener(new PlatformActionListener() { @Override public void onComplete(Platform platform, int i, HashMap hashMap) { @@ -119,7 +121,11 @@ public class ShareModel extends BaseModel implements IShareModel { @Override public void onError(Platform platform, int i, Throwable throwable) { - emitter.onError(new Throwable(MSG.failed)); + String errorMsg = MSG.failed; + if (throwable.getMessage().contains("not installed")) { + errorMsg = ResUtil.getString(R.string.not_install_app); + } + emitter.onError(new Throwable(errorMsg)); } @Override diff --git a/gradle.properties b/gradle.properties index 841f25d4d..2dfe09bf1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,5 +24,5 @@ only_arm64=false channel_file=channel.txt -version_name=1.0.4 -version_code=104 \ No newline at end of file +version_name=1.0.5 +version_code=105 \ No newline at end of file