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

重新提交下线失败任务后,刷新任务记录列表;充值界面完善

zengjiebin лет назад: 8
Родитель
Сommit
de5c0328fb

+ 1 - 0
app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -30,4 +30,5 @@ public enum EventTypes {
     TASK_AGAIN_UPLOAD_FILE_DATA,//任务审核上传图片 通知
     REFRESH_DATA_PHONE,//刷新手机
     REFRESH_DATA_SIGN,//签到对话框
+    TASK_RECORD_LIST_UPDATE,//任务记录列表刷新
 }

+ 2 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -24,12 +24,12 @@ import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.ApkUtils;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.di.components.DaggerTaskDetailComponent;
 import com.sheep.gamegroup.di.modules.TaskDetailModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -38,7 +38,6 @@ import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -47,14 +46,12 @@ import com.sheep.gamegroup.presenter.TaskDetailPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTaskDetailChildListview;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
@@ -541,7 +538,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //                            onGetNetImageUrl(data);
         dismissLoaddingDialog();
         G.showToast("提交成功,等待审核!");
-//        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
+        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.TASK_RECORD_LIST_UPDATE));
         UMConfigUtils.finishTask();
         finish();
     }

+ 25 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/TaskListAct.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSONArray;
+import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerTaskListComponent;
 import com.sheep.gamegroup.di.modules.TaskListModule;
@@ -21,6 +22,9 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -59,6 +63,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View {
 
     @Override
     public void initView() {
+        EventBus.getDefault().register(this);
         activity = this;
         DaggerTaskListComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
@@ -80,10 +85,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View {
         swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-
-                etyList.clear();
-                page = 1;
-                initData();
+                refreshData();
             }
         });
 
@@ -109,6 +111,12 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View {
 
     }
 
+    private void refreshData() {
+        etyList.clear();
+        page = 1;
+        initData();
+    }
+
     @Override
     public void initListener() {
 
@@ -148,6 +156,19 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View {
     }
 
     @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case TASK_RECORD_LIST_UPDATE:
+                refreshData();
+                break;
+        }
+    }
+    @Override
     public void taskStatusSuccess(BaseMessage baseMessage) {
 
     }

+ 1 - 1
app/src/main/res/layout/recharge_act_layout.xml

@@ -40,7 +40,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="7dp"
                         android:paddingLeft="@dimen/content_padding_big"
-                        android:text="充值金额" />
+                        android:text="充值金额(不可提现,只可消费)" />
 
 
                     <com.sheep.gamegroup.util.MyGridview

+ 1 - 1
app/src/main/res/layout/signrecharge_act_layout.xml

@@ -40,7 +40,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="7dp"
                         android:paddingLeft="@dimen/content_padding_big"
-                        android:text="充值金额(不可提现)" />
+                        android:text="充值金额(不可提现,只可消费)" />