|
|
@@ -24,6 +24,7 @@ import com.sheep.gamegroup.util.DataKey;
|
|
|
import com.sheep.gamegroup.util.DataUtil;
|
|
|
import com.sheep.gamegroup.util.Jump2View;
|
|
|
import com.sheep.gamegroup.util.ListUtil;
|
|
|
+import com.sheep.gamegroup.util.TestUtil;
|
|
|
import com.sheep.gamegroup.util.TimeUtil;
|
|
|
import com.sheep.gamegroup.util.ViewUtil;
|
|
|
import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
|
|
|
@@ -77,7 +78,7 @@ public class SignActivity extends BaseActivity implements UMShareListener {
|
|
|
@BindView(R.id.sheep_sign_egg_msg)
|
|
|
TextView sheep_sign_egg_msg;//中奖的球的文本
|
|
|
@BindView(R.id.sign_gua_jiang_qu)
|
|
|
- RelativeLayout signGuaJiang;
|
|
|
+ RelativeLayout sign_gua_jiang_qu;
|
|
|
@BindView(R.id.sign_etv)
|
|
|
ErasableTextView sign_etv;
|
|
|
/* 是否有漏签 */
|
|
|
@@ -116,10 +117,14 @@ public class SignActivity extends BaseActivity implements UMShareListener {
|
|
|
@Override
|
|
|
public void call(Integer count) {
|
|
|
if(count >= 4){
|
|
|
- onSignGuaJiangquClicked();
|
|
|
+ sign_etv.setFinish(true);
|
|
|
+ if(canSignGuaJiang())
|
|
|
+ onSignGuaJiangquClicked();
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
+ if(TestUtil.isDev())
|
|
|
+ sign_gua_jiang_qu.setVisibility(View.VISIBLE);
|
|
|
}
|
|
|
|
|
|
private void aEggGoOut(String msg, final Action1<Animation> animationAction1) {
|
|
|
@@ -278,10 +283,13 @@ public class SignActivity extends BaseActivity implements UMShareListener {
|
|
|
|
|
|
//更新刮奖显示状态
|
|
|
private void updateSignGuaJiang() {
|
|
|
- if(isFinishInitLastScratch && ListUtil.size(userSignList) == SIGN_PERIOD && (rechargeLogEntity == null || !rechargeLogEntity.isToday())){
|
|
|
- //一个周期完成且今日没有刮奖时,可以进行刮奖
|
|
|
- ViewUtil.setVisibility(signGuaJiang, true);
|
|
|
- }
|
|
|
+ if(TestUtil.isDev())
|
|
|
+ return;
|
|
|
+ //一个周期完成且今日没有刮奖时,可以进行刮奖
|
|
|
+ ViewUtil.setVisibility(sign_gua_jiang_qu, canSignGuaJiang());
|
|
|
+ }
|
|
|
+ private boolean canSignGuaJiang(){
|
|
|
+ return isFinishInitLastScratch && ListUtil.size(userSignList) == SIGN_PERIOD && (rechargeLogEntity == null || !rechargeLogEntity.isToday());
|
|
|
}
|
|
|
|
|
|
//签到周期
|
|
|
@@ -450,7 +458,7 @@ public class SignActivity extends BaseActivity implements UMShareListener {
|
|
|
if(sheepSignResult != null) {
|
|
|
tryShowSignResultAndTask("刮奖成功", sheepSignResult.getAmount());
|
|
|
}
|
|
|
- signGuaJiang.setVisibility(View.GONE);
|
|
|
+ sign_gua_jiang_qu.setVisibility(View.GONE);
|
|
|
initUserSignLastScratch();
|
|
|
}
|
|
|
|