Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

.idea/gradle.xml

@@ -10,6 +10,7 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/datashare" />
+            <option value="$PROJECT_DIR$/kfzslibrary" />
             <option value="$PROJECT_DIR$/ucrop" />
             <option value="$PROJECT_DIR$/view" />
           </set>

app/src/main/AndroidManifest.xml

@@ -235,6 +235,8 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
             android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.TaskDetailAct"
+            android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.DialogToastAct"
             android:theme="@style/MyDialogActivityTheme"
             />

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

@@ -0,0 +1,25 @@
+package com.kfzs.duanduan.fragment;
+
+import android.os.Bundle;
+import android.webkit.WebView;
+
+import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.jiuyan.samllsheep.R;
+
+/**
+ * 借着玩界面
+ * Created by realicing on 2018/04/02.
+ * realicing@sina.com
+ */
+public class FgtBorrowPlay extends BaseCompatFragment{
+
+    private WebView fgt_bp_webview;
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        setContentView(R.layout.fgt_bp);
+        fgt_bp_webview = getViewById(R.id.fgt_bp_webview);
+        fgt_bp_webview.loadUrl("http://www.baidu.com");
+    }
+
+}

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

@@ -0,0 +1,25 @@
+package com.kfzs.duanduan.fragment;
+
+import android.os.Bundle;
+import android.webkit.WebView;
+
+import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.jiuyan.samllsheep.R;
+
+/**
+ * 借着玩界面
+ * Created by realicing on 2018/04/02.
+ * realicing@sina.com
+ */
+public class FgtCreditCard extends BaseCompatFragment{
+
+    private WebView fgt_bp_webview;
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        setContentView(R.layout.fgt_bp);
+        fgt_bp_webview = getViewById(R.id.fgt_bp_webview);
+        fgt_bp_webview.loadUrl("http://www.baidu.com");
+    }
+
+}

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -4,6 +4,8 @@ import android.support.v4.app.Fragment;
 import android.widget.ImageView;
 
 import com.kfzs.duanduan.ActMain;
+import com.kfzs.duanduan.fragment.FgtBorrowPlay;
+import com.kfzs.duanduan.fragment.FgtCreditCard;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.VipStyle;
@@ -16,42 +18,58 @@ import com.kfzs.duanduan.fragment.FgtMainGame;
  */
 
 public enum MainTab {
-    FgtSmallSheep(R.string.mine_hoggerel, 0) {
+    FgtMainGame(R.string.tab_viewpager_gamestore, 0) {
         @Override
         public Fragment getFragment() {
-            return new FgtSmallSheep();
+            return new FgtMainGame();
         }
 
         @Override
         protected String getImgUrl1() {
-            return VipStyle.getInstance().getWo1();
+            return VipStyle.getInstance().getGame1();
         }
 
         @Override
         protected String getImgUrl2() {
-            return VipStyle.getInstance().getWo2();
+            return VipStyle.getInstance().getGame2();
         }
     },
-    FgtMainGame(R.string.tab_viewpager_gamestore, 1) {
+    FgtMainCategory(R.string.tab_viewpager_classification, 1) {
         @Override
         public Fragment getFragment() {
-            return new FgtMainGame();
+            return new FgtMainCategory();
         }
 
         @Override
         protected String getImgUrl1() {
-            return VipStyle.getInstance().getGame1();
+            return VipStyle.getInstance().getCate1();
         }
 
         @Override
         protected String getImgUrl2() {
-            return VipStyle.getInstance().getGame2();
+            return VipStyle.getInstance().getCate2();
         }
     },
-    FgtMainCategory(R.string.tab_viewpager_classification, 2) {
+    FgtSmallSheep(R.string.mine_hoggerel, 2) {
         @Override
         public Fragment getFragment() {
-            return new FgtMainCategory();
+            return new FgtSmallSheep();
+        }
+
+        @Override
+        protected String getImgUrl1() {
+            return VipStyle.getInstance().getWo1();
+        }
+
+        @Override
+        protected String getImgUrl2() {
+            return VipStyle.getInstance().getWo2();
+        }
+    },
+    Bp(R.string.tab_viewpager_borrowplay, 3) {
+        @Override
+        public Fragment getFragment() {
+            return new FgtBorrowPlay();
         }
 
         @Override
@@ -64,10 +82,10 @@ public enum MainTab {
             return VipStyle.getInstance().getCate2();
         }
     },
-    FgtCreditCard(R.string.tab_viewpager_credit_card, 3) {
+    CreditCard(R.string.tab_viewpager_credit_card, 4) {
         @Override
         public Fragment getFragment() {
-            return new FgtMainCategory();
+            return new FgtCreditCard();
         }
 
         @Override

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

@@ -4,13 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.HashMap;
 
 import javax.inject.Inject;
 
-import rx.Observer;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -36,32 +37,20 @@ public class AccountAndSecuritPresenter implements  AccountAndSecuritContract.Pr
 
         apiService.getInfo().subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseMessage>() {
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
-                    public void onCompleted() {
-
-                    }
-
-                    @Override
-                    public void onError(Throwable throwable) {
+                    public void onError(BaseMessage baseMessage) {
                         view.NetError(-1,"请求网络异常");
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-
                         if(baseMessage!=null){
 
 
-                            UserInfoEntity loginEty = FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),UserInfoEntity.class);
-                            view.showTask(loginEty);
+                        UserInfoEntity loginEty = FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),UserInfoEntity.class);
+                        view.showTask(loginEty);
 
                         }
-
-
-
                     }
-                });
-
-    }
-}
+                }); } }

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

