bug fixed

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -486,7 +486,14 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
 
     @OnClick(R.id.gc_game_app_detail_bt3)
     public void onGoDirectionalPay(View v) {
-        Jump2View.getInstance().gotoGameVipRecharge(gameEntity.getApp());
+        CommonUtil.getInstance().getUserInfo(false, user->{
+            if(user!=null) return;
+            if(user.isVIP()){
+                Jump2View.getInstance().gotoGameVipRecharge(gameEntity.getApp());
+            } else {
+                Jump2View.getInstance().gotoVip(this);
+            }
+        });
     }
 
     private AbsGetDownloadListener absGetDownloadListener = new AbsGetDownloadListener(false) {

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -738,6 +738,10 @@ public class CommonUtil {
     }
 
     public void getUserInfo(boolean force, Action1<UserEntity> callback) {
+        if(!force && DataUtil.getInstance().getUserEntity()!=null){
+            callback.call(DataUtil.getInstance().getUserEntity());
+            return;
+        }
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()

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

@@ -371,9 +371,14 @@ public class ActGcGameAppDetail extends BaseActivity {
 
     @OnClick(R.id.gc_game_app_detail_bt3)
     public void onGoDirectionalPay(View v) {
-        String url = Config.getUrlByPath(Config.PATH_DIRECTIONAL_RECHARGE + "/" + gameEntity.getApp().getGame_discount_id() + "?authorization="+ SpUtils.getToken(this) + "&ssnocache=1");
-        WebParams webParams = new WebParams(url, "抢购优惠").setShowTitle(false);
-        Jump2View.getInstance().goWeb(this, webParams);
+        CommonUtil.getInstance().getUserInfo(false, user->{
+            if(user!=null) return;
+            if(user.isVIP()){
+                Jump2View.getInstance().gotoGameVipRecharge(gameEntity.getApp());
+            } else {
+                Jump2View.getInstance().gotoVip(this);
+            }
+        });
     }
 
     private AbsGetDownloadListener absGetDownloadListener = new AbsGetDownloadListener(true) {

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

@@ -88,10 +88,6 @@ public class ActMyMoney extends BaseActivity {
     TextView my_money_dingxiang_amount;
     @BindView(R.id.my_money_dingxiang_amount_iv)
     ImageView my_money_dingxiang_amount_iv;
-    @BindView(R.id.my_money_appoint_task_amount)
-    TextView my_money_appoint_task_amount;
-    @BindView(R.id.mm_at_red_dot_v)
-    View mm_at_red_dot_v;
 
     private TitleFragmentListAdapter mAdapter;
 
@@ -113,7 +109,6 @@ public class ActMyMoney extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitle(this, "我的资产")
                 .setTitleFinish(this);
-        ViewUtil.setVisibility(mm_at_red_dot_v, DataUtil.getAsBoolean(FgtHome.KEY_HAS_APPOINT_TASK, false));
         //顶部背景添加弧度
         GlideImageLoader.setImage(act_my_money_bg_iv, ViewUtil.getNetImgByName("home_blue_bg_hb"), R.mipmap.home_blue_bg);
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
@@ -242,8 +237,6 @@ public class ActMyMoney extends BaseActivity {
             R.id.my_money_dingxiang_amount_iv,
             R.id.my_money_dingxiang_amount,
             R.id.my_money_dingxiang_tag,
-            R.id.my_money_appoint_task_amount,
-            R.id.my_money_appoint_task_tag,
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -253,11 +246,6 @@ public class ActMyMoney extends BaseActivity {
             case R.id.my_money_recharge_tv://充值
                 Jump2View.getInstance().goRechargeAct(ActMyMoney.this, "我的资产");
                 break;
-            case R.id.my_money_appoint_task_amount://定向奖励
-            case R.id.my_money_appoint_task_tag://定向奖励
-                ViewUtil.setVisibility(mm_at_red_dot_v, false);
-                Jump2View.getInstance().goAppointTaskList(true);
-                break;
             case R.id.my_money_dingxiang_amount_iv://定向货币详情
             case R.id.my_money_dingxiang_amount://定向货币详情
             case R.id.my_money_dingxiang_tag://定向货币详情
@@ -316,7 +304,6 @@ public class ActMyMoney extends BaseActivity {
         my_money_agent_extract.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getExtension_extract())));
         my_money_recharge_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getUse_balance())));
         my_money_available_amount.setText(getString(R.string.available_amount, NumberFormatUtils.retainMost2W(userAssets.getCash_withdrawal())));
-        my_money_appoint_task_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getAppoint_task_amount())));
         my_money_dingxiang_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getDirectional_currency())));
     }
 
@@ -329,7 +316,6 @@ public class ActMyMoney extends BaseActivity {
         my_money_agent_extract.setText(getString(R.string.total_money, "0.00"));
         my_money_recharge_amount.setText(getString(R.string.total_money, "0.00"));
         my_money_available_amount.setText(getString(R.string.available_amount, "0.00"));
-        my_money_appoint_task_amount.setText(getString(R.string.total_money, "0.00"));
         my_money_dingxiang_amount.setText(getString(R.string.total_money, "0.00"));
     }
 
@@ -348,8 +334,4 @@ public class ActMyMoney extends BaseActivity {
         Jump2View.getInstance().goGameRecharge(this, null);
     }
 
-    //点击龙猫电竞
-    public void onClickLongMao(View view) {
-        Jump2View.getInstance().gotoLongMao(this);
-    }
 }

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

@@ -178,16 +178,6 @@
                         </LinearLayout>
 
                         <TextView
-                            android:id="@+id/my_money_appoint_task_amount"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/total_money"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
-
-                        <TextView
                             android:id="@+id/my_money_recharge_amount"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -235,12 +225,6 @@
                             android:textColor="@color/white"
                             android:textSize="12sp" />
 
-                        <RelativeLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-                            <include layout="@layout/include_mm_at"/>
-                        </RelativeLayout>
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -300,17 +284,6 @@
                         android:textSize="12sp"
                         android:visibility="gone"
                         android:text="游戏直充"/>
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:drawableTop="@mipmap/ic_long_mao"
-                        android:drawablePadding="10dp"
-                        android:gravity="center"
-                        android:textColor="#ff333333"
-                        android:onClick="onClickLongMao"
-                        android:textSize="12sp"
-                        android:text="龙猫电竞"/>
                 </LinearLayout>
                 <android.support.design.widget.TabLayout
                     android:id="@+id/indicator"