删除遇见和有范

app/src/main/java/com/sheep/gamegroup/module/user/activity/ActMyCart.java

@@ -56,8 +56,8 @@ public class ActMyCart extends BaseActivity {
     @Override
     public void initData() {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_CART) + "?only=1").hideProgress()), "遇见预约");
-        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_CART) + "&only=1&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范商城");
+//        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_CART) + "?only=1").hideProgress()), "遇见预约");
+//        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_CART) + "&only=1&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范商城");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
         pager.setCurrentItem(0);

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyFocus.java

@@ -57,8 +57,8 @@ public class ActMyFocus extends BaseActivity {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
         mAdapter.add(new FgtGameFocusList(), "游戏");
         mAdapter.add(new FgtUserFocusLogList(), "人员");
-        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_FOCUS) + "&a=collectionlist&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范");
-        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_FOCUS) + "?only=1").hideProgress()), "遇见");
+//        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_FOCUS) + "&a=collectionlist&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范");
+//        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_FOCUS) + "?only=1").hideProgress()), "遇见");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
         pager.setCurrentItem(0);

app/src/main/java/com/sheep/gamegroup/view/activity/GameTaskOrderListAct.java

@@ -81,8 +81,8 @@ public class GameTaskOrderListAct extends BaseActivity {
     @Override
     public void initData() {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_ORDER) + "?only=1").hideProgress()), "遇见预约");
-        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_ORDER) + "&c=order&status=0&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范订单");
+//        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_ORDER) + "?only=1").hideProgress()), "遇见预约");
+//        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_ORDER) + "&c=order&status=0&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范订单");
 //        mAdapter.add(new FgtGameTaskOrderList(), "其他订单");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -528,8 +528,8 @@ public class FgtPersonalCenter extends BaseFragment {
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_item_price_ic,
             R.id.personalcenter_item_price_tag, R.id.personalcenter_item_price_tv,
             R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.faq_layout, R.id.fgt_pc_item_gift_ll,
-            R.id.version_layout, R.id.order_layout, R.id.audit_activity_cl, R.id.audit_success_cl,
-            R.id.audit_failed_cl, R.id.fgt_person_center_cart, R.id.iv_redpackage, R.id.voucher_layout,
+            R.id.version_layout, R.id.audit_activity_cl, R.id.audit_success_cl,
+            R.id.audit_failed_cl, R.id.iv_redpackage, R.id.voucher_layout,
             R.id.my_card_layout, R.id.vip_layout, R.id.login_name_tv,
             R.id.my_game_layout, R.id.fgt_person_center_my_focus
     })
@@ -616,9 +616,9 @@ public class FgtPersonalCenter extends BaseFragment {
                 SysAppUtil.showVersionInfo(getActivity(), null);
                 USER_UPGRADE.onEvent();
                 break;
-            case R.id.order_layout://订单管理
-                Jump2View.getInstance().goGameTaskOrderList(activity);
-                break;
+//            case R.id.order_layout://订单管理
+//                Jump2View.getInstance().goGameTaskOrderList(activity);
+//                break;
             /*case R.id.proxy_game_account_layout://游戏账号
                 Jump2View.getInstance().goGameAccount(activity, null);
                 break;*/
@@ -646,9 +646,9 @@ public class FgtPersonalCenter extends BaseFragment {
             case R.id.fgt_pc_item_gift_ll:
                 Jump2View.getInstance().goMyWelfare(getActivity(), true);
                 break;
-            case R.id.fgt_person_center_cart:
-                Jump2View.getInstance().goActMyCart();
-                break;
+//            case R.id.fgt_person_center_cart:
+//                Jump2View.getInstance().goActMyCart();
+//                break;
         }
     }
 

app/src/main/res/layout/fgt_personal_center_item_center_one.xml

@@ -157,54 +157,54 @@
 
     </LinearLayout>
 
-    <LinearLayout
-            android:id="@+id/order_layout"
-            android:layout_columnSpan="1"
-            android:layout_rowSpan="1"
-            android:layout_gravity="fill"
-            android:foreground="@drawable/selector_forground_rect_black"
-            android:gravity="center"
-            android:padding="16dp"
-            android:orientation="vertical"
-            android:visibility="visible">
-
-        <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@mipmap/ic_order"/>
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textColor="@color/black_444444"
-                android:text="商城订单"/>
-
-
-    </LinearLayout>
-
-    <LinearLayout
-            android:id="@+id/fgt_person_center_cart"
-            android:layout_columnSpan="1"
-            android:layout_rowSpan="1"
-            android:layout_gravity="fill"
-            android:foreground="@drawable/selector_forground_rect_black"
-            android:gravity="center"
-            android:padding="16dp"
-            android:orientation="vertical">
-
-        <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@mipmap/ic_cart"/>
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textColor="@color/black_444444"
-                android:text="购物车"/>
-    </LinearLayout>
+<!--    <LinearLayout-->
+<!--            android:id="@+id/order_layout"-->
+<!--            android:layout_columnSpan="1"-->
+<!--            android:layout_rowSpan="1"-->
+<!--            android:layout_gravity="fill"-->
+<!--            android:foreground="@drawable/selector_forground_rect_black"-->
+<!--            android:gravity="center"-->
+<!--            android:padding="16dp"-->
+<!--            android:orientation="vertical"-->
+<!--            android:visibility="visible">-->
+
+<!--        <ImageView-->
+<!--                android:layout_width="20dp"-->
+<!--                android:layout_height="20dp"-->
+<!--                android:src="@mipmap/ic_order"/>-->
+
+<!--        <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="8dp"-->
+<!--                android:textColor="@color/black_444444"-->
+<!--                android:text="商城订单"/>-->
+
+
+<!--    </LinearLayout>-->
+
+<!--    <LinearLayout-->
+<!--            android:id="@+id/fgt_person_center_cart"-->
+<!--            android:layout_columnSpan="1"-->
+<!--            android:layout_rowSpan="1"-->
+<!--            android:layout_gravity="fill"-->
+<!--            android:foreground="@drawable/selector_forground_rect_black"-->
+<!--            android:gravity="center"-->
+<!--            android:padding="16dp"-->
+<!--            android:orientation="vertical">-->
+
+<!--        <ImageView-->
+<!--                android:layout_width="20dp"-->
+<!--                android:layout_height="20dp"-->
+<!--                android:src="@mipmap/ic_cart"/>-->
+
+<!--        <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="8dp"-->
+<!--                android:textColor="@color/black_444444"-->
+<!--                android:text="购物车"/>-->
+<!--    </LinearLayout>-->
 
     <LinearLayout
             android:id="@+id/fgt_person_center_my_focus"

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.9.1
-VERSION_CODE=3009001
+VERSION_NAME=3.9.2
+VERSION_CODE=3009002
 ANDROID_COMPILE_SDK_VERSION=30
 ANDROID_MIN_SDK_VERSION=19
 ANDORID_TARGET_SDK_VERSION=28