Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtPromoteGoodsList.java

@@ -152,7 +152,7 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
     //从ACache获取发布的任务列表
     private void getReleaseFromACache() {
         try {
-            GetPromoteGoodsUrl getPromoteGoodsUrl = DataUtil.getInstance().getCacheResult(ApiKey.pageKeyUrl(ApiKey.PROMOTE_GOODS, page, per_page), GetPromoteGoodsUrl.class);
+            GetPromoteGoodsUrl getPromoteGoodsUrl = DataUtil.getInstance().getCacheResult(getKey(), GetPromoteGoodsUrl.class);
             if(getPromoteGoodsUrl != null){
                 adapter.setBaseUrl(getPromoteGoodsUrl.getUrl());
                 ListUtil.addAllItem(list, getPromoteGoodsUrl.getList());
@@ -163,6 +163,10 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
         }
     }
 
+    private String getKey() {
+        return ApiKey.pageKeyUrl(ApiKey.PROMOTE_GOODS, page, per_page);
+    }
+
     //从网络获取发布的任务列表
     private void getReleaseFromNetWork() {
         SheepApp.getInstance().getNetComponent().getApiService().getYfShopPromoteGoods(page, per_page)
@@ -171,7 +175,7 @@ public class FgtPromoteGoodsList extends BaseFragment implements ILoadMore, IRef
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.PROMOTE_GOODS);
+                                boolean isNewData = DataUtil.getInstance().isNewData(getKey());
                                 if (isNewData) {
                                     GetPromoteGoodsUrl getPromoteGoodsUrl = baseMessage.getData(GetPromoteGoodsUrl.class);
                                     if(getPromoteGoodsUrl != null){

app/src/main/java/com/sheep/gamegroup/module/yf_shop/model/PromoteGoods.java

@@ -93,6 +93,6 @@ public class PromoteGoods {
         return String.format(Locale.CHINA, "%s折", zhekou);
     }
     public String getRemainderTime() {
-        return String.format(Locale.CHINA, "剩余：%s", TimeUtil.getDurationText2(Long.valueOf(promote_end_date) - System.currentTimeMillis() / 1000L));
+        return String.format(Locale.CHINA, "剩余：%s", TimeUtil.getDurationText(Long.valueOf(promote_end_date) - System.currentTimeMillis() / 1000L));
     }
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -239,6 +239,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     };
     private TextView doIt;
     private TextView willStart;
+    private TextView promote_goods_tv;
     private View doItLine;
     private LinearLayout lines;
 
@@ -479,29 +480,31 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 //        titleCardLayout = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.view_float_title_card, null);
         doIt = titleCardLayout.findViewById(R.id.do_it_text);
         willStart = titleCardLayout.findViewById(R.id.will_start_text);
+        promote_goods_tv = titleCardLayout.findViewById(R.id.promote_goods_tv);
         doItLine = titleCardLayout.findViewById(R.id.do_it_every_day_line);
+        int lineWidth = (int) doIt.getPaint().measureText(doIt.getText().toString());
         lines = titleCardLayout.findViewById(R.id.but_will_start);
-        int lineX = (G.WIDTH / 6) - (getViewWidth(doItLine) / 2);
+        LayoutParamsUtil.resetLayoutParams(lines, new Lp().setWidth(lineWidth));
+        int lineX = (G.WIDTH / 3 - lineWidth) / 2;
+        LayoutParamsUtil.resetLayoutParams(doItLine, new Lp().setWidth(G.WIDTH - lineX * 2));
         lines.setX(lineX);
-        ViewGroup.LayoutParams layoutParams = lines.getLayoutParams();
-        layoutParams.width = G.WIDTH - (lineX * 2);
-        doIt.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mViewPager != null) {
-                    mViewPager.setCurrentItem(0);
-                }
-                toDayClick();
+        doIt.setOnClickListener(v -> {
+            if (mViewPager != null) {
+                mViewPager.setCurrentItem(0);
             }
+            toDayClick();
         });
-        willStart.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mViewPager != null) {
-                    mViewPager.setCurrentItem(1);
-                }
-                willStartClick();
+        willStart.setOnClickListener(v -> {
+            if (mViewPager != null) {
+                mViewPager.setCurrentItem(1);
+            }
+            willStartClick();
+        });
+        promote_goods_tv.setOnClickListener(v -> {
+            if (mViewPager != null) {
+                mViewPager.setCurrentItem(2);
             }
+            clickPromoteGoods();
         });
 //        ((ViewGroup) activity.getWindow().getDecorView()).addView(titleCardLayout);
         ViewUtil.setVisibility(titleCardLayout, false);
@@ -513,6 +516,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     private void toDayClick() {
         doIt.setTextColor(getResources().getColor(R.color.blue_34a6e7));
         willStart.setTextColor(getResources().getColor(R.color.black_444444));
+        promote_goods_tv.setTextColor(getResources().getColor(R.color.black_444444));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             TransitionManager.beginDelayedTransition(titleCardLayout, new ChangeBounds());
         }
@@ -525,6 +529,19 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     private void willStartClick() {
         doIt.setTextColor(getResources().getColor(R.color.black_444444));
         willStart.setTextColor(getResources().getColor(R.color.blue_34a6e7));
+        promote_goods_tv.setTextColor(getResources().getColor(R.color.black_444444));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            TransitionManager.beginDelayedTransition(titleCardLayout, new ChangeBounds());
+        }
+        lines.setGravity(Gravity.CENTER);
+    }
+    /**
+     * 点击限时抢购
+     */
+    private void clickPromoteGoods() {
+        doIt.setTextColor(getResources().getColor(R.color.black_444444));
+        willStart.setTextColor(getResources().getColor(R.color.black_444444));
+        promote_goods_tv.setTextColor(getResources().getColor(R.color.blue_34a6e7));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             TransitionManager.beginDelayedTransition(titleCardLayout, new ChangeBounds());
         }

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

@@ -21,7 +21,7 @@
 
             <TextView
                 android:id="@+id/do_it_text"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
@@ -32,7 +32,7 @@
 
             <TextView
                 android:id="@+id/will_start_text"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
@@ -40,6 +40,16 @@
                 android:text="即将开始"
                 android:textColor="@color/black_444444"
                 android:textSize="16sp" />
+            <TextView
+                android:id="@+id/promote_goods_tv"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="限时抢购"
+                android:textColor="@color/black_444444"
+                android:textSize="16sp" />
         </LinearLayout>
 
         <LinearLayout