Просмотр исходного кода

修复我的资产中可能点击无效果的bug

zengjiebin лет назад: 7
Родитель
Сommit
0fd2646360

+ 1 - 2
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -24,7 +24,6 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.CheckUserLabel;
 import com.sheep.gamegroup.model.entity.CreditCard;
 import com.sheep.gamegroup.model.entity.DialogEntity;
-import com.sheep.gamegroup.model.entity.NewAboutUs;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
@@ -1101,7 +1100,7 @@ public class Jump2View {
                     public void onNext(BaseMessage baseMessage) {
                         LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         Advertising advertising = baseMessage.getData(Advertising.class);
-                        ViewUtil.showHalfScreenAd(advertising);
+                        ViewUtil.showHalfScreenAd(activity, advertising);
                     }
 
                     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -219,7 +219,7 @@ public class TestUtil {
                                 Jump2View.getInstance().checkLabel(activity, null);
                                 break;
                             case "定向货币详情":
-                                ViewUtil.showOrienteeringDetails();
+                                ViewUtil.showOrienteeringDetails(activity);
                                 break;
                             case "提交身份认证时的提示":
                                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA,"你已执行%d次实名认证操作", 0))

+ 4 - 5
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -354,8 +354,7 @@ public class ViewUtil {
 
     public static final int REQUEST_CODE_TASK_LIST = 110;
 
-    public static void showHalfScreenAd(final Advertising advertising) {
-        final Activity activity = ActivityManager.getInstance().currentActivity();
+    public static void showHalfScreenAd(final Activity activity, final Advertising advertising) {
         if (activity != null) {
             View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
             final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
@@ -436,7 +435,7 @@ public class ViewUtil {
             dialog_rl.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    SplashAct.goAdLink(ActivityManager.getInstance().currentActivity(), advertising);
+                    SplashAct.goAdLink(activity, advertising);
                     dialog.dismiss();
                 }
             });
@@ -461,8 +460,8 @@ public class ViewUtil {
         }
     }
     //显示定向货币详情
-    public static void showOrienteeringDetails() {
-        new DialogOrienteeringDetails().showOrienteeringDetails();
+    public static void showOrienteeringDetails(Activity activity) {
+        new DialogOrienteeringDetails(activity).showOrienteeringDetails();
     }
 
     public static void setText(TextView textView) {

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

@@ -121,7 +121,7 @@ public class ActMyMoney extends BaseActivity {
                 Jump2View.getInstance().goRechargeAct(ActMyMoney.this, null);
                 break;
             case R.id.my_money_dingxiang_amount_iv://定向货币详情
-                ViewUtil.showOrienteeringDetails();
+                ViewUtil.showOrienteeringDetails(ActMyMoney.this);
                 break;
         }
     }

+ 2 - 3
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogOrienteeringDetails.java

@@ -16,7 +16,6 @@ import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
@@ -40,8 +39,8 @@ import rx.schedulers.Schedulers;
 public class DialogOrienteeringDetails {
     private Activity activity;
     private int gao;
-    public DialogOrienteeringDetails(){
-        activity = ActivityManager.getInstance().currentActivity();
+    public DialogOrienteeringDetails(Activity activity){
+        this.activity = activity;
         gao = SheepApp.getInstance().getResources().getDimensionPixelSize(R.dimen.content_padding_10)*5;
         maxShowCount = Math.max(6, G.HEIGHT*3/4/gao);
     }