bug 修改

app/src/main/java/com/sheep/gamegroup/di/components/FgtTryMakeMoneyComponent.java

@@ -2,7 +2,7 @@ package com.sheep.gamegroup.di.components;
 
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney2;
+import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 
 import dagger.Component;
 
@@ -13,5 +13,5 @@ import dagger.Component;
 @UserScope
 @Component(modules = TryMakeMoneyModule.class, dependencies = NetComponent.class)
 public interface FgtTryMakeMoneyComponent {
-    void inject(FgtTryMakeMoney2 fgtTryMakeMoney);
+    void inject(FgtTryMakeMoney fgtTryMakeMoney);
 }

app/src/main/java/com/sheep/gamegroup/di/components/FgtTryMakeMoneyComponent2.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney2;
+
+import dagger.Component;
+
+/**
+ * Created by ljy on 2018/4/27.
+ */
+
+@UserScope
+@Component(modules = TryMakeMoneyModule.class, dependencies = NetComponent.class)
+public interface FgtTryMakeMoneyComponent2 {
+    void inject(FgtTryMakeMoney2 fgtTryMakeMoney);
+}

app/src/main/java/com/sheep/gamegroup/model/entity/WithdrawalList.java

@@ -6,7 +6,7 @@ package com.sheep.gamegroup.model.entity;
  */
 
 public class WithdrawalList {
-    private int amount;// 0,
+    private String amount;// 0,
             private String created_time;// 0,
             private int id;// 0,
             private int status = 1;// 1显示 2不显示
@@ -23,11 +23,11 @@ public class WithdrawalList {
         this.gridViewEntity = gridViewEntity;
     }
 
-    public int getAmount() {
+    public String getAmount() {
         return amount;
     }
 
-    public void setAmount(int amount) {
+    public void setAmount(String amount) {
         this.amount = amount;
     }
 

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

@@ -47,10 +47,10 @@ public class TryMakeMoneyact extends BaseActivity {
                 .setTitleFinish(activity);
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
-//        mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
-//        mAdapter.add(FgtTryMakeMoney.newInstance(1), titles[1]);
-        mAdapter.add(new FgtTryMakeMoney2(0), titles[0]);
-        mAdapter.add(new FgtTryMakeMoney2(1), titles[1]);
+        mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
+        mAdapter.add(FgtTryMakeMoney.newInstance(1), titles[1]);
+//        mAdapter.add(FgtTryMakeMoney2.newInstance(0), titles[0]);
+//        mAdapter.add(FgtTryMakeMoney2.newInstance(1), titles[1]);
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
 

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

@@ -161,7 +161,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
     private void doWithdrawal() {
 //        String price1 = ((GridViewEntity)withdrawalGreidview.getSelectedItem()).getValue();
-        amount = ((GridViewEntity)listData.get(select)).getValue();
+        amount = wlLists.get(select).getGridViewEntity().getValue();
         if(TextUtils.isEmpty(amount)){
             G.showToast("请选择金额");
             return;

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

@@ -114,9 +114,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         initListener();
     }
 
-    public FgtTryMakeMoney(int type) {
-        this.type = type;
-    }
 
 //    @Override
 //    protected void initView(Bundle savedInstanceState) {
@@ -133,11 +130,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 .getInstance()
                 .setTitle(activity, "试玩赚钱")
                 .setTitleFinish(activity);
-//        DaggerFgtTryMakeMoneyComponent.builder()
-//                .netComponent(SheepApp.get(activity).getNetComponent())
-//                .tryMakeMoneyModule(new TryMakeMoneyModule(FgtTryMakeMoney.this))
-//                .build()
-//                .inject(FgtTryMakeMoney.this);
+        DaggerFgtTryMakeMoneyComponent.builder()
+                .netComponent(SheepApp.get(activity).getNetComponent())
+                .tryMakeMoneyModule(new TryMakeMoneyModule(FgtTryMakeMoney.this))
+                .build()
+                .inject(FgtTryMakeMoney.this);
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         for (int i = 0; i < 2; i++) {

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

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
+import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent2;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RecyleObj;
@@ -82,8 +83,12 @@ public class FgtTryMakeMoney2 extends BaseFragment implements TryMakeMoneyContra
         }
     };
 
-    public FgtTryMakeMoney2(int type) {
-        this.type = type;
+    public static FgtTryMakeMoney2 newInstance(int type){
+        FgtTryMakeMoney2 fgtTryMakeMoney = new FgtTryMakeMoney2();
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", type);
+        fgtTryMakeMoney.setArguments(bundle);
+        return fgtTryMakeMoney;
     }
 
     @Override
@@ -94,6 +99,11 @@ public class FgtTryMakeMoney2 extends BaseFragment implements TryMakeMoneyContra
     @Override
     public void onViewCreated() {
         ButterKnife.bind(this, mView);
+
+        Bundle bundle = getArguments();
+        if(bundle != null){
+            type = bundle.getInt("type", 0);
+        }
         initView();
     }
     public void initView() {
@@ -104,7 +114,7 @@ public class FgtTryMakeMoney2 extends BaseFragment implements TryMakeMoneyContra
                 .getInstance()
                 .setTitle(activity, "试玩赚钱")
                 .setTitleFinish(activity);
-        DaggerFgtTryMakeMoneyComponent.builder()
+        DaggerFgtTryMakeMoneyComponent2.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .tryMakeMoneyModule(new TryMakeMoneyModule(FgtTryMakeMoney2.this))
                 .build()

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

@@ -12,11 +12,6 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/content_padding_10">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="abcdef"/>
-
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerview"
             android:layout_width="match_parent"

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

@@ -14,6 +14,8 @@
         <com.sheep.gamegroup.util.MyListview
             android:id="@+id/recyclerview"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:scrollbars="none"
+            android:divider="@null"/>
     </android.support.v4.widget.SwipeRefreshLayout>
 </LinearLayout>