ui修改

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

@@ -218,6 +218,7 @@ public class FgtMiDong extends BaseCompatFragment {
                             listData.add(adDataSon);
                         }
                         adListAdapter.setData(listData);
+                        adListAdapter.setSign(true);
                     } else {
                         if (isRefresh)
                             G.showToast(activity, "暂无数据", Toast.LENGTH_SHORT);

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

@@ -409,6 +409,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
                     isShowQB = !isShowQB;
                 }
+                if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
+
+
+                }
             }
             SheepApp.getInstance().setShowQB(isShowQB);
             adpHomeListGrideview.notifyDataSetChanged();
@@ -545,10 +549,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if(userEntity == null){
             return;
         }
-
-        //幂动科技
-        CommonUtil.getInstance().initMiDong(activity, userEntity.getId());
-
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                //幂动科技
+                CommonUtil.getInstance().initMiDong(activity, userEntity.getId());
+            }
+        }, 500);
         //保存用户id信息
         PreferenceUtils.setPrefString(SheepApp.mContext, UMConfigUtils.LOGIN_OPENID, userEntity.getOpen_id());
         //保存用户邀请人邀请码

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

@@ -1516,7 +1516,7 @@ public class CommonUtil {
      *  id 用户uid
      */
     public void initMiDong(Activity activity, String id){
-        if(!SheepApp.getInstance().isInitMidong()){
+        if(!SheepApp.getInstance().isInitMidong() && !TextUtils.isEmpty(id)){
             SheepApp.getInstance().setInitMidong(true);
             AdManager.getInstance(activity).init(activity, "40",id+"");
         }

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

@@ -94,7 +94,7 @@ public class MyDbManager {
     public String dbFindId(){
         try {
             return dbFindUser().getId();
-        } catch (DbException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return "";

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

@@ -368,7 +368,7 @@ public class TestUtil {
                                 break;
                             case "复制imsi":
                                 StringUtils.CopyText(new DeviceUtils(activity).getIMEI());
-                                G.showToast(AppUtil.getDeviceId(activity));
+                                G.showToast(TimeUtil.newInstance().getDayBegin() + "|" + TimeUtil.newInstance().big2Today("2018-07-27",TimeUtil.FORMAT_DD_LINE));
                                 break;
                             case "复制faq地址":
                                 copyUrl("faqurl");

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

@@ -1,8 +1,10 @@
 package com.sheep.gamegroup.util;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.Locale;
 
 /**
@@ -12,6 +14,15 @@ public class TimeUtil {
 
     public static String FORMAT = "yyyy/MM/dd HH:mm";
     public static String FORMAT_DD = "yyyy/MM/dd";
+    public static String FORMAT_DD_LINE = "yyyy-MM-dd";
+
+    private static TimeUtil timeUtil;
+
+    public static TimeUtil newInstance(){
+        if (timeUtil == null)
+            timeUtil = new TimeUtil();
+        return timeUtil;
+    }
 
     public static long getCurrentSeconds(){
         long ls = System.currentTimeMillis()/1000;
@@ -102,4 +113,39 @@ public class TimeUtil {
 
     }
 
+    /**
+     * 日期时间字符串转换成毫秒
+     * @return
+     */
+    public static long string2Long(String dateStr, String dateFormat){
+        Calendar calendar = Calendar.getInstance();
+        try {
+            calendar.setTime(new SimpleDateFormat(dateFormat).parse(dateStr));
+            return calendar.getTimeInMillis();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return 0;
+    }
+
+    /**
+     * 是否大于今天
+     */
+    public boolean big2Today(String dateStr, String dateFormat){
+        if(getDayBegin() == string2Long(dateStr, dateFormat)){
+            return true;
+        }
+        return false;
+    }
+    //获取当天的开始时间
+      public long getDayBegin() {
+                Calendar cal = new GregorianCalendar();
+                 cal.set(Calendar.HOUR_OF_DAY, 0);
+                 cal.set(Calendar.MINUTE, 0);
+                 cal.set(Calendar.SECOND, 0);
+                 cal.set(Calendar.MILLISECOND, 0);
+                 return (cal.getTime()).getTime();
+             }
+
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdListAdapter.java

@@ -16,6 +16,7 @@ import com.bumptech.glide.Glide;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.model.entity.AdDataSon;
+import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -60,6 +61,9 @@ public class AdListAdapter extends android.support.v7.widget.RecyclerView.Adapte
             mList.addAll(list);
         this.isSign = isSign;
     }
+    public void setSign(boolean isSign){
+        this.isSign = isSign;
+    }
 
     public void setData(List<AdDataSon> list) {
         mList.clear();
@@ -144,6 +148,11 @@ public class AdListAdapter extends android.support.v7.widget.RecyclerView.Adapte
                     }
                     if (!TextUtils.isEmpty(data.getTodayTask())) {
                         appViewHolder.mDateTv.setText(data.getTodayTask());
+                        if(TimeUtil.newInstance().big2Today(data.getTodayTask(), TimeUtil.FORMAT_DD_LINE)){
+                            appViewHolder.mDateTv.setEnabled(true);
+                        }else {
+                            appViewHolder.mDateTv.setEnabled(false);
+                        }
                         appViewHolder.mDateTv.setVisibility(View.VISIBLE);
                     } else {
                         appViewHolder.mDateTv.setVisibility(View.GONE);