@@ -8,8 +8,10 @@ import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.LoginEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import org.xutils.ex.DbException;
 
@@ -42,27 +44,21 @@ public class AskGetMoneyPresenter implements AskGetMoneyContract.Presenter {
         apiService.FriendCountAndAward()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseMessage>() {
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
-                    public void onCompleted() {
-                        Log.e("onCompleted--------","onCompleted");
-                    }
-
-                    @Override
-                    public void onError(Throwable throwable) {
-                        Log.e("onError--------","onError:"+throwable);
-                         view.NetError(-1,ExceptionEngine.handleException(throwable).getMessage());
+                    public void onError(BaseMessage baseMessage) {
+                        view.NetError(-1, baseMessage.getMsg());
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-
                         if(baseMessage!=null){
                             FriendAndAwardEntity Ety = FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),FriendAndAwardEntity.class);
                             view.showTask(Ety);
                         }else{
                             view.NetError(-1,"数据解析出错");
                         }
+
                     }
                 });
 

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

@@ -10,6 +10,7 @@ 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;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -55,14 +56,9 @@ public class LoginPresenter implements LoginContract.Presenter {
         if(type==1){
             apiService.LoginByWX(j).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<BaseMessage>() {
-                        @Override
-                        public void onCompleted() {
-
-                        }
-
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                         @Override
-                        public void onError(Throwable throwable) {
+                        public void onError(BaseMessage baseMessage) {
                             view.NetError(-1, "微信登录失败  请检查网络是否正常");
                         }
 
@@ -83,7 +79,6 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                             view.NetSuccess(1,"登录成功");
 
-
                         }
                     });
 

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

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 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.jiuyan.samllsheep.SheepApp;
 
 import java.util.HashMap;
 
@@ -39,32 +41,22 @@ public class ReNamePresenter implements  ReNameContract.Presenter  {
         apiService.changeBaseInfo(j)
                 .subscribeOn(Schedulers.io())
                 .observeOn(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) {
 
-                    }
-
-                    @Override
-                    public void onError(Throwable throwable) {
-                        Log.e("onError--------","onError:"+throwable);
-                        view.NetError(-1, ExceptionEngine.handleException(throwable).getMessage());
+                        view.NetError(-1, baseMessage.getMsg()+"");
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-
                         if(baseMessage!=null){
-                          view.NetSuccess(1,"修改昵称成功");
+                            view.NetSuccess(1,"修改昵称成功");
                         }else{
                             view.NetError(-1,"数据解析出错");
                         }
+
                     }
                 });
-
-
-
-
     }
 }

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

@@ -6,8 +6,15 @@ import com.alibaba.fastjson.JSONObject;
 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.entity.LoginEntity;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import org.xutils.ex.DbException;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -45,21 +52,17 @@ public class RealNameAutherPresenter implements  RealNameAutherContract.Presente
         view.showGoProgress();
         apiService.bindALl(jsonObject).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseMessage>() {
-                    @Override
-                    public void onCompleted() {
-
-                    }
-
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
-                    public void onError(Throwable throwable) {
+                    public void onError(BaseMessage baseMessage) {
 
                         view.NetError(-1,"绑定信息失败");
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                         view.NetSuccess(0,"修改成功");
+                        view.NetSuccess(0,"修改成功");
+
                     }
                 });
 

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

@@ -29,6 +29,7 @@ import com.sheep.gamegroup.view.activity.PersionInfoAct;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.gamegroup.view.activity.PhoneAct;
 import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
+import com.sheep.gamegroup.view.activity.TaskDetailAct;
 import com.sheep.gamegroup.view.activity.TaskListAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.activity.WithdrawalAct;
