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

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

@@ -430,7 +430,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         break;
                     case 1:
                         Jump2View.getInstance()
-                                .goHomePageView(activity, 4);
+                                .goHomePageView(activity, 3);
                         break;
                 }
             }

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

@@ -67,22 +67,22 @@ public enum MainTab {
             return VipStyle.getInstance().getWo2();
         }
     },
-    Bp(R.string.tab_viewpager_borrowplay) {
-        @Override
-        public Fragment getFragment() {
-            return new FgtBorrowPlay();
-        }
-
-        @Override
-        protected String getImgUrl1() {
-            return VipStyle.getInstance().getCate1();
-        }
-
-        @Override
-        protected String getImgUrl2() {
-            return VipStyle.getInstance().getCate2();
-        }
-    },
+//    Bp(R.string.tab_viewpager_borrowplay) {
+//        @Override
+//        public Fragment getFragment() {
+//            return new FgtBorrowPlay();
+//        }
+//
+//        @Override
+//        protected String getImgUrl1() {
+//            return VipStyle.getInstance().getCate1();
+//        }
+//
+//        @Override
+//        protected String getImgUrl2() {
+//            return VipStyle.getInstance().getCate2();
+//        }
+//    },
     CreditCard(R.string.tab_viewpager_credit_card) {
         @Override
         public Fragment getFragment() {

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

@@ -106,8 +106,8 @@ public class TabsHelper {
             UMConfigUtils.onEvent(UMConfigUtils.Event.TAB_CATEGORY);
         }else if(position == MainTab.FgtSmallSheep.ordinal()) {
             UMConfigUtils.onEvent(UMConfigUtils.Event.TAB_SHEEP);
-        }else if(position == MainTab.Bp.ordinal()) {
-            UMConfigUtils.onEvent(UMConfigUtils.Event.TAB_JIEZHEWAN);
+//        }else if(position == MainTab.Bp.ordinal()) {
+//            UMConfigUtils.onEvent(UMConfigUtils.Event.TAB_JIEZHEWAN);
         }else if(position == MainTab.CreditCard.ordinal()) {
             UMConfigUtils.onEvent(UMConfigUtils.Event.TAB_CREDITCARD);
         }

app/src/main/java/com/kfzs/duanduan/utils/DiscountUtils.java

@@ -34,6 +34,29 @@ public class DiscountUtils {
      * @param discount 打折的文本
      */
     public void showDiscount(View view, String logo, String discount) {
+//        Glide.with(view.getContext()).load(logo)
+//                .into((ImageView) view.findViewById(R.id.img_logo));
+//        if (TextUtils.isEmpty(discount)
+//                || discount.startsWith("10")) {
+//            view.findViewById(R.id.img_discount)
+//                    .setVisibility(View.GONE);
+//            ((TextView) view.findViewById(R.id.txt_logo_discount)
+//            ).setText("");
+//        } else {
+//            ((TextView) view.findViewById(R.id.txt_logo_discount)
+//            ).setText((discount.length() == 4?discount.substring(0, 3):discount) + "折");
+//            view.findViewById(R.id.img_discount)
+//                    .setVisibility(View.VISIBLE);
+//        }
+        showDiscountNew(view, logo, discount);
+    }
+    /**
+     * 需求变化了，暂时屏蔽 showDiscount（）方法里面的代码
+     * @param view     logo的layout组件View
+     * @param logo     Logo的URL
+     * @param discount 打折的文本
+     */
+    public void showDiscountNew(View view, String logo, String discount) {
         Glide.with(view.getContext()).load(logo)
                 .into((ImageView) view.findViewById(R.id.img_logo));
         if (TextUtils.isEmpty(discount)

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -219,6 +219,13 @@ public interface ApiService {
 //    @GET(V1 + "app/accepted_task/status")
 //    Observable<BaseMessage> taskStatus(@Body JSONObject jsonObject);
 
+    /**
+     * 获取可用余额
+     * @return
+     */
+    @GET(V1 +"/app/user/get_can_withdraw_amount")
+    Observable<BaseMessage> getCanWithdrawAmount();
+
     @GET(V1 + "loan/userRecord")
     Observable<BaseMessage> userRecord();
     @GET(V1 + "loan/getYinkerLoanUrl")

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

@@ -12,7 +12,7 @@ public class TaskEty implements Serializable{
     private String create_time;// 0,
     private String download_link;//private String string",
     private int id;// 0,
-    private String inspect_type;// 0,
+    private int inspect_type = 1;// 1自动审核　2手动审核
     private String package_names;//private String string",
     private String remarks;//private String string",
     private String screenshots;//private String string",
@@ -117,11 +117,11 @@ public class TaskEty implements Serializable{
         this.id = id;
     }
 
-    public String getInspect_type() {
+    public int getInspect_type() {
         return inspect_type;
     }
 
-    public void setInspect_type(String inspect_type) {
+    public void setInspect_type(int inspect_type) {
         this.inspect_type = inspect_type;
     }
 

app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java

@@ -7,6 +7,7 @@ import com.kfzs.appstore.utils.string.HexUtils;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.api.StringConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
@@ -71,8 +72,10 @@ public class AddPuplicParameIntercept implements Interceptor {
             }
         }
         String id = SpUtils.getOpenId(SheepApp.mContext);
+        String deviceId = DeviceUtil.getDeviceId(SheepApp.mContext);
         Request r = oldRequest.newBuilder()
                 .addHeader("Authorization", TextUtils.isEmpty(id) ? "" : id)//header 会覆盖以前的  header
+                .addHeader("X-Device-Id", TextUtils.isEmpty(deviceId) ? "" : deviceId)//header 会覆盖以前的  header
                 .method(method, body)
                 .url(b.build())
                 .build();

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.presenter;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
 /**
  * Created by ljy on 2018/3/18.
@@ -11,11 +12,14 @@ public interface WithdrawalContract {
     interface Presenter{
 
         void goWithdrawal(JSONObject jsonObject);
+        void getCanWithdrawAmount();
 
     }
 
     interface View{
         void failData(Object o);
         void updateView(Object o);
+        void failBalanceData(BaseMessage o);
+        void updateBalanceView(BaseMessage o);
     }
 }

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

@@ -44,4 +44,22 @@ public class WithdrawalPresenter implements WithdrawalContract.Presenter {
                     }
                 });
     }
+
+    @Override
+    public void getCanWithdrawAmount() {
+        apiService.getCanWithdrawAmount()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.failBalanceData(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.updateBalanceView(baseMessage);
+                    }
+                });
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.util;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
@@ -256,7 +257,7 @@ public class Jump2View {
     public void goBindDataView(Context context, Object o) {
         Intent intent = new Intent(context, BindDataAct.class);
         intent.putExtra("stype", Integer.valueOf(o.toString()));
-        context.startActivity(intent);
+        ((Activity)context).startActivityForResult(intent, 0);
     }
 
     /**

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

@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
@@ -140,6 +141,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
         });
         webText.getSettings().setJavaScriptEnabled(true);
+        webText.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);//适应屏幕，内容将自动缩放
         webText.setWebViewClient(new WebViewClient(){
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
             @Override
@@ -155,12 +157,12 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
         taskSchedule();
 
-        if (taskEty.getRunTask() == 1){
-            detailTaskTv.setVisibility(View.VISIBLE);
-            bottom_btn_layout.setVisibility(View.VISIBLE);
-        }else {
+        if (taskEty.getRunTask() == 0 || taskEty.getInspect_type() == 2){
             detailTaskTv.setVisibility(View.INVISIBLE);
             bottom_btn_layout.setVisibility(View.GONE);
+        }else {
+            detailTaskTv.setVisibility(View.VISIBLE);
+            bottom_btn_layout.setVisibility(View.VISIBLE);
 
         }
         if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {

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

@@ -63,9 +63,10 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     WithdrawalPresenter presenter;
 
     private WithdrawalAdapter adapter;
-    ArrayList<Object> listData = new ArrayList<>();
+    private ArrayList<Object> listData = new ArrayList<>();
     private int select;
-    String amount;
+    private String amount;
+    private int balanceAmount = 0;//余额
 
     @Override
     protected int getLayoutId() {
@@ -103,6 +104,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
                 }
             }
         });
+        showProgress();
+        presenter.getCanWithdrawAmount();
     }
 
     @Override
@@ -117,12 +120,12 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
             UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
             if(userEntity != null){
                 weixin_name_tv.setText(userEntity.getWx_nickname() +"");
-                String sr = "可提现金额<font color='#ff2d4b'><small>" + userEntity.getMobile() + "</small></font>元";
-                withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
             }
         } catch (DbException e) {
             e.printStackTrace();
         }
+        String sr = "可提现金额<font color='#ff2d4b'><small>" + balanceAmount + "</small></font>元";
+        withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
     }
 
 
@@ -203,4 +206,21 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.INTENT_AMOUNT_VALUE));
         Jump2View.getInstance().goWithdrawalResultview(activity, amount);
     }
+
+    @Override
+    public void failBalanceData(BaseMessage o) {
+        hideProgress();
+        G.showToast(o.getMsg()+"");
+    }
+
+    @Override
+    public void updateBalanceView(BaseMessage o) {
+
+        hideProgress();
+        String balanceA =  o.getData() +"";
+        balanceAmount = TextUtils.isEmpty(balanceA)?0:Integer.valueOf(balanceA);
+
+        String sr = "可提现金额 <font color='#ff2d4b'><big>" + balanceAmount + "</big></font> 元";
+        withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
+    }
 }

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

@@ -78,7 +78,7 @@
             <View android:layout_weight="2"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/tab_height"/>
-            <TextView
+            <!--<TextView
                 android:layout_width="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"
                 android:drawableTop="@drawable/drawable_selector_bp"
@@ -88,7 +88,7 @@
                 android:text="@string/tab_viewpager_borrowplay"/>
             <View android:layout_weight="2"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/tab_height"/>
+                android:layout_height="@dimen/tab_height"/>-->
             <TextView
                 android:layout_width="@dimen/tab_width"
                 android:layout_height="@dimen/tab_height"

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

@@ -0,0 +1,6 @@
+<?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">
+
+</LinearLayout>

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

@@ -7,13 +7,14 @@
 
     <include
         layout="@layout/title"/>
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
         <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:scrollbars="none">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -136,9 +137,6 @@
 
                     </LinearLayout>
                 </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/layout_heigh_large"/>
             </LinearLayout>
         </ScrollView>
 
@@ -168,7 +166,7 @@
                 android:layout_weight="1"
                 android:text="上传截图"/>
         </LinearLayout>
-    </RelativeLayout>
+    </LinearLayout>
 
 
 

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

@@ -18,6 +18,8 @@
     <color name="divier">#cdcdcd</color>
 
     <!--所有文本都用标准大小，从来不自己写数值-->
+    <dimen name="text_size_5sp">5sp</dimen>
+    <dimen name="text_size_7sp">7sp</dimen>
     <dimen name="text_size_1">9sp</dimen>
     <dimen name="text_size_2">11sp</dimen>
     <dimen name="text_size_3">14sp</dimen>