屏蔽掉发现模块，版本修改为2.6.2

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

@@ -0,0 +1,83 @@
+package com.kfzs.duanduan.fragment;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
+
+import com.kfzs.duanduan.BaseCompatFragment;
+import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.sheep.gamegroup.model.entity.FindLabel;
+import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by realicing on 2018/6/27.
+ * realicing@sina.com
+ * 主页--发现模块
+ */
+public class FgtFind extends BaseCompatFragment {
+    private Activity activity;
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        setContentView(R.layout.fgt_find);
+        activity = getActivity();
+        ButterKnife.bind(this, mContentView);
+        initData();
+    }
+
+    @BindView(R.id.indicator)
+    TabLayout indicator;
+    @BindView(R.id.pager)
+    ViewPager pager;
+
+    private GiftpackListAdapter mAdapter;
+    private void initData(){
+        testInitData();
+        loadData();
+    }
+
+    private void testInitData() {
+        String[] names = {"全部", "推荐", "专题", "游戏", "资讯"};
+        for (int i = 0; i < names.length; i++) {
+            String name = names[i];
+            FindLabel findLabel = new FindLabel();
+            findLabel.setLabel_name(name);
+            findLabel.setLabel_id(i);
+            findLabelList.add(findLabel);
+        }
+    }
+
+    private List<FindLabel> findLabelList = ListUtil.emptyList();
+    private void loadData() {
+        mAdapter = new GiftpackListAdapter(getFragmentManager(), getContext());
+        for (FindLabel findLabel : findLabelList) {
+            mAdapter.add(FgtFindChild.newInstance(findLabel.getLabel_id()), findLabel.getLabel_name());
+        }
+        pager.setAdapter(mAdapter);
+        indicator.setupWithViewPager(pager);
+        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int i, float v, int i1) {
+
+            }
+
+            @Override
+            public void onPageSelected(int i) {
+                position = i;
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int i) {
+
+            }
+        });
+        pager.setCurrentItem(position);
+    }
+    private int position = 0;//默认选中第一个
+}

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

@@ -0,0 +1,127 @@
+package com.kfzs.duanduan.fragment;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.kfzs.android.view.tag.FlowLayout;
+import com.kfzs.android.view.tag.TagAdapter;
+import com.kfzs.android.view.tag.TagFlowLayout;
+import com.kfzs.duanduan.BaseCompatFragment;
+import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.sheep.gamegroup.model.entity.FindItem;
+import com.sheep.gamegroup.model.entity.UserLabel;
+import com.sheep.gamegroup.model.entity.UserLabelList;
+import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.SysAppUtil;
+import com.sheep.gamegroup.util.ViewHolder;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActUserLabelList;
+import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
+import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.functions.Action1;
+
+/**
+ * Created by realicing on 2018/6/27.
+ * realicing@sina.com
+ */
+public class FgtFindChild extends BaseCompatFragment {
+
+    private int type;
+    public static FgtFindChild newInstance(int type){
+        FgtFindChild fgt = new FgtFindChild();
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", type);
+        fgt.setArguments(bundle);
+        return fgt;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle bundle = getArguments();
+        if(bundle != null){
+            type = bundle.getInt("type", 0);
+        }
+    }
+
+    private Activity activity;
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        setContentView(R.layout.fgt_find_child);
+        activity = getActivity();
+        ButterKnife.bind(this, mContentView);
+        initView();
+        initData();
+    }
+
+    @BindView(R.id.find_refresh)
+    SwipeRefreshLayout refresh;
+    @BindView(R.id.check_net_ll)
+    View check_net_ll;
+    @BindView(R.id.find_list)
+    RecyclerView view_list;
+    private void initView(){
+        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                initData();
+                refresh.setRefreshing(false);
+            }
+        });
+    }
+
+    private void initData(){
+        SysAppUtil.checkNet(new Action1<Integer>() {
+            @Override
+            public void call(Integer result) {
+                if(result != 0){//无网络
+                    if(check_net_ll != null)
+                        check_net_ll.setVisibility(View.VISIBLE);
+                    testInitData();
+                    loadData();
+                } else {
+                    if(check_net_ll != null)
+                        check_net_ll.setVisibility(View.GONE);
+                }
+            }
+        });
+    }
+
+    private void testInitData() {
+        for (int i = 0; i < 10; i++) {
+            list.add(new FindItem());
+        }
+    }
+    private List<FindItem> list = ListUtil.emptyList();
+    private void loadData() {
+        view_list.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
+        view_list.setAdapter(new AdbCommonRecycler<FindItem>(SheepApp.getInstance(), list){
+
+            @Override
+            public int getViewIdByType(int type) {
+                return R.layout.find_item;
+            }
+
+            @Override
+            public void convert(ViewHolder holder, final FindItem item) {
+                View rootConvertView = holder.itemView;
+                TextView user_label_tv = rootConvertView.findViewById(R.id.user_label_tv);
+
+            }
+        });
+    }
+}

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -3,6 +3,7 @@ package com.kfzs.duanduan.react;
 import android.support.v4.app.Fragment;
 
 import com.kfzs.duanduan.ActMain;
+import com.kfzs.duanduan.fragment.FgtFind;
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.R;
@@ -45,6 +46,17 @@ public enum MainTab {
             return R.drawable.drawable_selector_class;
         }
     },*/
