bug修改0:36

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

@@ -268,15 +268,17 @@ public class ViewUtil {
     }
 
     //打卡->超出时间提示对话框
-    public static void showSignTimeAlert(final Activity activity, String personCount, final View.OnClickListener onClickListener) {
+    public static void showSignTimeAlert(final Activity activity,String title, String personCount, final View.OnClickListener onClickListener) {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         View view = View.inflate(activity, R.layout.x_sign_alerttime_dialog, null);
         builder.setView(view);
         final AlertDialog dialog = builder.create();
         ImageView iv = view.findViewById(R.id.iv_close);
+        TextView sign_tv_alert_title = view.findViewById(R.id.sign_tv_alert_title);
         TextView dialog_sure = view.findViewById(R.id.dialog_sure);
         TextView sign_tv_count = view.findViewById(R.id.sign_tv_count);
         sign_tv_count.setText("今天已有"+personCount+"人成功打卡");
+        sign_tv_alert_title.setText(title);
         dialog_sure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -121,13 +121,13 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     public void succSignPunch(BaseMessage o) {
 //        {"code":200,"msg":"OK"}
         if("OK".equals(o.getMsg())){
-//            showToast("打卡成功");
-                            Jump2View.getInstance()
+                        Jump2View.getInstance()
                         .goNoticeAct(activity, new DialogEntity("恭喜您",
                             "今日打卡成功",
-                                    "我知道了",
-                                    "",
+                                    "查看战绩",
+                                    "好的",
                                 EventTypes.REFRESH_DATA_SIGN));
+            presenter.goPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
         }else {
             showToast(o.getMsg());
         }
@@ -161,7 +161,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     }
     /**
      * 获取是否可以打卡
-     * 1未报名 2已打卡 3可以打卡
+     * 1未报名 2已打卡 3可以打卡,4 超出打卡时间
      * @param o
      */
     @Override
@@ -171,19 +171,21 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
         }else if("2".equals(o.getData().toString())){
             showToast("已打卡");
         }else if("3".equals(o.getData().toString())){
-            Calendar calendar = Calendar.getInstance();
-            int hour = calendar.get(Calendar.HOUR);
-            if(hour >= 7 && hour < 9){//规定时间内去打卡
-                presenter.goSignPunch();
-            }else{//不在规定时间内，提示对话框
-                ViewUtil.showSignTimeAlert(activity, person, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        presenter.goPunchCanSignUp();
-                    }
-                });
-            }
-
+            presenter.goSignPunch();
+        }else if("4".equals(o.getData().toString())){
+            ViewUtil.showSignTimeAlert(activity, "你来晚啦，小懒猪!",person, new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    presenter.goPunchCanSignUp();
+                }
+            });
+        }else if("5".equals(o.getData().toString())){
+            ViewUtil.showSignTimeAlert(activity,"活动暂未开始", person, new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    presenter.goPunchCanSignUp();
+                }
+            });
         }
     }
 
@@ -198,7 +200,11 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     @Override
     public void succPunchCanSignUp(BaseMessage o) {
         if("true".equals(o.getData().toString())){
-            presenter.goSignUp();
+            if(Float.valueOf(balance) >= 1){
+                presenter.goSignUp();
+            }else {
+                Jump2View.getInstance().goSignRechargeAct(activity,null);
+            }
         }else if("false".equals(o.getData().toString())){
             showToast("不可以报名");
         }
@@ -231,11 +237,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                 presenter.goPunchCanpunch();
                 break;
             case R.id.sign_tv_yybm://一元报名
-                if(Float.valueOf(balance) >= 1){
-                    presenter.goPunchCanSignUp();
-                }else {
-                    Jump2View.getInstance().goSignRechargeAct(activity,null);
-                }
+                presenter.goPunchCanSignUp();
                 break;
             case R.id.sign_tv_kf:
                 showToast("028-8888888");

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.activity;
 
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
@@ -41,7 +42,7 @@ public class SignRechargeAct extends BaseActivity {
 
     RechargeAdapter rechargeAdapter;
     @BindView(R.id.et_recharge_price)
-    TextView etRechargePrice;
+    EditText etRechargePrice;
 
 
     @Override
@@ -149,7 +150,7 @@ public class SignRechargeAct extends BaseActivity {
 
                 mAmount = etRechargePrice.getText().toString().trim();
                 if(android.text.TextUtils.isEmpty(mAmount)){
-                    G.showToast("请选择充值金额");
+                    G.showToast("请输入充值金额");
                     return;
                 }
 

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

@@ -52,8 +52,6 @@ public class SignRecordAct extends BaseActivity implements SignRecordContract.Vi
     TextView signTvLjtr;
     @BindView(R.id.sign_tv_ljjj)
     TextView signTvLjjj;
-    @BindView(R.id.sign_tv_ljzq)
-    TextView signTvLjzq;
     @BindView(R.id.recyclerview)
     RecyclerView recyclerview;
 
@@ -115,7 +113,6 @@ public class SignRecordAct extends BaseActivity implements SignRecordContract.Vi
         signTvRecord.setText(String.format(getString(R.string.sign_tv_srecord_money),statisticsEntity.getContinue_punch_count(),statisticsEntity.getTotal_punch_count()));
         signTvLjtr.setText(getSpannableString(MathUtil.twoNumber(statisticsEntity.getTotal_money())));
         signTvLjjj.setText(getSpannableString(MathUtil.twoNumber(statisticsEntity.getTotal_award())));
-        signTvLjzq.setText(getSpannableString(MathUtil.subtract(statisticsEntity.getTotal_award(),statisticsEntity.getTotal_money())));
     }
 
     /**

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

@@ -47,16 +47,6 @@
             android:textColor="@color/blue_end"
             android:textSize="@dimen/text_size_12" />
 
-        <TextView
-            android:layout_width="0.0dp"
-            android:layout_height="22dp"
-            android:layout_marginLeft="30dp"
-            android:layout_weight="1"
-            android:background="@drawable/shape_blue_stroke_rectangle"
-            android:gravity="center"
-            android:text="累计赚取"
-            android:textColor="@color/blue_end"
-            android:textSize="@dimen/text_size_12" />
 
     </LinearLayout>
 
@@ -89,16 +79,7 @@
             android:textColor="@color/red"
             android:textSize="@dimen/text_size_25" />
 
-        <TextView
-            android:id="@+id/sign_tv_ljzq"
-            android:layout_width="0.0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="0.00元"
-            android:textColor="@color/red"
-            android:textSize="@dimen/text_size_25" />
+
 
     </LinearLayout>
 

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

@@ -44,7 +44,7 @@
 
 
 
-                    <TextView
+                    <EditText
                         android:id="@+id/et_recharge_price"
                         android:layout_width="match_parent"
                         android:layout_height="40dp"

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

@@ -13,6 +13,7 @@
         android:src="@mipmap/try_dialog_x" />
 
     <TextView
+        android:id="@+id/sign_tv_alert_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
@@ -20,7 +21,6 @@
         android:layout_marginTop="@dimen/content_padding_20"
         android:lineSpacingExtra="2dp"
         android:textColor="@color/black"
-        android:text="你来晚啦，小懒猪！"
         android:gravity="center_horizontal"
         android:textSize="@dimen/text_size_5" />