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

修改我的页面充值跳转，钱包跳转

Browse Source
This commit is contained in:
18401019693 2023-11-03 15:47:57 +08:00
parent 6e04287132
commit 83758f39b1
15 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
View File

@ -47,6 +47,7 @@ import com.shayu.onetoone.utils.UserManager;
import com.shayu.onetoone.view.CustomMyViewHolder;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.common.bean.GoogleBean;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LevelBean;
@ -466,7 +467,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
} else {
switch (bean.getId()) {
case 2:
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
break;
case 13:
forwardSetting();
@ -488,17 +489,20 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
} else if (i == R.id.signature) {
// mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
} else if (i == R.id.lt_star_coin) {
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_GOLD));
// mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1)) ;
// Bundle bundle = new Bundle();
// bundle.putString("type", "yuanbao");
// RouteManager.forwardActivity(RouteManager.ACTIVITY_DIAMOND_EXCHANGE, bundle);
} else if (i == R.id.btn_coin) {
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
// RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
} else if (i == R.id.btn_gold) {
Bundle bundle = new Bundle();
bundle.putString("type", "coin");
RouteManager.forwardActivity(RouteManager.ACTIVITY_DIAMOND_EXCHANGE, bundle);
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
// Bundle bundle = new Bundle();
// bundle.putString("type", "coin");
// RouteManager.forwardActivity(RouteManager.ACTIVITY_DIAMOND_EXCHANGE, bundle);
} else if (i == R.id.rt_kefu) {
//WebViewActivity.forward(mContext, beanKefu.getHref(), false);
RouteManager.forwardWebViewActivity(beanKefu.getName(), beanKefu.getHref());

4
common/src/main/AndroidManifest.xml
View File

@ -53,7 +53,9 @@
<activity
android:name="com.yunbao.common.activity.PreviewImageActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yunbao.common.activity.MyWalletActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yunbao.common.activity.PreviewVideoActivity"
android:screenOrientation="portrait" />

9
main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java → common/src/main/java/com/yunbao/common/activity/MyWalletActivity.java
View File

@ -1,4 +1,4 @@
package com.yunbao.main.activity;
package com.yunbao.common.activity;
import android.content.Context;
@ -20,16 +20,17 @@ 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.R;
import com.yunbao.common.fragment.GoogleFragment;
import com.yunbao.common.fragment.LoadingDialog;
import com.yunbao.common.fragment.WalletFragment;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.GoogleBillingUtilNew;
import com.yunbao.common.utils.HXLinePagerIndicator;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.main.R;
import com.yunbao.main.utils.HXLinePagerIndicator;
import net.lucode.hackware.magicindicator.MagicIndicator;
import net.lucode.hackware.magicindicator.ViewPagerHelper;

10
main/src/main/java/com/yunbao/main/activity/GoogleFragment.java → common/src/main/java/com/yunbao/common/fragment/GoogleFragment.java
View File

@ -1,7 +1,7 @@
package com.yunbao.main.activity;
package com.yunbao.common.fragment;
import static com.yunbao.main.activity.MyWalletActivity.dis;
import static com.yunbao.common.activity.MyWalletActivity.dis;
import android.annotation.SuppressLint;
import android.os.Bundle;
@ -20,14 +20,14 @@ 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.yunbao.common.CommonAppConfig;
import com.yunbao.common.R;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.GoogleBillingUtilNew;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.main.R;
import com.yunbao.main.views.TestWebViewClient;
import com.yunbao.common.views.weight.TestWebViewClient;
import java.io.IOException;
import java.util.List;

7
main/src/main/java/com/yunbao/main/activity/WalletFragment.java → common/src/main/java/com/yunbao/common/fragment/WalletFragment.java
View File

@ -1,4 +1,4 @@
package com.yunbao.main.activity;
package com.yunbao.common.fragment;
import android.annotation.SuppressLint;
@ -13,9 +13,10 @@ import android.webkit.WebView;
import androidx.fragment.app.Fragment;
import com.yunbao.common.R;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.main.R;
import com.yunbao.main.views.TestWebViewClient;
import com.yunbao.common.views.weight.TestWebViewClient;
@SuppressLint("ValidFragment")
public class WalletFragment extends Fragment {

2
main/src/main/java/com/yunbao/main/utils/HXLinePagerIndicator.java → common/src/main/java/com/yunbao/common/utils/HXLinePagerIndicator.java
View File

@ -1,4 +1,4 @@
package com.yunbao.main.utils;
package com.yunbao.common.utils;
import android.content.Context;
import android.graphics.Canvas;

2
main/src/main/java/com/yunbao/main/utils/LinePagerIndicatorEx.java → common/src/main/java/com/yunbao/common/utils/LinePagerIndicatorEx.java
View File

@ -1,4 +1,4 @@
package com.yunbao.main.utils;
package com.yunbao.common.utils;
import android.content.Context;

2
main/src/main/java/com/yunbao/main/views/TestWebViewClient.java → common/src/main/java/com/yunbao/common/views/weight/TestWebViewClient.java
View File

@ -1,4 +1,4 @@
package com.yunbao.main.views;
package com.yunbao.common.views.weight;
import android.annotation.TargetApi;
import android.app.Activity;

2
main/src/main/res/layout/activity_my_wallet.xml → common/src/main/res/layout/activity_my_wallet.xml
View File

@ -5,7 +5,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
tools:context=".activity.MyWalletActivity">
tools:context="com.yunbao.common.activity.MyWalletActivity">
<include layout="@layout/view_title"/>

0
main/src/main/res/layout/activity_recharge.xml → common/src/main/res/layout/activity_recharge.xml
View File

4
main/src/main/AndroidManifest.xml
View File

@ -31,9 +31,7 @@
<activity
android:name=".activity.BuyVipActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.MyWalletActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.ZhuangBanActivity"
android:screenOrientation="portrait" />

2
main/src/main/java/com/yunbao/main/activity/RechargeActivity.java
View File

@ -9,7 +9,7 @@ import android.webkit.WebView;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.main.R;
import com.yunbao.main.views.TestWebViewClient;
import com.yunbao.common.views.weight.TestWebViewClient;
//充值h5
public class RechargeActivity extends AbsActivity {

2
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@ -60,7 +60,7 @@ import com.yunbao.main.activity.FansActivity;
import com.yunbao.main.activity.FollowActivity;
import com.yunbao.main.activity.MyProfitActivity;
import com.yunbao.main.activity.MyVideoActivity;
import com.yunbao.main.activity.MyWalletActivity;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.main.activity.RewardActivity;
import com.yunbao.main.activity.SettingActivity;
import com.yunbao.main.activity.ThreeDistributActivity;

2
main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java
View File

@ -40,7 +40,7 @@ import com.yunbao.main.activity.FansActivity;
import com.yunbao.main.activity.FollowActivity;
import com.yunbao.main.activity.MyProfitActivity;
import com.yunbao.main.activity.MyVideoActivity;
import com.yunbao.main.activity.MyWalletActivity;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.main.activity.RewardActivity;
import com.yunbao.main.activity.SettingActivity;
import com.yunbao.main.activity.ThreeDistributActivity;