diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
index d09659e92..11eabcbb4 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
@@ -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));
+//            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());
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
index 9cf423044..15627883f 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
@@ -148,7 +148,7 @@ public class ChatActivity extends AbsOTOActivity {
                     public void onSuccess(JSONObject data) {
                         try {
                             String tips1 = data.getJSONObject("data").getJSONObject("info").getJSONObject("0").getString("cn");
-                            String tips2 = data.getJSONObject("data").getJSONObject("info").getJSONObject("1").getString("cn");
+                             String tips2 = data.getJSONObject("data").getJSONObject("info").getJSONObject("1").getString("cn");
                             String tips3 = data.getJSONObject("data").getJSONObject("info").getJSONObject("2").getString("cn");
                             if (!StringUtil.isEmpty(tips1)) {
                                 MessageChatTipsContent.sendMessage(Conversation.ConversationType.PRIVATE, targetId, MessageChatTipsContent.obtain(tips1), null);
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 84cb45982..8ddcbe240 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -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" />
diff --git a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java b/common/src/main/java/com/yunbao/common/activity/MyWalletActivity.java
similarity index 98%
rename from main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
rename to common/src/main/java/com/yunbao/common/activity/MyWalletActivity.java
index f2029490b..522d04cc6 100644
--- a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/MyWalletActivity.java
@@ -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;
diff --git a/main/src/main/java/com/yunbao/main/activity/GoogleFragment.java b/common/src/main/java/com/yunbao/common/fragment/GoogleFragment.java
similarity index 97%
rename from main/src/main/java/com/yunbao/main/activity/GoogleFragment.java
rename to common/src/main/java/com/yunbao/common/fragment/GoogleFragment.java
index 62d937191..e01c43fb9 100644
--- a/main/src/main/java/com/yunbao/main/activity/GoogleFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/GoogleFragment.java
@@ -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;
diff --git a/main/src/main/java/com/yunbao/main/activity/WalletFragment.java b/common/src/main/java/com/yunbao/common/fragment/WalletFragment.java
similarity index 93%
rename from main/src/main/java/com/yunbao/main/activity/WalletFragment.java
rename to common/src/main/java/com/yunbao/common/fragment/WalletFragment.java
index 09c3be902..c60a06cd8 100644
--- a/main/src/main/java/com/yunbao/main/activity/WalletFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/WalletFragment.java
@@ -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 {
diff --git a/main/src/main/java/com/yunbao/main/utils/HXLinePagerIndicator.java b/common/src/main/java/com/yunbao/common/utils/HXLinePagerIndicator.java
similarity index 94%
rename from main/src/main/java/com/yunbao/main/utils/HXLinePagerIndicator.java
rename to common/src/main/java/com/yunbao/common/utils/HXLinePagerIndicator.java
index 12c1516f2..69cdf117d 100644
--- a/main/src/main/java/com/yunbao/main/utils/HXLinePagerIndicator.java
+++ b/common/src/main/java/com/yunbao/common/utils/HXLinePagerIndicator.java
@@ -1,4 +1,4 @@
-package com.yunbao.main.utils;
+package com.yunbao.common.utils;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/main/src/main/java/com/yunbao/main/utils/LinePagerIndicatorEx.java b/common/src/main/java/com/yunbao/common/utils/LinePagerIndicatorEx.java
similarity index 99%
rename from main/src/main/java/com/yunbao/main/utils/LinePagerIndicatorEx.java
rename to common/src/main/java/com/yunbao/common/utils/LinePagerIndicatorEx.java
index 678c2cab8..f30dec8d0 100644
--- a/main/src/main/java/com/yunbao/main/utils/LinePagerIndicatorEx.java
+++ b/common/src/main/java/com/yunbao/common/utils/LinePagerIndicatorEx.java
@@ -1,4 +1,4 @@
-package com.yunbao.main.utils;
+package com.yunbao.common.utils;
 
 
 import android.content.Context;
diff --git a/main/src/main/java/com/yunbao/main/views/TestWebViewClient.java b/common/src/main/java/com/yunbao/common/views/weight/TestWebViewClient.java
similarity index 99%
rename from main/src/main/java/com/yunbao/main/views/TestWebViewClient.java
rename to common/src/main/java/com/yunbao/common/views/weight/TestWebViewClient.java
index 858b0d253..d7df9ea73 100644
--- a/main/src/main/java/com/yunbao/main/views/TestWebViewClient.java
+++ b/common/src/main/java/com/yunbao/common/views/weight/TestWebViewClient.java
@@ -1,4 +1,4 @@
-package com.yunbao.main.views;
+package com.yunbao.common.views.weight;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/main/src/main/res/layout/activity_my_wallet.xml b/common/src/main/res/layout/activity_my_wallet.xml
similarity index 90%
rename from main/src/main/res/layout/activity_my_wallet.xml
rename to common/src/main/res/layout/activity_my_wallet.xml
index 755794c4b..894c10a37 100644
--- a/main/src/main/res/layout/activity_my_wallet.xml
+++ b/common/src/main/res/layout/activity_my_wallet.xml
@@ -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"/>
 
diff --git a/main/src/main/res/layout/activity_recharge.xml b/common/src/main/res/layout/activity_recharge.xml
similarity index 100%
rename from main/src/main/res/layout/activity_recharge.xml
rename to common/src/main/res/layout/activity_recharge.xml
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 40f7204ba..87a35fe5c 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -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" />
diff --git a/main/src/main/java/com/yunbao/main/activity/RechargeActivity.java b/main/src/main/java/com/yunbao/main/activity/RechargeActivity.java
index 23d607c06..c33a027db 100644
--- a/main/src/main/java/com/yunbao/main/activity/RechargeActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/RechargeActivity.java
@@ -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 {
diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
index f55f7da66..09aa68343 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
@@ -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;
diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java
index 56ac1dbf3..cb0ac9047 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java
@@ -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;