@@ -266,6 +267,16 @@ public class Jump2View {
         context.startActivity(intent);}
 
     /**
+     * 跳出弹框页面
+     * @param context
+     * @param o
+     */
+    public synchronized void goTaskDetailView(Context context, TaskEty o){
+        Intent intent = new Intent(context, TaskDetailAct.class);
+        intent.putExtra("task_entity", o);
+        context.startActivity(intent);}
+
+    /**
      * 跳到已做过任务列表页面
      * @param context
      * @param o

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

@@ -136,6 +136,15 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     @Override
                     public void onClick(View v) {
                         G.showToast("任务详情");
+                        if(isHave){
+                            G.showToast("请先取消已接受的任务");
+                            return;
+                        }
+                        TaskEty taskEty = etyList.get(i).getTask();
+                        taskEty.setRunTask(0);
+                        taskEty.setRelease_task_id(etyList.get(i).getId());
+                        taskEty.setName(etyList.get(i).getName());
+                        Jump2View.getInstance().goDialogActivityView(context, taskEty);
                     }
                 });
                 Glide.with(context)
@@ -193,6 +202,11 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
             @Override
             public void onClick(View v) {
                 G.showToast("任务详情");
+                TaskEty taskEty = acceptedEty.getRelease_task().getTask();
+                taskEty.setRunTask(1);
+                taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
+                taskEty.setName(acceptedEty.getRelease_task().getName());
+                Jump2View.getInstance().goDialogActivityView(context, taskEty);
             }
         });
         holder.itemView.setOnClickListener(new View.OnClickListener() {

app/src/main/res/drawable-hdpi/drawable_selector_bp.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/tab_bp_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/tab_bp_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/tab_bp"/>
+
+</selector>

app/src/main/res/drawable-hdpi/drawable_selector_credit.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/tab_credit_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/tab_credit_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/tab_credit"/>
+
+</selector>

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

@@ -48,40 +48,51 @@
             <TextView
                 android:layout_width="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
-                android:drawableTop="@drawable/drawable_selector_task"
+                android:drawableTop="@drawable/drawable_selector_game"
                 android:textSize="12sp"
                 android:gravity="center"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/mine_hoggerel"/>
+                android:text="@string/tab_viewpager_gamestore"/>
             <View android:layout_weight="2"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/tab_height"/>
             <TextView
                 android:layout_width="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
-                android:drawableTop="@drawable/drawable_selector_game"
+                android:drawableTop="@drawable/drawable_selector_class"
                 android:textSize="12sp"
                 android:gravity="center"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/tab_viewpager_gamestore"/>
+                android:text="@string/tab_viewpager_classification"/>
             <View android:layout_weight="2"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/tab_height"/>
             <TextView
                 android:layout_width="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
-                android:drawableTop="@drawable/drawable_selector_class"
+                android:drawableTop="@drawable/drawable_selector_task"
                 android:textSize="12sp"
                 android:gravity="center"
                 android:textColor="@color/selector_color_main_tab"
-                android:text="@string/tab_viewpager_classification"/>
+                android:text="@string/mine_hoggerel"/>
             <View android:layout_weight="2"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/tab_height"/>
             <TextView
                 android:layout_width="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
-                android:drawableTop="@drawable/drawable_selector_class"
+                android:drawableTop="@drawable/drawable_selector_bp"
+                android:textSize="12sp"
+                android:gravity="center"
+                android:textColor="@color/selector_color_main_tab"
+                android:text="@string/tab_viewpager_borrowplay"/>
+            <View android:layout_weight="2"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/tab_height"/>
+            <TextView
+                android:layout_width="@dimen/tab_width"
+                android:layout_height="@dimen/tab_height"
+                android:drawableTop="@drawable/drawable_selector_credit"
                 android:textSize="12sp"
                 android:gravity="center"
                 android:textColor="@color/selector_color_main_tab"

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

@@ -0,0 +1,10 @@
+<?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">
+
+    <WebView
+        android:id="@+id/fgt_bp_webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

app/src/main/res/values/str_appstore_strings.xml

@@ -22,7 +22,7 @@
     <string name="tab_viewpager_bbs">论坛</string>
     <string name="tab_viewpager_task">任务</string>
     <string name="tab_viewpager_classification">分类</string>
-    <string name="tab_viewpager_credit_card">金融</string>
+    <string name="tab_viewpager_credit_card">信用卡</string>
     <string name="tab_viewpager_user">我</string>
     <string name="function_come_soon">功能完善中..</string>
     <string name="mine_hoggerel">小绵羊</string>