+//    Fgt_Find(R.string.main_tab_find) {
+//        @Override
+//        public Fragment getFragment() {
+//            return new FgtFind();
+//        }
+//
+//        @Override
+//        public int getDrawableId() {
+//            return R.drawable.drawable_selector_class;
+//        }
+//    },
     FgtPersonnalCenter(R.string.personal_center) {
         @Override
         public Fragment getFragment() {

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

@@ -1,5 +1,8 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.annotation.SuppressLint;
+import android.app.usage.UsageStats;
+
 import org.xutils.db.annotation.Column;
 import org.xutils.db.annotation.Table;
 
@@ -52,4 +55,17 @@ public class AppUsage implements Serializable {
     public void setTotalTimeInForeground(long totalTimeInForeground) {
         this.totalTimeInForeground = totalTimeInForeground;
     }
+
+
+    @SuppressLint("NewApi")
+    public static AppUsage getInstance(UsageStats usageStats) {
+        AppUsage appUsage = new AppUsage();
+        if(usageStats != null) {
+            appUsage.setPackageName(usageStats.getPackageName());
+            appUsage.setTotalTimeInForeground(usageStats.getTotalTimeInForeground());
+            appUsage.setFirstTimeStamp(usageStats.getFirstTimeStamp());
+            appUsage.setLastTimeStamp(usageStats.getLastTimeStamp());
+        }
+        return appUsage;
+    }
 }

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

@@ -0,0 +1,8 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/6/27.
+ * realicing@sina.com
+ */
+public class FindItem {
+}

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

@@ -0,0 +1,34 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/6/27.
+ * realicing@sina.com
+ */
+public class FindLabel {
+    private String label_name;
+
+    private int label_id;
+
+    public void setLabel_name(String label_name){
+        this.label_name = label_name;
+    }
+    public String getLabel_name(){
+        return this.label_name;
+    }
+    public void setLabel_id(int label_id){
+        this.label_id = label_id;
+    }
+    public int getLabel_id(){
+        return this.label_id;
+    }
+
+    private boolean isChecked;
+
+    public boolean isChecked() {
+        return isChecked;
+    }
+
+    public void setChecked(boolean checked) {
+        isChecked = checked;
+    }
+}

app/src/main/java/com/sheep/gamegroup/usage/AppUsageManager.java

@@ -137,15 +137,10 @@ public class AppUsageManager {
             if(!isEmpty && isSaveData){
                 List<AppUsage> appUsageList = ListUtil.emptyList();
                 for (UsageStats queryUsageStat : queryUsageStats) {
-                    AppUsage appUsage = new AppUsage();
-                    appUsage.setPackageName(queryUsageStat.getPackageName());
-                    appUsage.setTotalTimeInForeground(queryUsageStat.getTotalTimeInForeground());
-                    appUsage.setFirstTimeStamp(queryUsageStat.getFirstTimeStamp());
-                    appUsage.setLastTimeStamp(queryUsageStat.getLastTimeStamp());
-                    appUsageList.add(appUsage);
+                    appUsageList.add(AppUsage.getInstance(queryUsageStat));
                 }
                 MyDbManager.getInstance().saveOrUpdate(appUsageList);//保存或者更新AppUsage,以便之后用来显示时间
-             }
+            }
             return isEmpty;
         } else{
             return false;
@@ -234,8 +229,7 @@ public class AppUsageManager {
                         if (totalTimeMap.containsKey(packageName) && totalTimeMap.get(packageName) == totalTime) {
                             totalTime += time - timeMap.get(packageName);
                         } else {
-                            totalTimeMap.put(packageName, totalTime);//TODO 这里应该还要保存数据到数据库
-                            MyDbManager.getInstance().saveOrUpdate(appUsage);
+                            totalTimeMap.put(packageName, totalTime);
                             timeMap.put(packageName, time);
                         }
                         return Math.max(0, totalTime - saveTotalTime);

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/bg_gray"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:gravity="center"
+        android:padding="@dimen/dp_10"
+        android:text="@string/main_tab_find"
+        android:textColor="@color/black"
+        android:textSize="15sp" />
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/indicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+        app:tabIndicatorColor="#4bc1fe"
+        app:tabGravity="fill"
+        app:tabSelectedTextColor="#4bc1fe"
+        app:tabTextColor="#444444"
+        app:tabMode="fixed" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+</LinearLayout>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_gray"
+    android:orientation="vertical">
+
+    <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
+        android:id="@+id/find_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <include
+            layout="@layout/check_net_view"/>
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/find_list"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_margin="@dimen/content_padding_10"/>
+    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
+</LinearLayout>

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/content_padding_10"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:paddingBottom="@dimen/content_padding_10"
+    android:paddingEnd="@dimen/content_padding_20"
+    android:paddingStart="@dimen/content_padding_20"
+    android:paddingTop="@dimen/content_padding_20">
+
+    <TextView
+        android:id="@+id/find_item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textColor="@color/black_6_3"
+        android:textSize="15sp" />
+    <TextView
+        android:id="@+id/find_item_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textColor="#9B9B9B"
+        android:textSize="12sp" />
+
+    <com.kfzs.android.view.tag.TagFlowLayout
+        android:id="@+id/find_item_tags"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        android:id="@+id/find_item_iv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:scaleType="fitXY"
+        android:src="@mipmap/icon"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/find_item_des"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/app_name"
+        android:textColor="#646464"
+        android:textSize="14sp" />
+
+
+</android.support.constraint.ConstraintLayout>

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

@@ -18,6 +18,7 @@
     <string name="tab_viewpager_classification">分类</string>
     <string name="mine_hoggerel">小绵羊</string>
     <string name="personal_center">个人中心</string>
+    <string name="main_tab_find">发现</string>
 
     <string name="hot_person_game">人气游戏</string>
     <string name="best_game">精品游戏</string>

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=2.7.0
-VERSION_CODE=2007000
+VERSION_NAME=2.6.2
+VERSION_CODE=2006002
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18