优化新手任务标签可能超出显示区域的问题；优化信用卡界面刷新功能；修复邀请好友提成列表显示的提成金额不显示小数的问题；修复只有一条数据时，试玩赚钱和首页中摘取任务时显示有问题的bug

app/build.gradle

@@ -50,7 +50,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.config
         }

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

@@ -61,6 +61,7 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
 
     public void initData() {
         list.clear();
+        empty_view.setVisibility(View.INVISIBLE);
         SheepApp.getInstance().getNetComponent().getApiService().getCreditCardScheduleList()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

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

@@ -71,6 +71,7 @@ public class FgtCreditCardTaskList extends BaseFragment {
 
     private void initData() {
         list.clear();
+        empty_view.setVisibility(View.INVISIBLE);
         SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCard()
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

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

@@ -325,6 +325,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
 
         position = 0;
+        releaseEtyLists.clear();
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(1);
         for (int i = 0; i < 2; i++) {
@@ -575,7 +576,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void releaseTaskTaskUpdataView(Object o) {
 
-        releaseEtyLists.clear();
         position = 0;
         try {
             BaseMessage baseMessage = (BaseMessage) o;
@@ -880,7 +880,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     }
     private void testChange(){
-        if(BuildConfig.DEBUG){
+        if(BuildConfig.DEBUG || !"sheep".equals(BuildConfig.FLAVOR)){
             test_change.setVisibility(View.VISIBLE);
             test_change.setText(SheepApp.getInstance().getConnectAddress().getName());
             test_change.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/kfzs/duanduan/view/DragRelativeLayout.java

@@ -2,8 +2,9 @@ package com.kfzs.duanduan.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewParent;
 import android.widget.RelativeLayout;
 
 import com.sheep.jiuyan.samllsheep.R;
@@ -29,6 +30,10 @@ public class DragRelativeLayout extends RelativeLayout {
     float padding = getResources().getDimension(R.dimen.content_padding_10);
     float moveX;
     float moveY;
+    float x;
+    float y;
+
+    static final int MIN_MOVE_DISTANCE = 10;
     private boolean isMove = false;
     @Override
     public boolean onTouchEvent(MotionEvent event) {
@@ -37,27 +42,35 @@ public class DragRelativeLayout extends RelativeLayout {
                 isMove = false;
                 moveX = event.getX();
                 moveY = event.getY();
+                x = getX();
+                y = getY();
                 break;
             case MotionEvent.ACTION_MOVE:
-                isMove = true;
-                setX(getX() + (event.getX() - moveX));
-                setY(getY() + (event.getY() - moveY));
-                Log.e("moveX---",moveX+"");
-                Log.e("moveY---",moveY+"");
-                Log.e("event.getX()---",event.getX()+"");
-                Log.e("event.getY()---",event.getY()+"");
-                if(event.getX() -moveX >10 || event.getX() -moveX < -10
-                        ||event.getY() - moveY >10 || event.getY() - moveY < 10){
-                    isMove = true;
-                }else {
-                    isMove = false;
-                }
+                float mx = getX() + event.getX() - moveX;
+                float my = getY() + event.getY() - moveY;
+                setX(mx);
+                setY(my);
+                isMove = Math.abs(mx-x) > MIN_MOVE_DISTANCE || Math.abs(my-y) > MIN_MOVE_DISTANCE;
                 break;
             case MotionEvent.ACTION_UP:
+                //纠正X
                 if (getX() * 2 < G.WIDTH)
                     setX(padding);
                 else
                     setX(G.WIDTH - padding - getWidth());
+                //纠正Y
+                if(getY() < padding){
+                    setY(padding);
+                } else {
+                    ViewParent parent = getParent();
+                    if (parent instanceof View) {
+                        float maxY = ((View) parent).getHeight() - padding - getHeight();
+                        if (getY() > maxY) {
+                            setY(maxY);
+                        }
+                    }
+                }
+
                 if(!isMove){//没有移动过就点击
                     performClick();
                 }

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

@@ -5,7 +5,7 @@ package com.sheep.gamegroup.model.entity;
  * realicing@sina.com
  */
 public class Friend {
-    private int award_amount;
+    private String award_amount;
 
     private String wx_openid;
 
@@ -55,10 +55,10 @@ public class Friend {
 
     private int create_time;
 
-    public void setAward_amount(int award_amount){
+    public void setAward_amount(String award_amount){
         this.award_amount = award_amount;
     }
-    public int getAward_amount(){
+    public String getAward_amount(){
         return this.award_amount;
     }
     public void setWx_openid(String wx_openid){

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

@@ -1,6 +1,10 @@
 package com.sheep.gamegroup.util;
 
- /**
+import android.text.TextUtils;
+
+import com.sheep.gamegroup.model.entity.CreditCardProgressQuery;
+
+/**
  * Created by realicing on 2018/4/27.
  * realicing@sina.com
  */
@@ -27,4 +31,12 @@ public class BtStatusUtil {
         }
         return "上传截图";
     }
+    /**
+     * CreditCardProgressQuery.status
+     * status; 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线
+     * @return
+     */
+    public static String getUploadText(CreditCardProgressQuery creditCardProgressQuery) {
+        return TextUtils.isEmpty(creditCardProgressQuery.getRemarks()) ? getUploadText(creditCardProgressQuery.getStatus()) : creditCardProgressQuery.getRemarks();
+    }
 }

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

@@ -95,7 +95,7 @@ public class ChannelContent {
         }
         return hasChannelFile;
     }
-    private static final String[] defaultChannels = {"976873", "849198", "935404", "25284360", "40253514", "38291072", "61337548"};
+    private static final String[] defaultChannels = {"976873", "849198", "935404", "849198", "935404"};//, "25284360", "40253514", "38291072", "61337548"};
     public String getChannel_name() {
         if (TextUtils.isEmpty(channel_name)) {
             return defaultChannels[Math.abs(new Random().nextInt())%defaultChannels.length];

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

@@ -79,7 +79,7 @@ public class CreditCardProgressQueryAdp extends BaseAdapter {
             }
         });
         holder.credit_card_task_upload_tv.setEnabled(BtStatusUtil.getEnabled(creditCardProgressQuery.getStatus()));
-        holder.credit_card_task_upload_tv.setText(BtStatusUtil.getUploadText(creditCardProgressQuery.getStatus()));
+        holder.credit_card_task_upload_tv.setText(BtStatusUtil.getUploadText(creditCardProgressQuery));
         holder.credit_card_task_upload_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

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

@@ -75,9 +75,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
 
-            tryMakeMoneyAdp.getmListDatas();
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
-            tryMakeMoneyAdp.getmListDatas();
             tryMakeMoneyAdp.refreshAdapter();
             if(tryMakeMoneyAdp.getmListDatas() == null || tryMakeMoneyAdp.getmListDatas().size() <1){
 
@@ -182,6 +180,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void initData() {
         download_mgr_empty_view.setVisibility(View.GONE);
         position = 0;
+        releaseEtyLists.clear();
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(type);
         for (int i = 0; i < 2; i++) {
@@ -289,7 +288,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     @Override
     public void releaseTaskTaskUpdataView(Object o) {
-        releaseEtyLists.clear();
         try{
             position = 0;
             BaseMessage baseMessage = (BaseMessage) o;

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

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:clipChildren="true"
     android:background="@color/bg_gray">
 
     <android.support.v4.widget.SwipeRefreshLayout