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

app/src/main/AndroidManifest.xml

@@ -173,10 +173,7 @@
         <activity
             android:name=".page.SplashActivity"
             android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+
         </activity>
         <activity
             android:name="com.sheep.gamegroup.view.activity.AskRewardAct"
@@ -195,7 +192,10 @@
 
         <!--2.0-->
         <activity android:name="com.sheep.gamegroup.view.activity.LoginAct">
-
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
             </activity>
 
         <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"/>

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

@@ -10,7 +10,7 @@ import java.io.Serializable;
 public class TaskAcceptedEty implements Serializable{
     private String create_time;// 0,
     private String device_id;// "string",
-    private String id;// 0,
+    private int id;// 0,
     private String release_task_id;// 0,
     private String remarks;// "string",
     private String screenshots;// "string",
@@ -36,11 +36,11 @@ public class TaskAcceptedEty implements Serializable{
         this.device_id = device_id;
     }
 
-    public String getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(int id) {
         this.id = id;
     }
 

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -6,6 +6,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
+import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -59,7 +60,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1,throwable.getMessage().toString());
+                            view.NetError(-1, "网络异常");
                         }
 
                         @Override
@@ -93,7 +94,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1, ExceptionEngine.handleException(throwable).getMessage());
+                            view.NetError(-1, "网络异常");
                         }
 
                         @Override

app/src/main/java/com/sheep/gamegroup/presenter/PhoneContract.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.presenter;
 
 import com.sheep.gamegroup.exception.ApiException;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
 import org.json.JSONException;
 
@@ -19,8 +20,10 @@ public interface PhoneContract {
     interface View{
         void returnGaptcha(Object o);
 
+        void gaptchaFail(BaseMessage o);
+
         void returnLogindata(Object o);
 
-        void loginFail(ApiException o);
+        void loginFail(BaseMessage o);
     }
 }

app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -8,7 +8,9 @@ import com.orhanobut.logger.Logger;
 import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.XXTEA;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 
 import java.util.HashMap;
@@ -17,6 +19,7 @@ import java.util.Map;
 import javax.inject.Inject;
 
 import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -44,28 +47,20 @@ public class PhonePresenter implements PhoneContract.Presenter {
 //        String encry = XXTEA.Encrypt(j.toString(),XXTEA.KEY);
             String encry = XXTEA.bytes2HexStr(XXTEA.Encrypt(j.toString(), XXTEA.KEY).getBytes("utf-8"));
             Log.e("encry----", com.alibaba.fastjson.JSONObject.toJSONString(encry));
+
             apiService.getCaptcha(j)
                     .subscribeOn(Schedulers.io())
                     .observeOn(rx.android.schedulers.AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<BaseMessage>() {
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                         @Override
-                        public void onCompleted() {
-                            Log.e("onCompleted--------","onCompleted");
-
+                        public void onError(BaseMessage baseMessage) {
+                            view.gaptchaFail(baseMessage);
                         }
 
                         @Override
-                        public void onError(Throwable throwable) {
-                            throwable.printStackTrace();
-                            Logger.e(throwable,"load splash failed:");
-                            Log.e("onError--------","onError:"+throwable);
-                            view.loginFail(null);
-                        }
+                        public void onNext(BaseMessage baseMessage) {
+                            view.returnGaptcha(baseMessage);
 
-                        @Override
-                        public void onNext(BaseMessage o) {
-                            Log.e("onNext--------","onNext:"+o.toString());
-                            view.returnGaptcha(o);
                         }
                     });
         }catch (Exception e){
@@ -83,22 +78,17 @@ public class PhonePresenter implements PhoneContract.Presenter {
 
         apiService.loginByCaptcha(m)
                 .subscribeOn(Schedulers.io())
-                .subscribe(new Observer<BaseMessage>() {
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
-                    public void onCompleted() {
-                        Log.e("onCompleted--------","onCompleted");
+                    public void onError(BaseMessage baseMessage) {
+                        view.loginFail(baseMessage);
 
                     }
 
                     @Override
-                    public void onError(Throwable throwable) {
-                        Log.e("onError--------","onError:"+throwable);
-                        view.loginFail(ExceptionEngine.handleException(throwable));
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage jsonObject) {
-                        view.returnLogindata(jsonObject);
+                    public void onNext(BaseMessage baseMessage) {
+                        view.returnLogindata(baseMessage);
 
                     }
                 });

app/src/main/java/com/sheep/gamegroup/presenter/TryMakeMoneyPresenter.java

@@ -56,6 +56,7 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
 
         apiService.returnTask()
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
@@ -75,6 +76,7 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
 
         apiService.releaseTask()
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
@@ -93,6 +95,7 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
     public void giveUpTask(int id) {
         apiService.giveUpTask(id)
                 .observeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {

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

@@ -35,7 +35,7 @@ public class ChannelContent {
 
     private static final String META_INF_FILE_START = "META-INF/pl_channel_";
     private static final String CHANNEL_FILE_MARK = "pl_channel_";
-    private String channel_name;
+    private String channel_name="";
     private static ChannelContent instance;
     private Properties properties;
     private boolean hasChannelFile = false;

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

@@ -6,7 +6,7 @@ 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.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/";//测试服地址
 

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

@@ -120,12 +120,14 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
                 showToast("微信授权失败");
+                hideProgress();
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
 
                 showToast("微信授权失败");
+                hideProgress();
             }
         });
 
@@ -149,12 +151,13 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
                 showToast("QQ授权失败");
+                hideProgress();
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
 
-
+                hideProgress();
             }
         });
 
@@ -187,7 +190,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 goTelLogin();
                 break;
             case R.id.iv_wx:
-//                Jump2View.getInstance().goHomePageView(this,null);
                 goWeixin();
                 break;
             case R.id.iv_qq:

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

@@ -219,6 +219,17 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     }
 
+    /**
+     * 验证码获取失败
+     * @param o
+     */
+    @Override
+    public void gaptchaFail(BaseMessage o) {
+        hideProgress();
+        G.showToast(o.getMsg() + "");
+
+    }
+
     @Override
     public void returnLogindata(Object o) {
         hideProgress();
@@ -247,7 +258,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     }
 
     @Override
-    public void loginFail(ApiException o) {
+    public void loginFail(BaseMessage o) {
         hideProgress();
         G.showToast("登录失败" + "");
 //        testData();

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

@@ -79,9 +79,9 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
                 .inject(this);
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(this);
-//        for (int i = 0; i < 2; i++) {
-//            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-//        }
+        for (int i = 0; i < 2; i++) {
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        }
         recyclerview.setAdapter(tryMakeMoneyAdp);
     }
 
@@ -170,7 +170,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty));
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
             tryMakeMoneyAdp.addPresenter(presenter);
             tryMakeMoneyAdp.addHaveTask(true);
             mhandler.sendEmptyMessage(0);
@@ -209,7 +209,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
 
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyList));
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyList),1);
             mhandler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+
 import com.sheep.gamegroup.util.ViewHolder;
 
 import java.util.ArrayList;

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

