优化界面

.idea/gradle.xml

@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

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

@@ -70,27 +70,6 @@ public class TitleInfoList implements Comparable<TitleInfoList> {
                 return new LinearLayoutManager(SheepApp.getInstance());
         }
     }
-    private boolean showTopLine = true;//默认显示上面的线
-
-    public boolean isShowTopLine() {
-        return showTopLine;
-    }
-
-    public TitleInfoList setShowTopLine(boolean showTopLine) {
-        this.showTopLine = showTopLine;
-        return this;
-    }
-
-    private boolean showBottomLine;
-
-    public boolean isShowBottomLine() {
-        return showBottomLine;
-    }
-
-    public TitleInfoList setShowBottomLine(boolean showBottomLine) {
-        this.showBottomLine = showBottomLine;
-        return this;
-    }
 
     @Override
     public int compareTo(@NonNull TitleInfoList item) {

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

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.adapter;
 
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +12,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
@@ -23,11 +23,9 @@ import java.util.List;
 
 public class AdpHomeListGrideview extends BaseAdapter {
     private List<HomeListEntity> homeListEntity;
-    private Context context;
 
-    public AdpHomeListGrideview(List<HomeListEntity> homeListEntity, Context context) {
+    public AdpHomeListGrideview(List<HomeListEntity> homeListEntity) {
         this.homeListEntity = homeListEntity;
-        this.context = context;
     }
 
     @Override
@@ -53,7 +51,7 @@ public class AdpHomeListGrideview extends BaseAdapter {
             holder = (ViewHolder) tag;
         }else {
             holder = new ViewHolder();
-            convertView = LayoutInflater.from(context).inflate(R.layout.adp_homelist_gridview_new, null);
+            convertView = LayoutInflater.from(SheepApp.getInstance()).inflate(R.layout.adp_homelist_gridview_new, null);
             holder.gridview_item_tag_tv = convertView.findViewById(R.id.gridview_item_tag_tv);
             holder.gridview_item_name_tv = convertView.findViewById(R.id.gridview_item_name_tv);
             holder.gridview_item_icon_iv = convertView.findViewById(R.id.gridview_item_icon_iv);
@@ -62,7 +60,7 @@ public class AdpHomeListGrideview extends BaseAdapter {
         final HomeListEntity entity = getItem(position);
         ViewUtil.updateTag(holder.gridview_item_tag_tv, entity);
         ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
-        Glide.with(context)
+        Glide.with(SheepApp.getInstance())
                 .load(entity.getIcon())
                 .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /3, G.WIDTH /4 /3))
                 .into(holder.gridview_item_icon_iv);

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

@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.GameInfoList;
 import com.sheep.gamegroup.model.entity.TitleInfoList;
+import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -24,15 +25,18 @@ public class AdpTitleInfoList extends BaseQuickAdapter<TitleInfoList, BaseViewHo
         super(R.layout.item_title_info_list, list);
     }
 
+
     @Override
     public void convert(BaseViewHolder viewHolder, final TitleInfoList itemList) {
+        int position = viewHolder.getAdapterPosition();
+
         View item_title_info_list_top = viewHolder.itemView.findViewById(R.id.item_title_info_list_top);
         View item_title_info_list_bottom = viewHolder.itemView.findViewById(R.id.item_title_info_list_bottom);
         TextView item_title_info_list_tv = viewHolder.itemView.findViewById(R.id.item_title_info_list_tv);
         RecyclerView recyclerView = viewHolder.itemView.findViewById(R.id.item_title_info_list_rv);
 
-        ViewUtil.setVisibility(item_title_info_list_top, itemList.isShowTopLine());
-        ViewUtil.setVisibility(item_title_info_list_bottom, itemList.isShowBottomLine());
+        ViewUtil.setVisibility(item_title_info_list_top, isShowTopLine(itemList, position));
+        ViewUtil.setVisibility(item_title_info_list_bottom, isShowBottomLine(itemList, position));
         ViewUtil.setText(item_title_info_list_tv, itemList.getName());
 
         recyclerView.setHasFixedSize(true);
@@ -40,4 +44,13 @@ public class AdpTitleInfoList extends BaseQuickAdapter<TitleInfoList, BaseViewHo
         recyclerView.setLayoutManager(itemList.getLayoutManager());
         recyclerView.setAdapter(itemList.getAdapter());
     }
+
+    private boolean isShowBottomLine(TitleInfoList itemList, int position) {
+        TitleInfoList nextItem = ListUtil.getItem(getData(), position + 1);
+        return nextItem != null && nextItem.getAdapter() != null && nextItem.getAdapter().getItemCount() > 0;
+    }
+
+    private boolean isShowTopLine(TitleInfoList itemList, int position) {
+        return false;
+    }
 }

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

@@ -139,8 +139,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     Banner banner;
     @BindView(R.id.scrollView)
     NestedScrollView scrollView;
-    @BindView(R.id.newbie_task)
-    View newbie_task;
     @BindView(R.id.refresh)
     SmartRefreshLayout refresh;
     @BindView(R.id.recyclerview)
@@ -151,12 +149,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     View home_notice_ll;
     @BindView(R.id.check_net_ll)
     View check_net_ll;
-    @BindView(R.id.bg_newbie_task)
-    ImageView bg_newbie_task;
-    @BindView(R.id.view_rob_duty)
-    View viewRobDuty;
-    @BindView(R.id.iv_rob_duty)
-    ImageView ivDuty;
     @BindView(R.id.viewpager_act_game_details)
     ViewPager mViewPager;
     @BindView(R.id.tabLayout)
@@ -839,14 +831,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     private void addHomeList(List<HomeListEntity> cacheHomeListEtyList) {
         if (ListUtil.isEmpty(cacheHomeListEtyList)) {
             ViewUtil.setVisibility(home_list_gridview_gv, false);
-            ViewUtil.setVisibility(full_home_list_rv, false);
         } else {
-            ViewUtil.setVisibility(home_list_gridview_gv, true);
             homeListEntitys.clear();
             homeListEntitysGridview.clear();
             fullHomeList.clear();
             CommonUtil.getInstance().splitHomeList(cacheHomeListEtyList, homeListEntitys, fullHomeList);
-            ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
             boolean isShowQB = false;
             boolean isShowMd = false;
             for (int i = 0; i < homeListEntitys.size(); i++) {
@@ -870,8 +859,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     //fullHomeList有数据时，要让fullHomeList上下遮盖相邻组件
     private void checkFullHomeList() {
         if (/*SkinUtil.curPlugin == Plugin.skin_new_year && */!fullHomeList.isEmpty()) {
+            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp(G.DENSITY).setTopMargin(-8).setBottomMargin(-4));
             LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp().setTopMargin(0));
-            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp().setTopMargin(-G.getRealPix(8)).setBottomMargin(-G.getRealPix(4)));
+        } else {
+            LayoutParamsUtil.resetLayoutParams(full_home_list_rv, new Lp().setTopMargin(0).setBottomMargin(0));
+            LayoutParamsUtil.resetLayoutParams(home_notice_ll, new Lp(G.DENSITY).setTopMargin(12));
         }
     }
 
@@ -958,7 +950,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
         recyclerview.setAdapter(tryMakeMoneyAdp);
 
-        adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview, activity);
+        adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview);
         home_list_gridview_gv.setAdapter(adpHomeListGrideview);
 
         home_list_gridview_gv.setOnItemClickListener((parent, view, position, id) -> {
@@ -993,18 +985,13 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     }
 
 
-    @OnClick({R.id.view_rob_duty,
-            R.id.newbie_task, R.id.homepage_item_money_tv
+    @OnClick({R.id.view_rob_duty, R.id.homepage_item_money_tv
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.homepage_item_money_tv:
                 Jump2View.getInstance().goTryplayView(activity, null);
                 break;
-            case R.id.newbie_task://新手任务
-                DialogNewbieTaskList.tryShowDialog(activity);
-                NEWBIE_TASK.onEvent();
-                break;
             case R.id.view_rob_duty://抢任务弹框
                 CommonUtil.getInstance().robTask(robTask -> {
                     if (robTask != null) {

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

@@ -131,8 +131,8 @@
         android:paddingBottom="@dimen/content_padding_10">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="60dp"
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"
             android:src="@mipmap/ic_act_new_year" />

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

@@ -95,7 +95,6 @@
                     android:id="@+id/full_home_list_rv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
                     android:layout_below="@id/home_list_gridview_gv" />
                 <LinearLayout
                     android:id="@+id/home_vp_ll"
@@ -134,27 +133,6 @@
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
     <com.kfzs.duanduan.view.DragRelativeLayout
-        android:id="@+id/newbie_task"
-        android:layout_width="40dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/content_padding_10"
-        android:layout_marginBottom="@dimen/content_padding_20"
-        android:gravity="center"
-        android:paddingTop="@dimen/content_padding_10"
-        android:paddingBottom="@dimen/content_padding_10"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/bg_newbie_task"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY" />
-    </com.kfzs.duanduan.view.DragRelativeLayout>
-
-    <com.kfzs.duanduan.view.DragRelativeLayout
         android:id="@+id/view_rob_duty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -168,8 +146,8 @@
 
         <ImageView
             android:id="@+id/iv_rob_duty"
-            android:layout_width="wrap_content"
-            android:layout_height="60dp"
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"
             android:src="@mipmap/red_package_floatbtn" />

media/src/androidTest/java/com/kfzs/cfyl/media/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.kfzs.cfyl.media;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.kfzs.cfyl.media", appContext.getPackageName());
-    }
-}

media/src/main/AndroidManifest.xml

@@ -1,11 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kfzs.cfyl.media">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme" />
-</manifest>

media/src/main/java/com/kfzs/cfyl/media/activity/MainActivity.java

@@ -1,8 +0,0 @@
-package com.kfzs.cfyl.media.activity;
-
-/**
- * Created by realicing on 2018/12/6.
- * realicing@sina.com
- */
-public class PathActivity {
-}

media/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#008577"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

media/src/main/res/layout/path_activity.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>

media/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

media/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

media/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-</resources>

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

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">media</string>
-</resources>

media/src/main/res/values/styles.xml

@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

media/src/test/java/com/kfzs/cfyl/media/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.kfzs.cfyl.media;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}