3.5.1

app/build.gradle

@@ -107,7 +107,7 @@ android {
             buildConfigField "String", "DUANDUAN_DATASHARE", '"sheep"'
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
-            buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
+            buildConfigField "String", "API_DOMAIN", '"app.ss.kfzs.com"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'

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

@@ -130,7 +130,7 @@ public class FgtMainGame extends BaseCompatFragment {
                 }
 
             }
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
+        }, HelperUtils.makeErr("获取banner数据报错"));
         KFZSNetwork.addRequest(bannerRequest);
 
         GameListBll gameListBll = new GameListBll();
@@ -226,7 +226,7 @@ public class FgtMainGame extends BaseCompatFragment {
                     refreshOver();
 
                 }
-            }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
+            }, HelperUtils.makeErr("接口 v1/index_game 报错"));
             KFZSNetwork.addRequest(bannerRequest);
         }catch (Exception e){
             e.printStackTrace();

app/src/main/java/com/kfzs/duanduan/react/upfile/UpFileUtils.java

@@ -63,8 +63,8 @@ public class UpFileUtils {
             File file;
             if ((file = new File(photos.get(index))).exists()) {
                 File newFile = new CompressHelper.Builder(SheepApp.getInstance())
-                        .setMaxWidth(G.WIDTH)  // 默认最大宽度为720
-                        .setMaxHeight(G.HEIGHT) // 默认最大高度为960
+                        .setMaxWidth(2000)  // 默认最大宽度为720
+                        .setMaxHeight(2000) // 默认最大高度为960
                         .setQuality(80)    // 默认压缩质量为80
                         .setCompressFormat(Bitmap.CompressFormat.JPEG) // 设置默认压缩为jpg格式
                         .build().compressToFile(file);

app/src/main/java/com/kfzs/duanduan/utils/dlg/HelperUtils.java

@@ -17,6 +17,7 @@ import com.android.volleyplus.VolleyError;
 import com.kfzs.appstore.utils.restful.KFZSRestfulError;
 import com.kfzs.appstore.utils.restful.KFZSRestfulErrorCallBack;
 import com.kfzs.duanduan.view.DialogStorageLow;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.kfzs.duanduan.KFZSApp;
 
@@ -77,7 +78,8 @@ public class HelperUtils {
                 if (TextUtils.isEmpty(showMsg)) {
                     return;
                 }
-                G.showToast(showMsg);
+                if(BuildConfig.DEBUG)
+                    G.showToast(showMsg);
             }
         });
     }

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

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
+import com.sheep.gamegroup.util.ListUtil;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -203,6 +205,17 @@ public class TaskEty implements Serializable{
 
 
     public boolean needDownloadApp() {
-        return task_type != 2 || task_type != 4;
+        return task_type != 2 && task_type != 4;//// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思
+    }
+
+    public boolean hasChildInReview() {
+        if(!ListUtil.isEmpty(child)){
+            for (TaskChild taskChild : child) {
+                if(taskChild != null && taskChild.getStatus() == 4){//只要有一个子任务在审核中，就返回true
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 }

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

@@ -170,30 +170,31 @@ public class TestUtil {
      * @param activity
      */
     public static void test(final Activity activity) {
-        final String[] items = {"交通银行信用卡测试", "浦发银行信用卡测试"};
-        AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("请选择要测试的信用卡")
-                .setItems(items, new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        CreditCard creditCard = new CreditCard();
-                        creditCard.setCardName(items[which]);
-                        switch (items[which]) {
-                            case "交通银行信用卡测试":
-                                creditCard.setName("交通银行信用卡");
-//                                creditCard.setLoadUrl("http://mobi.yixiaozhao.jiyuonline.com/bank/10");
-                                creditCard.setLoadUrl("https://creditcardapp.bankcomm.com/applynew/front/apply/campus/index.html?trackCode=A021316596752");
-                                creditCard.setScriptUrl("http://10.8.210.172:8095/BCM_Insert.js");
-                                break;
-                            case "浦发银行信用卡测试":
-                                creditCard.setName("浦发银行信用卡");
-                                creditCard.setLoadUrl("https://ecentre.spdbccc.com.cn/creditcard/indexActivity.htm?data=P754372&itemcode=2017000032");
-                                creditCard.setScriptUrl("http://10.8.210.172:8095/SPDB_Insert.js");
-                                break;
-                        }
-                        Jump2View.getInstance().goCreditCardWeb(activity, creditCard);
-                    }
-                }).create();
-        dialog.show();
+        Jump2View.getInstance().goMainGame(activity);
+//        final String[] items = {"交通银行信用卡测试", "浦发银行信用卡测试"};
+//        AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("请选择要测试的信用卡")
+//                .setItems(items, new DialogInterface.OnClickListener() {
+//
+//                    @Override
+//                    public void onClick(DialogInterface dialog, int which) {
+//                        CreditCard creditCard = new CreditCard();
+//                        creditCard.setCardName(items[which]);
+//                        switch (items[which]) {
+//                            case "交通银行信用卡测试":
+//                                creditCard.setName("交通银行信用卡");
+////                                creditCard.setLoadUrl("http://mobi.yixiaozhao.jiyuonline.com/bank/10");
+//                                creditCard.setLoadUrl("https://creditcardapp.bankcomm.com/applynew/front/apply/campus/index.html?trackCode=A021316596752");
+//                                creditCard.setScriptUrl("http://10.8.210.172:8095/BCM_Insert.js");
+//                                break;
+//                            case "浦发银行信用卡测试":
+//                                creditCard.setName("浦发银行信用卡");
+//                                creditCard.setLoadUrl("https://ecentre.spdbccc.com.cn/creditcard/indexActivity.htm?data=P754372&itemcode=2017000032");
+//                                creditCard.setScriptUrl("http://10.8.210.172:8095/SPDB_Insert.js");
+//                                break;
+//                        }
+//                        Jump2View.getInstance().goCreditCardWeb(activity, creditCard);
+//                    }
+//                }).create();
+//        dialog.show();
     }
 }

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

@@ -267,6 +267,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
 
         }
+        if(taskEty.hasChildInReview()){//只要有一个子任务在审核中，就不能进行其它操作
+            btnTaskItem.setEnabled(false);
+            btnTaskItem.setText("审核中");
+        }
         if(taskEty.getInspect_type() == 3){//应用自动审核任务
             btnUpImag.setText("领取奖励");
         }

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

@@ -335,7 +335,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 if((is_succession == 1 || is_succession == 3)
                         &&  (etyList.get(i).getChild_task_id() > 1
                                 || (etyList.get(i).getChild_task_id() == 1
-                        && (etyList.get(i).getStatus() == 6 || etyList.get(i).getStatus() == 9)))
+                        && (etyList.get(i).getStatus() == 6 || etyList.get(i).getStatus() == 7 || etyList.get(i).getStatus() == 9)))
                         ){
                     viewHolder.itemView.findViewById(R.id.detail_task_tv).setVisibility(View.GONE);
                 }else {

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=2.6.0
-VERSION_CODE=2006000
+VERSION_NAME=2.5.1
+VERSION_CODE=2005001
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18