@@ -5,13 +5,17 @@ import android.support.design.widget.AppBarLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
+import com.kfzs.duanduan.adp.AdpCommonRecy;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
@@ -20,21 +24,24 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 /**
  * Created by ljy on 2018/3/20.
  */
 
-public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
+public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private final static int TAG_ID_TEMP = R.id.view_tag_1;
-    private TryMakeMoneyPresenter presenter;
+    @Inject
+    TryMakeMoneyPresenter presenter;
     private boolean isHave;
+    private Context context;
 
     public TryMakeMoneyAdp(Context context) {
         super(context);
@@ -43,8 +50,10 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
     @Override
     public int getViewIdByType(int type) {
+        Log.e("1-----getViewIdByType",type+"");
         int resId = R.layout.empty;
         RecyleType recyleType = RecyleType.values()[type];
+        Log.e("1-----getViewIdByType",recyleType+"");
         switch (recyleType){
             case RELEASE_TASK:
                 resId = R.layout.try_mkmy_release_task_list;
@@ -58,6 +67,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
     @Override
     public void convert(ViewHolder holder, RecyleObj recyleObj) {
+        Log.e("-----convert",recyleObj.getRecyleType()+"");
 
         switch (recyleObj.getRecyleType()){
             case RELEASE_TASK:
@@ -67,11 +77,12 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 bindRunTask(holder, (TaskAcceptedEty) recyleObj.getDataObj());
                 break;
         }
+
     }
 
     @Override
     public int getItemViewType(int position) {
-        return getListDatas().get(position).getRecyleType().ordinal();
+        return getmListDatas().get(position).getRecyleType().ordinal();
     }
     /**
      * 传入presenter
@@ -97,12 +108,12 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 //        recyclerView.setLayoutManager(new LinearLayoutManager(context));
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
-                StaggeredGridLayoutManager.HORIZONTAL));
+                StaggeredGridLayoutManager.VERTICAL));
         recyclerView.setAdapter(new RecyclerView.Adapter(){
 
             @Override
             public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-                View view = LayoutInflater.from(context)
+                LinearLayout view = (LinearLayout) LayoutInflater.from(context)
                         .inflate(R.layout.try_makemoney_item_recommend, viewGroup,false);
                 view.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -128,7 +139,8 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
             @Override
             public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int i) {
-                viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                    viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                Log.e("-----viewholder",i+"");
                 if(i == 0){
 
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
@@ -174,7 +186,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
         cancel_task_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                presenter.giveUpTask(acceptedEty.getRelease_task().getId());
+                presenter.giveUpTask(acceptedEty.getId());
             }
         });
         holder.itemView.setOnClickListener(new View.OnClickListener() {

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@color/bg_gray">
 
@@ -18,8 +18,7 @@
             android:id="@+id/recyclerview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:scrollbars="none"></android.support.v7.widget.RecyclerView>
+            android:orientation="vertical"></android.support.v7.widget.RecyclerView>
     </android.support.v4.widget.SwipeRefreshLayout>
 
 </LinearLayout>

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

@@ -80,5 +80,6 @@
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="@color/white_bg_line"
-        android:layout_marginTop="17dp"/>
+        android:layout_marginTop="17dp"
+        android:visibility="gone"/>
 </LinearLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@color/bg_gray">
 
@@ -17,9 +17,8 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/release_task_listview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="4dp"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"   >
 
     </android.support.v7.widget.RecyclerView>
 

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

@@ -225,7 +225,6 @@
             android:layout_height="wrap_content"
             android:textSize="@dimen/text_size_25"
             android:textColor="@color/black_444444"
-            android:text="5"
             android:id="@+id/tv_size"
             android:layout_centerInParent="true"
             android:textStyle="bold"
@@ -257,7 +256,6 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/text_size_25"
                 android:textColor="@color/txt_red_ff4a5f"
-                android:text="0.63"
                 android:textStyle="bold"
                 android:layout_centerInParent="true"
                 />