Prechádzať zdrojové kódy

部分修改 提交

liujiangyao 8 rokov pred
rodič
commit
321b33dfb6

+ 5 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/RequestParameEty.java

@@ -10,6 +10,11 @@ public class RequestParameEty {
     private int page;
     private int per_page;
 
+    public RequestParameEty(int page, int per_page) {
+        this.page = page;
+        this.per_page = per_page;
+    }
+
     public int getPage() {
         return page;
     }

+ 7 - 1
app/src/main/java/com/sheep/gamegroup/model/util/ExceptionHandle.java

@@ -5,6 +5,7 @@ import android.util.Log;
 import com.alibaba.fastjson.JSONException;
 import com.google.gson.JsonParseException;
 
+import java.io.IOException;
 import java.net.ConnectException;
 
 import retrofit2.adapter.rxjava.HttpException;
@@ -28,7 +29,7 @@ public class ExceptionHandle {
         Log.i("tag", "e.toString = " + e.toString());
         if (e instanceof HttpException) {
             HttpException httpException = (HttpException) e;
-            ex = new ResponeThrowable(e, ERROR.HTTP_ERROR);
+            ex = new ResponeThrowable(e, httpException.code());
             switch (httpException.code()) {
                 case UNAUTHORIZED:
                 case FORBIDDEN:
@@ -41,6 +42,11 @@ public class ExceptionHandle {
                 default:
                     //ex.code = httpException.code();
                     ex.message = "网络错误";
+                    try {
+                        ex.message = httpException.response().errorBody().string();
+                    } catch (IOException e1) {
+                        e1.printStackTrace();
+                    }
                     break;
             }
             return ex;

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/presenter/WithdrawalPresenter.java

@@ -63,7 +63,7 @@ public class WithdrawalPresenter implements WithdrawalContract.Presenter {
 
                     @Override
                     public void onError(Throwable throwable) {
-                        view.failData(throwable);
+                        view.failData(throwable.getMessage());
                     }
 
                     @Override

+ 12 - 10
app/src/main/java/com/sheep/gamegroup/view/activity/BindDataAct.java

@@ -9,9 +9,12 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.di.components.DaggerBindDataComponent;
+import com.sheep.gamegroup.di.modules.BindDataModule;
 import com.sheep.gamegroup.presenter.BindDataContract;
 import com.sheep.gamegroup.presenter.BindDataPresenter;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -73,8 +76,14 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
 
     @Override
     public void initView() {
+        ButterKnife.bind(this);
         activity = this;
-        type = getIntent().getIntExtra("", 0);
+        DaggerBindDataComponent.builder()
+                .netComponent(SheepApp.get(this).getNetComponent())
+                .bindDataModule(new BindDataModule(this))
+                .build()
+                .inject(this);
+        type = getIntent().getIntExtra("stype", 0);
         assemblyData(type);
         txtBaseactivityTitle.setText(title);
     }
@@ -88,21 +97,14 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
     public void initData() {
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
-    @OnClick({R.id.sure_text, R.id.user_layout, R.id.img_baseactivity_title})
+    @OnClick({R.id.sure_text, R.id.img_baseactivity_title})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.sure_text:
                 assemblyData(type);
                 submit();
                 break;
-            case R.id.user_layout:
+            case R.id.img_baseactivity_title:
                 finish();
                 break;
         }

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

@@ -7,6 +7,7 @@ import android.support.v7.widget.RecyclerView;
 
 import com.sheep.gamegroup.di.components.DaggerTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
+import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.jiuyan.samllsheep.R;
@@ -50,12 +51,20 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
     @Override
     public void initListener() {
-
+        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                initData();
+                refresh.setRefreshing(false);
+            }
+        });
     }
 
     @Override
     public void initData() {
 
+        presenter.acceptedTask(new RequestParameEty(1, 10));
+        presenter.returnTask(null);
     }
 
     @Override

+ 15 - 9
app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalAct.java

@@ -147,16 +147,22 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     @Override
     public void failData(Object o) {
         hideProgress();
-        BaseMessage baseMessage = (BaseMessage) o;
-        switch (baseMessage.getCode()){
-            case 40001:
-                break;
-            case 40002:
-                break;
-            case 40003:
-                break;
+        try {
+            BaseMessage baseMessage = (BaseMessage) o;
+            switch (baseMessage.getCode()){
+                case 40001:
+                case 40002:
+                case 40003:
+                    Jump2View.getInstance().goBindDataView(activity, baseMessage.getCode());
+                    break;
+                default:
+                    G.showToast(" 网络错误!");
+                    break;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            G.showToast(" 网络错误!");
         }
-        Jump2View.getInstance().goBindDataView(activity, baseMessage.getCode());
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/WithdrawalAdapter.java

@@ -56,7 +56,7 @@ public class WithdrawalAdapter extends BaseAdapter {
             int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
             int cricleRadius = W / 4  -50;
             int h = cricleRadius  / 3;
-            convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, h));
+            convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, ViewGroup.LayoutParams.WRAP_CONTENT));
 //            convertView.setPadding(0,0,0,2);
             convertView.setTag(holder);
         }else {