小绵羊打卡任务页面优化调整

app/src/main/AndroidManifest.xml

@@ -58,6 +58,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
 
     <permission
         android:name="android.permission.PACKAGE_USAGE_STATS"

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

@@ -37,7 +37,7 @@ import butterknife.Unbinder;
 
 
 /**
- * 打卡排行榜
+ * 本月排行榜
  */
 public class FgtSignRankings extends BaseCompatFragment implements SignRankingsContract.View{
 

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

@@ -55,7 +55,6 @@ import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
@@ -64,7 +63,6 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.ImageGlarryDrawable;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -442,7 +440,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 break;
             case R.id.icon_layout://
                 if(BuildConfig.DEBUG) {
-//                    TestUtil.test(activity);
+                    TestUtil.test(activity);
                 }else
                     Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;

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

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
 /**
- * 打卡排行榜对象
+ * 本月排行榜对象
  */
 
 public class PunchEntity {

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

@@ -959,7 +959,7 @@ public class Jump2View {
 
 
     /**
-     * 跳到打卡排行榜页面
+     * 跳到本月排行榜页面
      * @param context
      * @param o
      */

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

@@ -0,0 +1,50 @@
+package com.sheep.gamegroup.util;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.provider.AlarmClock;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+
+/**
+ * Created by realicing on 2018/5/29.
+ * realicing@sina.com
+ */
+public class SysAppUtil {
+    public static void startAlermApp(Activity activity, String msg, int hour, int min){
+        boolean notDone = true;
+        if(Build.VERSION.SDK_INT > 18) {
+            try {
+                Intent intent = new Intent(AlarmClock.ACTION_SET_ALARM);
+                intent.putExtra(AlarmClock.EXTRA_MESSAGE, msg);
+                intent.putExtra(AlarmClock.EXTRA_HOUR, hour);
+                intent.putExtra(AlarmClock.EXTRA_MINUTES, min);
+                ArrayList<Integer> arrayList = ListUtil.emptyList();
+                arrayList.add(Calendar.MONDAY);
+                arrayList.add(Calendar.TUESDAY);
+                arrayList.add(Calendar.WEDNESDAY);
+                arrayList.add(Calendar.THURSDAY);
+                arrayList.add(Calendar.FRIDAY);
+                arrayList.add(Calendar.SATURDAY);
+                arrayList.add(Calendar.SUNDAY);
+                intent.putExtra(AlarmClock.EXTRA_DAYS, arrayList);
+                intent.putExtra(AlarmClock.EXTRA_VIBRATE, true);
+                if (intent.resolveActivity(activity.getPackageManager()) != null) {
+                    activity.startActivity(intent);
+                    notDone = false;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if(notDone){
+            G.showToast(R.string.coming_soon);
+        }
+    }
+
+}

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

@@ -14,20 +14,13 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.io.File;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
 import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 
 /**
@@ -161,21 +154,7 @@ public class TestUtil {
         }
     }
 
-//    public static void test(Activity activity) {
-//        SheepApp.getInstance().getNetComponent().getApiService().changShiStatus()
-//                        .subscribeOn(Schedulers.io())
-//                        .observeOn(AndroidSchedulers.mainThread())
-//                        .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-//                            @Override
-//                            public void onNext(BaseMessage baseMessage) {
-//                                LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
-//                            }
-//
-//                            @Override
-//                            public void onError(BaseMessage baseMessage) {
-//                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-//                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
-//                            }
-//                        });
-//    }
+    public static void test(Activity activity) {
+        SysAppUtil.startAlermApp(activity, "小绵羊打卡任务", 7,0);
+    }
 }

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

@@ -7,6 +7,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.provider.MediaStore;
 import android.text.Html;
+import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
 import android.view.Window;
@@ -216,6 +217,8 @@ public class ViewUtil {
         dialog_sure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                //跳转到系统闹钟
+                SysAppUtil.startAlermApp(activity, "小绵羊打卡任务", 7,0);
                 dialog.dismiss();
             }
         });
@@ -224,7 +227,7 @@ public class ViewUtil {
         if(window != null) {
             android.view.WindowManager.LayoutParams p = window.getAttributes();
             p.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            p.width = WindowManager.LayoutParams.MATCH_PARENT;
+            p.width = G.WIDTH - 40;
             dialog.getWindow().setAttributes(p);     //设置生效
         }
         iv.setOnClickListener(new View.OnClickListener() {
@@ -256,7 +259,7 @@ public class ViewUtil {
         if(window != null) {
             android.view.WindowManager.LayoutParams p = window.getAttributes();
             p.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            p.width = WindowManager.LayoutParams.MATCH_PARENT;
+            p.width = G.WIDTH - 40;
             dialog.getWindow().setAttributes(p);     //设置生效
         }
         iv.setOnClickListener(new View.OnClickListener() {
@@ -268,7 +271,11 @@ public class ViewUtil {
     }
 
     //打卡->超出时间提示对话框
-    public static void showSignTimeAlert(final Activity activity,String title, String personCount, final View.OnClickListener onClickListener) {
+    public static void showSignTimeAlert(final Activity activity, String title) {
+        showSignTimeAlert(activity, title, null, null);
+    }
+    //打卡->超出时间提示对话框
+    public static void showSignTimeAlert(final Activity activity, String title, String sureText, 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);
@@ -276,12 +283,14 @@ public class ViewUtil {
         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);
+        if(!TextUtils.isEmpty(sureText))
+            dialog_sure.setText(sureText);
         dialog_sure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if(onClickListener != null)
+                    onClickListener.onClick(v);
                 dialog.dismiss();
             }
         });
@@ -290,15 +299,12 @@ public class ViewUtil {
         if(window != null) {
             android.view.WindowManager.LayoutParams p = window.getAttributes();
             p.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            p.width = WindowManager.LayoutParams.MATCH_PARENT;
+            p.width = G.WIDTH - 40;
             dialog.getWindow().setAttributes(p);     //设置生效
         }
         iv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if(onClickListener != null){
-                    onClickListener.onClick(v);
-                }
                 dialog.dismiss();
             }
         });

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

@@ -1,13 +1,12 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.graphics.Color;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.text.SpannableString;
 import android.text.Spanned;
+import android.text.TextUtils;
 import android.text.style.AbsoluteSizeSpan;
-import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.TextView;
 
@@ -30,6 +29,8 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.util.Calendar;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -61,8 +62,8 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     @BindView(R.id.sign_tv_kf)
     TextView signTvKf;
 
-    String person ="0";
     String balance;
+    private int punchType = 0;//打卡状态 //1未报名 2已打卡 3可以打卡 4已经过了时间 5活动暂未开始
 
 
     @Override
@@ -101,6 +102,8 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
 
     @Override
     public void initData() {
+        presenter.goPunchCanSignUp();
+        presenter.goPunchCanpunch();
         presenter.goPunchAward();//获取可获得的奖励
         presenter.goPunchAndSignCount();//获取可打卡和报名人数
     }
@@ -115,13 +118,17 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
         if("OK".equals(o.getMsg())){
                         Jump2View.getInstance()
                         .goNoticeAct(activity, new DialogEntity("恭喜您",
-                            "今日打卡成功",
+                            "打卡成功，活动结束后平分奖励会直接发放到个人账户中",
                                     "查看战绩",
                                     "好的",
                                 EventTypes.REFRESH_DATA_SIGN));
             presenter.goPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
+            punchType = 2;//1未报名 2已打卡 3可以打卡 4已经过了时间 5活动暂未开始
+            signTvLjdk.setEnabled(false);
+            signTvLjdk.setText("已打卡");
         }else {
             showToast(o.getMsg());
+            presenter.goPunchCanpunch();
         }
     }
 
@@ -133,11 +140,13 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     public void succSignUp(BaseMessage o) {
 //        {"code":200,"msg":"OK"}
         if("OK".equals(o.getMsg())){
-//            showToast("报名成功");
+            signTvYybm.setEnabled(false);
+            signTvYybm.setText("已报名");
             ViewUtil.showSignPay(activity);
             presenter.goPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
         }else {
             showToast(o.getMsg());
+            presenter.goPunchCanSignUp();
         }
     }
 
@@ -147,9 +156,20 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
      */
     @Override
     public void succPunchAward(BaseMessage o) {
-//    返回    1
-        String text = String.format(getString(R.string.sign_jppj),o.getData().toString());
-        signTvDkjl.setText(getColorSpannableString(text));//平分的金额
+        String text = o.getData().toString();
+        float award = 0;
+        try {
+            award = o.getData(Float.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+        if(TextUtils.isEmpty(text) || award <= 0 || hour < 9) {
+            signTvDkjl.setText("系统计算中");
+        } else {
+            signTvDkjl.setText(getString(R.string.sign_jppj,o.getData().toString()));//平分的金额
+            signTvDkjl.setTextColor(0xffff0006);
+        }
     }
     /**
      * 获取是否可以打卡
@@ -158,26 +178,12 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
      */
     @Override
     public void succPunchCanpunch(BaseMessage o) {
-        if("1".equals(o.getData().toString())){
-          ViewUtil.showSignAlert(activity);//未报名
-        }else if("2".equals(o.getData().toString())){
-            showToast("已打卡");
-        }else if("3".equals(o.getData().toString())){
-            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();
-                }
-            });
+        punchType = o.getData(Integer.class);
+        if(punchType == 2) {//1未报名 2已打卡 3可以打卡 4已经过了时间 5活动暂未开始
+            signTvLjdk.setEnabled(false);
+            signTvLjdk.setText("已打卡");
+        } else {
+            signTvLjdk.setEnabled(true);
         }
     }
 
@@ -191,17 +197,9 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
      */
     @Override
     public void succPunchCanSignUp(BaseMessage o) {
-        Boolean isSuccess = o.getData(Boolean.class);
-        if(isSuccess){
-            if(Float.valueOf(balance) >= 1){
-                presenter.goSignUp();
-            }else {
-                Jump2View.getInstance().goSignRechargeAct(activity,null);
-            }
-        } else {
-            showToast("您已经报名");
-        }
-
+        boolean isSignUp = o.getData(Boolean.class);
+        signTvYybm.setEnabled(isSignUp);
+        signTvYybm.setText(isSignUp ? "一元报名" : "已报名");
     }
 
     /**
@@ -227,21 +225,48 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.sign_tv_ljdk://打卡
-                presenter.goPunchCanpunch();
+                tryPunch();
                 break;
             case R.id.sign_tv_yybm://一元报名
-                presenter.goPunchCanSignUp();
+                trySignUp();
                 break;
             case R.id.sign_tv_kf:
                 showToast("028-8888888");
                 break;
         }
     }
-    private SpannableString getColorSpannableString(String text) {
-        SpannableString spannableString = new SpannableString(text);
-        ForegroundColorSpan colorSpan = new ForegroundColorSpan(Color.parseColor("#ff0006"));
-        spannableString.setSpan(colorSpan, 6, text.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-        return spannableString;
+
+    private void trySignUp() {
+        if(Float.valueOf(balance) >= 1){
+            presenter.goSignUp();
+        }else {
+            ViewUtil.showSignTimeAlert(activity, "抱歉，你的余额不足，请先去充值再来参与打卡哦！", "去充值、好的", new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Jump2View.getInstance().goSignRechargeAct(activity,null);
+                }
+            });
+        }
+    }
+
+    private void tryPunch() {
+        switch (punchType) {//1未报名 2已打卡 3可以打卡 4已经过了时间 5活动暂未开始
+            case 1:
+                ViewUtil.showSignAlert(activity);//未报名
+                break;
+            case 2:
+                ViewUtil.showSignTimeAlert(activity, "您已经打卡，活动结束后平分奖励会直接发放到个人账户中");
+                break;
+            case 3:
+                presenter.goSignPunch();
+                break;
+            case 4:
+                ViewUtil.showSignTimeAlert(activity, "今日打卡活动已结束，请先去报名，明日再来哦！");
+                break;
+            case 5:
+                ViewUtil.showSignTimeAlert(activity, "活动暂未开始，请于早上7点至9点来参与打卡");
+                break;
+        }
     }
 
     @RequiresApi(api = Build.VERSION_CODES.ECLAIR)

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

@@ -2,8 +2,6 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.content.ContextCompat;
@@ -18,11 +16,10 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
- * 打卡排行榜
+ * 本月排行榜
  */
 
 public class SignRankingsAct extends BaseActivity {
@@ -51,7 +48,7 @@ public class SignRankingsAct extends BaseActivity {
         activity = this;
         TitleBarUtils
                 .getInstance()
-                .setTitle(activity, "打卡排行榜")
+                .setTitle(activity, "本月排行榜")
                 .setTitleFinish(activity);
 
 

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

@@ -56,7 +56,6 @@ import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTaskDetailChildListview;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;

app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.IBinder;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -15,22 +14,11 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.sheep.gamegroup.model.entity.AppRecord;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskListen;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.LocationUtils;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.MyDbManager;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.concurrent.TimeUnit;
 

app/src/main/java/com/sheep/jiuyan/samllsheep/service/MonitorAppService.java

@@ -8,13 +8,11 @@ import android.text.TextUtils;
 import android.view.accessibility.AccessibilityEvent;
 
 import com.sheep.gamegroup.model.entity.AppRecord;
-import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;

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

@@ -88,8 +88,9 @@
                     android:layout_height="32dp"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="10dp"
-                    android:background="@drawable/sp_bg_gradient_rectangle_yellow"
+                    android:background="@drawable/selector_button_full_main_small"
                     android:clickable="true"
+                    android:enabled="false"
                     android:gravity="center"
                     android:text="立即打卡"
                     android:textColor="@color/white"
@@ -218,6 +219,7 @@
                     android:layout_marginBottom="@dimen/content_padding_10"
                     android:background="@drawable/sp_bg_gradient_rectangle_yellow"
                     android:clickable="true"
+                    android:enabled="false"
                     android:gravity="center"
                     android:text="一元报名"
                     android:textColor="@color/white"

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

@@ -9,30 +9,29 @@
         android:id="@+id/iv_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/try_dialog_x"
         android:layout_gravity="right"
-        />
+        android:src="@mipmap/try_dialog_x" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="@dimen/content_padding_20"
+        android:lineSpacingExtra="2dp"
+        android:gravity="center"
+        android:text="您昨日未报名，无法获取今日打卡资格，先去报名吧！"
+        android:textColor="@color/black"
+        android:textSize="@dimen/text_size_20" />
 
-<TextView
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textColor="@color/black"
-    android:textSize="@dimen/text_size_3"
-    android:text="系统检测到您未报名参与今日打卡，请先参与明日打卡报名，次日再来参与打卡活动哦!"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    android:layout_marginTop="@dimen/content_padding_20"
-    android:lineSpacingExtra="2dp"
-    />
     <TextView
         android:id="@+id/dialog_sure"
         android:layout_width="match_parent"
-        android:layout_marginRight="@dimen/content_padding_20"
-        android:layout_marginLeft="@dimen/content_padding_20"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:layout_weight="5"
         android:layout_height="40dp"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:layout_marginLeft="@dimen/content_padding_20"
+        android:layout_marginRight="@dimen/content_padding_20"
+        android:layout_marginTop="40dp"
         android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
         android:gravity="center"
         android:text="我知道了"

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

@@ -22,18 +22,8 @@
         android:lineSpacingExtra="2dp"
         android:textColor="@color/black"
         android:gravity="center_horizontal"
-        android:textSize="@dimen/text_size_5" />
-
-    <TextView
-        android:id="@+id/sign_tv_count"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:lineSpacingExtra="2dp"
-        android:textColor="@color/black"
-        android:textSize="@dimen/text_size_3" />
+        android:text="打卡成功，活动结束后平分奖励会直接发放到个人账户中"
+        android:textSize="@dimen/text_size_20" />
 
     <TextView
         android:id="@+id/dialog_sure"
@@ -42,8 +32,7 @@
         android:layout_marginBottom="@dimen/content_padding_20"
         android:layout_marginLeft="@dimen/content_padding_20"
         android:layout_marginRight="@dimen/content_padding_20"
-        android:layout_marginTop="20dp"
-        android:layout_weight="5"
+        android:layout_marginTop="40dp"
         android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
         android:gravity="center"
         android:text="我知道了"

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

@@ -20,9 +20,9 @@
         android:layout_marginTop="@dimen/content_padding_20"
         android:lineSpacingExtra="2dp"
         android:textColor="@color/black"
-        android:text="已报名成功！"
+        android:text="恭喜你，报名成功"
         android:gravity="center_horizontal"
-        android:textSize="@dimen/text_size_5" />
+        android:textSize="@dimen/text_size_20" />
 
     <TextView
         android:id="@+id/sign_tv_count"
@@ -32,7 +32,7 @@
         android:layout_marginRight="10dp"
         android:layout_marginTop="@dimen/content_padding_20"
         android:lineSpacingExtra="2dp"
-        android:text="记得明日7:00-9:00过来打卡平分奖金哦！"
+        android:text="记得明日7:00-9:00来参加打卡哦！"
         android:gravity="center_horizontal"
         android:textColor="@color/black"
         android:textSize="@dimen/text_size_3" />
@@ -44,11 +44,10 @@
         android:layout_marginBottom="@dimen/content_padding_20"
         android:layout_marginLeft="@dimen/content_padding_20"
         android:layout_marginRight="@dimen/content_padding_20"
-        android:layout_marginTop="20dp"
-        android:layout_weight="5"
+        android:layout_marginTop="40dp"
         android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
         android:gravity="center"
-        android:text="我知道了"
+        android:text="设置闹铃提醒"
         android:textColor="@color/white"
         android:textSize="@dimen/text_size_15" />
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -43,5 +43,5 @@
     <string name="sign_tv_srecord_money">累计成功打卡%1$s天，连续成功打卡%2$s天</string>
     <string name="sign_number">今日已有%1$s人参与打卡</string>
     <string name="sign_number1">今日已有%1$s人参与报名</string>
-    <string name="sign_jppj">系统计算中/￥%1$s</string>
+    <string name="sign_jppj">￥%s</string>
 </resources>