Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/BaseCompatFragment.java

@@ -18,6 +18,8 @@ import com.kf.utils.ToastBuilder;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.lang.reflect.Field;
 
 /**
@@ -221,6 +223,10 @@ public abstract class BaseCompatFragment extends Fragment {
         }
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
 
     /**
      * 设置刷新组件

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -28,6 +28,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import javax.inject.Inject;
@@ -91,6 +92,7 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
     };
 
     public void initView() {
+        EventBus.getDefault().register(this);
         activity = getActivity();
         ButterKnife.bind(this,mContentView);
         DaggerSmallSheepComponent.builder()
@@ -166,4 +168,11 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
                 break;
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        EventBus.getDefault().unregister(this);
+    }
 }

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

@@ -8,11 +8,11 @@ public class WithdrawalEty {
     private String amount;// 0,
     private String create_time;// 0,
     private String desc;// "string",
-    private String id;// 0,
+    private int id;// 0,
     private String order_no;// "string",
-    private String pay_status;// 0,
-    private String risk_status;// 0,
-    private String status;// 0,
+    private int pay_status;// 0,
+    private int risk_status;// 0,
+    private int status;// 0,
     private String surplus_amount;// 0,
     private String total_amount;// 0,
     private String type;// 0,
@@ -45,11 +45,11 @@ public class WithdrawalEty {
         this.desc = desc;
     }
 
-    public String getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(int id) {
         this.id = id;
     }
 
@@ -61,27 +61,27 @@ public class WithdrawalEty {
         this.order_no = order_no;
     }
 
-    public String getPay_status() {
+    public int getPay_status() {
         return pay_status;
     }
 
-    public void setPay_status(String pay_status) {
+    public void setPay_status(int pay_status) {
         this.pay_status = pay_status;
     }
 
-    public String getRisk_status() {
+    public int getRisk_status() {
         return risk_status;
     }
 
-    public void setRisk_status(String risk_status) {
+    public void setRisk_status(int risk_status) {
         this.risk_status = risk_status;
     }
 
-    public String getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 

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

@@ -6,8 +6,8 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-//  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
-     public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
+  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+//     public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
 //   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 
     public static final String V1 = "/v1/";

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

@@ -114,6 +114,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 case 0:
                     task_entity.setRunTask(1);
                     setBtnState();
+                    loadTvAdp.notifyDataSetChanged();
                     break;
                 case 1:
                     Bundle bundle = msg.getData();
@@ -157,9 +158,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         loadTvAdp = new DownLoadTvAdp(activity, infoList);
         listview_down.setAdapter(loadTvAdp);
 
-        loadTvAdp.setTaskState(type);
-        loadTvAdp.addTaskPreference(preference);
-        loadTvAdp.addTaskEty(task_entity);
+         setBtnState();
 
         //Todo ok
         JSONObject jsonObject = new JSONObject();
@@ -181,7 +180,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 .taskDialogModule(new TaskDialogModule(this))
                 .build()
                 .inject(DialogActivity.this);
-        setBtnState();
         webview.setWebChromeClient(new WebChromeClient() {
 
         });
@@ -358,6 +356,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             }
         }
         start_task_tv.setText(buttonStr);
+
+        loadTvAdp.setTaskState(type);
+        loadTvAdp.addTaskPreference(preference);
+        loadTvAdp.addTaskEty(task_entity);
     }
 
     /**
@@ -372,7 +374,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 handler.sendEmptyMessage(0);
                 G.showToast("接收任务成功");
             }
-
             EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         }catch (Exception e){
             e.printStackTrace();

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

@@ -2,6 +2,8 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSONArray;
@@ -18,6 +20,7 @@ import com.sheep.gamegroup.view.adapter.TaskListItemAdp;
 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;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;
@@ -43,6 +46,14 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View{
     private TaskListItemAdp adp;
     private List<TaskAcceptedEty> etyList = new ArrayList<>();
 
+    Handler handler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            adp.notifyDataSetChanged();
+        }
+    };
+
 
     @Override
     protected int getLayoutId() {
@@ -62,6 +73,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View{
                 .setTitle(this, "任务记录")
                 .setTitleFinish(this);
         adp = new TaskListItemAdp(activity , etyList);
+        adp.notifyDataSetChanged();
 
     }
 
@@ -84,6 +96,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View{
             etyList.clear();
             etyList.addAll(releaseEtyList);
             adp.notifyDataSetChanged();
+            handler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -91,6 +104,6 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View{
 
     @Override
     public void failView(Object o) {
-
+        G.showToast(((BaseMessage) o).getMsg()+"");
     }
 }

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

@@ -29,6 +29,7 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 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.List;
@@ -72,6 +73,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
     @Override
     public void initView() {
+        EventBus.getDefault().register(this);
         ButterKnife.bind(this);
         activity = this;
         TitleBarUtils
@@ -241,4 +243,11 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
                 break;
         }
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        EventBus.getDefault().unregister(this);
+    }
 }

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

@@ -16,6 +16,7 @@ import com.sheep.gamegroup.view.adapter.WithdrawalListAdp;
 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;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;
@@ -92,6 +93,6 @@ public class WithdrawalListAct extends BaseActivity implements WithdrawalListCon
 
     @Override
     public void failView(Object o) {
-
+        G.showToast(((BaseMessage) o).getMsg()+"");
     }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/DownLoadTvAdp.java

@@ -96,8 +96,9 @@ public class DownLoadTvAdp extends BaseAdapter {
         }
         if(taskType == 0){//开始任务
             holder.start_task_tv.setText("开始任务");
-        }else {
-            holder.refreshkem();
+        }
+        else {
+            holder.refresh();
             if (downloadInfo.getState().value() < DownloadState.FINISHED.value()) {
                 try {
                     downloadManager.startDownload(
@@ -162,44 +163,30 @@ public class DownLoadTvAdp extends BaseAdapter {
             refresh();
         }
 
+
         public void refresh() {
             start_task_tv.setText(downloadInfo.getProgress() + "%");
             DownloadState state = downloadInfo.getState();
             switch (state) {
                 case WAITING:
                 case STARTED:
-                    start_task_tv.setText("继续");
-                    break;
-                case ERROR:
-                case STOPPED:
-                    break;
-                case FINISHED:
-                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                        start_task_tv.setText("已安装");
-                    } else {
-                        start_task_tv.setText("安 装");
-                        PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                    if(downloadInfo.getProgress() == 0){
+                        start_task_tv.setText("开始下载");
+
+                    }else if(downloadInfo.getProgress() == 100){
+                        start_task_tv.setText("开始试玩");
                     }
-                    break;
-                default:
-                    break;
-            }
-        }
+                    else {
 
-        public void refreshkem() {
-            start_task_tv.setText(downloadInfo.getProgress() + "%");
-            DownloadState state = downloadInfo.getState();
-            switch (state) {
-                case WAITING:
-                case STARTED:
-                    start_task_tv.setText("继续");
+                        start_task_tv.setText("继续");
+                    }
                     break;
                 case ERROR:
                 case STOPPED:
                     break;
                 case FINISHED:
                     if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                        start_task_tv.setText("已安装");
+                        start_task_tv.setText("开始试玩");
                     } else {
                         start_task_tv.setText("安 装");
                     }
@@ -251,33 +238,6 @@ public class DownLoadTvAdp extends BaseAdapter {
                             break;
                     }
                     break;
-                case R.id.iv_remove:
-                    try {
-                        downloadManager.removeDownload(downloadInfo);
-                        File file = new File(downloadInfo.getFileSavePath());
-                        if (file.exists()) {
-                            file.delete();
-                        }
-                        notifyDataSetChanged();
-                        refresh();
-                    } catch (DbException e) {
-                        Toast.makeText(x.app(), "移除任务失败", Toast.LENGTH_LONG).show();
-                    }
-                    break;
-
-                case R.id.tv_prorgess:
-                case R.id.ll_install:
-                    DownloadState states = downloadInfo.getState();
-                    switch (states) {
-                        case FINISHED:
-                            if (!PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                            }else{
-                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
-                            }
-                            break;
-                    }
-                    break;
 
             }
         }

app/src/main/java/com/sheep/gamegroup/view/adapter/WithdrawalListAdp.java

@@ -59,7 +59,7 @@ public class WithdrawalListAdp extends BaseAdapter {
         }
 
         WithdrawalEty ety = (WithdrawalEty) getItem(position);
-        holder.name_tv.setText(ety.getDesc()+"");
+        holder.name_tv.setText(ety.getDesc()+"提现");
         try {
             holder.date_tv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(ety.getUpdate_time()))+"");
         }catch (Exception e){

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -12,6 +12,8 @@ import android.widget.Toast;
 
 import com.sheep.gamegroup.util.ActivityManager;
 
+import org.greenrobot.eventbus.EventBus;
+
 import butterknife.ButterKnife;
 
 /**
@@ -63,12 +65,10 @@ public abstract class BaseActivity extends AppActivity  {
     }
 
 
-
-
-
-
-
-
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {

app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatService.java

@@ -69,7 +69,6 @@ public class FloatService extends Service implements View.OnClickListener {
     @Override
     public void onCreate() {
         super.onCreate();
-        EventBus.getDefault().register(this);
         Log.i(TAG, "MainService Created");
         mSize = DeviceInfo.getDeviceSize(this);
         createToucher();
@@ -173,7 +172,6 @@ public class FloatService extends Service implements View.OnClickListener {
         if (floaticon != null) {
             mWm.removeView(mFloatwindow);
         }
-        EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -115,7 +115,6 @@ public class MainActivity extends BaseActivity {
             showNewDialog();
         }
         super.onCreate(savedInstanceState);
-        EventBus.getDefault().register(this);
         startOpenXFK();
         goToQX();
 

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

@@ -6,11 +6,9 @@
 
     <TextView
         android:id="@+id/start_task_tv"
-        android:layout_width="151dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginLeft="@dimen/content_padding_40"
-        android:layout_marginRight="@dimen/content_padding_40"
         android:layout_marginTop="@dimen/content_padding_small"
         android:background="@drawable/sp_bg_gradient_rectangle_yellow"
         android:gravity="center"

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

@@ -81,11 +81,12 @@
 
                 <LinearLayout
                     android:id="@+id/start_layout"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/listview"
                     android:layout_centerHorizontal="true"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <com.sheep.gamegroup.view.customview.SProgress
                         android:id="@+id/start_stask_sprogress"
@@ -123,21 +124,20 @@
                         android:textSize="18sp"
                         android:textColor="@color/txt_black"
                         android:visibility="gone"/>
-                    <com.sheep.gamegroup.util.MyListview
-                        android:id="@+id/listview_down"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        android:divider="@null"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginLeft="@dimen/content_padding_40"
-                        android:layout_marginRight="@dimen/content_padding_40"
-                        android:layout_marginTop="@dimen/content_padding_small"
-                        android:gravity="center"
-                        android:minHeight="36dp"
-                        android:minWidth="151dp"></com.sheep.gamegroup.util.MyListview>
                 </LinearLayout>
 
+                <com.sheep.gamegroup.util.MyListview
+                    android:id="@+id/listview_down"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    android:divider="@null"
+                    android:layout_below="@+id/listview"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginLeft="@dimen/content_padding_40"
+                    android:layout_marginRight="@dimen/content_padding_40"
+                    android:layout_marginTop="@dimen/content_padding_15"/>
+
                 <TextView
                     android:id="@+id/doalog_item_get_rewards_tv"
                     android:layout_width="wrap_content"
@@ -160,8 +160,8 @@
 
             <ImageView
                 android:id="@+id/dialog_item_x"
-                android:layout_width="22dp"
-                android:layout_height="22dp"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
                 android:padding="2dp"
                 android:layout_alignParentEnd="true"
                 android:src="@mipmap/try_dialog_x"