修复h5任务type引用错误的问题

发新版本3.2.1

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

@@ -346,7 +346,7 @@ public class ActSignCard extends BaseActivity {
     }
 
     private void 参加打卡() {
-        UMConfigUtils.Event.PUNCH_SIGN_UP.onEvent();
+        UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
         SheepApp.getInstance().getNetComponent().getApiService().getPunch()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -378,7 +378,7 @@ public class ActSignCard extends BaseActivity {
     }
 
     private void 参加报名() {
-        UMConfigUtils.Event.PUNCH_PUNCH.onEvent();
+        UMConfigUtils.Event.PUNCH_SIGN_UP.onEvent();
         CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
             @Override
             public void call(UserEntity userEntity) {
@@ -436,8 +436,6 @@ public class ActSignCard extends BaseActivity {
                         sign_card_join.setEnabled(false);
                         sign_card_join.setText(String.format(Locale.CHINA, "%s后可打卡", TimeUtil.getHours(totalTime-- * 1000)));
                         sendEmptyMessageDelayed(msg.what, 1000L);
-                    } else {
-                        initPunchType();
                     }
                     break;
             }
@@ -446,13 +444,24 @@ public class ActSignCard extends BaseActivity {
     private long totalTime = INIT;
     private void initBtnState() {
         if(punchAndSign != null && initCanSignUp == SUCCESS && punchType > SUCCESS){//初始化成功
-            if (punchType == PUNCH_TYPE_CAN_PUNCH) {//可以打卡
-                sign_card_join.setEnabled(true);
-                sign_card_join.setText("立即打卡");
-            } else if (isCanSignUp) {//可以报名
+            switch (punchType){
+                case PUNCH_TYPE_NOT_SIGN_UP:
+                    sign_card_join.setEnabled(false);
+                    sign_card_join.setText("昨日未报名");
+                    break;
+                case PUNCH_TYPE_CAN_PUNCH://可以打卡
+                    sign_card_join.setEnabled(true);
+                    sign_card_join.setText("立即打卡");
+                    break;
+                case PUNCH_TYPE_HAD_PUNCH://已打卡
+                    sign_card_join.setEnabled(false);
+                    sign_card_join.setText("已参与");
+                    break;
+            }
+            if (isCanSignUp) {//可以报名
                 sign_card_join.setEnabled(true);
                 sign_card_join.setText("参加打卡挑战");
-            } else {
+            } else if(totalTime > 0) {
                 sign_card_join.setEnabled(false);
                 totalTime = punchAndSign.getCountdown();
                 handler.sendEmptyMessage(0);//开始计时

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

@@ -105,6 +105,7 @@ import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_CREDIT_CARD;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_SHEEP;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_TECENT;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_XIAO_MI;
+import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_H5;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_SUCCESSION;
 import static com.sheep.gamegroup.util.CommonUtil.START_TASK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_GET;
@@ -335,7 +336,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         updateBottom();
     }
     private static final int TASK_TYPE_INIT = -1;//初始化状态，可能是未领取，如果不是请让第一按钮处于不可见或者不可操作状态
-    private static final int TASK_TYPE_H5 = 10;//h5任务标志
+    private static final int TASK_TYPE_COMMON_H5 = 10;//h5任务标志
     private static final int TASK_TYPE_SUCCESSION_H5_OUT = 13;//连续任务中的h5任务标志
     private static final int TASK_TYPE_SUCCESSION_H5_IN = 12;//连续任务中的h5任务标志
     private static final int TASK_TYPE_RESERVATION = 11;//游戏任务中还不可以下载任务(预约任务)-->预约游戏
@@ -367,7 +368,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     switch (taskEty.getOpen_mode()){//连续任务的打开方式 1:打开应用 2:H5内部 3:H5外部
                         case OPEN_MODE_TYPE_H5_OUT:
                         case OPEN_MODE_TYPE_H5_IN:
-                            type = TASK_TYPE_H5 + taskEty.getOpen_mode();
+                            type = TASK_TYPE_COMMON_H5 + taskEty.getOpen_mode();
                             btnTaskItem.setText(START_TASK);
                             break;
                         case OPEN_MODE_TYPE_APP:
@@ -409,7 +410,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         if(taskEty.isApplet()){
                             btnTaskItem.setVisibility(View.GONE);
                         }else {
-                            type = TASK_TYPE_H5;
+                            type = TASK_TYPE_COMMON_H5;
                             btnTaskItem.setText(START_TASK);
                         }
 
@@ -452,7 +453,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         switch (taskEty.getOpen_mode()){//连续任务的打开方式 1:打开应用 2:H5内部 3:H5外部
                             case OPEN_MODE_TYPE_H5_OUT:
                             case OPEN_MODE_TYPE_H5_IN:
-                                type = TASK_TYPE_H5 + taskEty.getOpen_mode();
+                                type = TASK_TYPE_COMMON_H5 + taskEty.getOpen_mode();
                                 btnTaskItem.setText(START_TASK);
                                 break;
                             case OPEN_MODE_TYPE_APP:
@@ -893,7 +894,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             case DownloadUtil.STATUS_INSTALLED:
                 PackageUtil.startApp(SheepApp.getInstance(), taskEty.getPackage_names());
                 break;
-            case TASK_TYPE_H5://h5任务跳转h5页面
+            case TASK_TYPE_COMMON_H5://h5任务跳转h5页面
                 Ext ext;
                 if (taskEty == null || (ext = EntityUtils.getExtInfo(taskEty.getExt())) == null || TextUtils.isEmpty(ext.getUrl())) {
                     G.showToast(R.string.service_data_error);

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

@@ -56,8 +56,7 @@
                 android:layout_width="0.0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="3"
-                android:gravity="center_vertical"
-                android:paddingLeft="@dimen/content_padding_10"
+                android:gravity="center"
                 android:text="用户名称"
                 android:textColor="#282828"
                 android:textSize="@dimen/text_size_12" />

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

@@ -34,8 +34,7 @@
         android:layout_width="0.0dp"
         android:layout_height="match_parent"
         android:layout_weight="3"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/content_padding_10"
+        android:gravity="center"
         android:text="159****2881"
         android:textColor="#cc282828"
         android:textSize="@dimen/text_size_10" />

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.2.0
-VERSION_CODE=3002000
+VERSION_NAME=3.2.1
+VERSION_CODE=3002001
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18