1.兑好礼和活动 时间格式统一

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/mine/ExchangeActiveActivity.java

@@ -100,16 +100,16 @@ public class ExchangeActiveActivity extends BaseActivity<ExchangeActivePresenter
                 exchangeTime = DateUtils.getFormatStrToStrYMD(bean.getExchangeStartDate());
             }
             if (!TextUtils.isEmpty(bean.getExchangeEndDate())) {
-                exchangeTime = TextUtils.isEmpty(exchangeTime) ? DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()) : (exchangeTime + "-" + DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()));
+                exchangeTime = TextUtils.isEmpty(exchangeTime) ? DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()) : (exchangeTime + " - " + DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()));
             }
             tvExchangeDate.setText(exchangeTime);
             //活动时间
             String activeTime = "";
             if (!TextUtils.isEmpty(bean.getActivityStartTime())) {
-                activeTime = DateUtils.getFormatStrToStrYMD(bean.getActivityStartTime());
+                activeTime = DateUtils.getFormatStrToStrYMDHM(bean.getActivityStartTime());
             }
             if (!TextUtils.isEmpty(bean.getActivityEndTime())) {
-                activeTime = TextUtils.isEmpty(activeTime) ? DateUtils.getFormatStrToStrYMD(bean.getActivityEndTime()) : (activeTime + "-" + DateUtils.getFormatStrToStrYMD(bean.getActivityEndTime()));
+                activeTime = TextUtils.isEmpty(activeTime) ? DateUtils.getFormatStrToStrYMDHM(bean.getActivityEndTime()) : (activeTime + " - " + DateUtils.getFormatStrToStrYMDHM(bean.getActivityEndTime()));
             }
             tvActiveDate.setText(activeTime);
             //地址

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/mine/ExchangeActiveDetailActivity.java

@@ -84,10 +84,10 @@ public class ExchangeActiveDetailActivity extends BaseActivity<ExchangeActiveDet
             //活动时间
             String activeTime = "";
             if (!TextUtils.isEmpty(exchangeBean.getActivityStartTime())) {
-                activeTime = DateUtils.getFormatStrToStrYMD(exchangeBean.getActivityStartTime());
+                activeTime = DateUtils.getFormatStrToStrYMDHM(exchangeBean.getActivityStartTime());
             }
             if (!TextUtils.isEmpty(exchangeBean.getActivityEndTime())) {
-                activeTime = TextUtils.isEmpty(activeTime) ? DateUtils.getFormatStrToStrYMD(exchangeBean.getActivityEndTime()) : (activeTime + "-" + DateUtils.getFormatStrToStrYMD(exchangeBean.getActivityEndTime()));
+                activeTime = TextUtils.isEmpty(activeTime) ? DateUtils.getFormatStrToStrYMDHM(exchangeBean.getActivityEndTime()) : (activeTime + " - " + DateUtils.getFormatStrToStrYMDHM(exchangeBean.getActivityEndTime()));
             }
             tvActiveDate.setText(activeTime);
             //地址

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/mine/ExchangeGiftsActivity.java

@@ -96,7 +96,7 @@ public class ExchangeGiftsActivity extends BaseActivity<ExchangeGiftsPresenter>
                 exchangeTime = DateUtils.getFormatStrToStrYMD(bean.getExchangeStartDate());
             }
             if (!TextUtils.isEmpty(bean.getExchangeEndDate())) {
-                exchangeTime = TextUtils.isEmpty(exchangeTime) ? DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()) : (exchangeTime + "-" + DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()));
+                exchangeTime = TextUtils.isEmpty(exchangeTime) ? DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()) : (exchangeTime + " - " + DateUtils.getFormatStrToStrYMD(bean.getExchangeEndDate()));
             }
             tvDate.setText("兑换时间:" + exchangeTime);
         }

baselibrary/src/main/java/com/tongyu/luck/happywork/baselibrary/utils/DateUtils.java

@@ -61,6 +61,28 @@ public class DateUtils {
     }
 
     /**
+     * 将yyyy-MM-dd HH:mm:ss 转化为yyyy-MM-dd
+     *
+     * @param dateStr
+     * @return
+     */
+    public static String getFormatStrToStrYMDHM(String dateStr) {
+        String dateString = "";
+        if (TextUtils.isEmpty(dateStr)) {
+            return dateString;
+        } else {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+            try {
+                dateString = format2.format(format.parse(dateStr));
+            } catch (ParseException var4) {
+                var4.printStackTrace();
+            }
+            return dateString;
+        }
+    }
+
+    /**
      * 将yyyy-MM-dd HH:mm:ss 转化为指定格式
      *
      * @param dateStr