From 49303b20e3e21ce8094255b051f9f196966ca49d Mon Sep 17 00:00:00 2001
From: lambert <lambert@sinokru.com>
Date: Wed, 11 Sep 2019 16:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/assist/ConfigConstants.java          |   3 +-
 .../base/widget/MarqueeTextView.java          |  29 +++
 .../main/res/drawable/bg_circle_shadow.xml    | 140 +++++++++++
 .../java/com/heyongrui/main/HomeFragment.java | 155 ++++++++++++-
 .../heyongrui/main/data/dto/FloatingDto.java  |  77 +++++++
 main/src/main/res/drawable-xhdpi/ic_anim.png  | Bin 0 -> 2074 bytes
 .../src/main/res/drawable-xhdpi/ic_ashcan.png | Bin
 .../main/res/drawable-xhdpi/ic_dictionary.png | Bin 0 -> 978 bytes
 .../src/main/res/drawable-xhdpi/ic_flight.png | Bin 0 -> 2045 bytes
 .../main/res/drawable-xhdpi/ic_id_card.png    | Bin 0 -> 1644 bytes
 main/src/main/res/drawable-xhdpi/ic_idiom.png | Bin 0 -> 2650 bytes
 .../main/res/drawable-xhdpi/ic_music_disc.png | Bin 0 -> 1004 bytes
 .../main/res/drawable-xhdpi/ic_participle.png | Bin 0 -> 2692 bytes
 .../src/main/res/drawable-xhdpi/ic_planet.png | Bin 0 -> 2628 bytes
 main/src/main/res/drawable-xhdpi/ic_robot.png | Bin 0 -> 2090 bytes
 main/src/main/res/drawable-xhdpi/ic_tool.png  | Bin 0 -> 2329 bytes
 .../main/res/drawable-xhdpi/ic_weather.png    | Bin 0 -> 2639 bytes
 main/src/main/res/layout/fragment_home.xml    |  42 +---
 main/src/main/res/values/strings.xml          |  13 +-
 .../com/heyongrui/module/ModuleFragment.java  |  28 +--
 .../main/res/drawable-xhdpi/ic_explore.png    | Bin 1286 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_mono.png   | Bin 5006 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_news.png   | Bin 0 -> 9277 bytes
 module/src/main/res/values/strings.xml        |   2 +-
 module2/src/main/AndroidManifest.xml          |   6 -
 module2/src/main/debug/AndroidManifest.xml    |   6 -
 .../heyongrui/module2/Module2Fragment.java    |   5 -
 .../module2/about/view/AboutActivity.java     |  74 ------
 .../adapter/Module2SectionAdapter.java        |   3 +-
 .../src/main/res/drawable-xhdpi/ic_about.png  | Bin 1122 -> 0 bytes
 .../src/main/res/layout/activity_about.xml    | 217 ------------------
 module2/src/main/res/values/strings.xml       |  10 +-
 user/src/main/AndroidManifest.xml             |   3 +
 user/src/main/debug/AndroidManifest.xml       |   3 +
 .../heyongrui/user}/EncourageActivity.java    |   7 +-
 .../java/com/heyongrui/user/UserFragment.java |  75 ++++--
 .../com/heyongrui/user}/utils/AliPay.java     |   4 +-
 .../java/com/heyongrui/user}/utils/WXPay.java |   4 +-
 user/src/main/res/drawable-xhdpi/ic_about.png | Bin 0 -> 1877 bytes
 .../main/res/drawable-xhdpi/ic_ali_qrcode.png | Bin
 .../main/res/drawable-xhdpi/ic_wx_qrcode.png  | Bin
 .../main/res/drawable-xhdpi/icon_qingmang.png | Bin 3411 -> 0 bytes
 .../main/res/layout/activity_encourage.xml    |   3 +-
 user/src/main/res/layout/fragment_user.xml    | 168 +++++++++++++-
 user/src/main/res/values/strings.xml          |   8 +
 45 files changed, 671 insertions(+), 414 deletions(-)
 create mode 100644 base/src/main/java/com/heyongrui/base/widget/MarqueeTextView.java
 create mode 100644 base/src/main/res/drawable/bg_circle_shadow.xml
 create mode 100644 main/src/main/java/com/heyongrui/main/data/dto/FloatingDto.java
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_anim.png
 rename {module => main}/src/main/res/drawable-xhdpi/ic_ashcan.png (100%)
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_dictionary.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_flight.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_id_card.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_idiom.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_music_disc.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_participle.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_planet.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_robot.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_tool.png
 create mode 100644 main/src/main/res/drawable-xhdpi/ic_weather.png
 delete mode 100644 module/src/main/res/drawable-xhdpi/ic_explore.png
 delete mode 100644 module/src/main/res/drawable-xhdpi/ic_mono.png
 create mode 100644 module/src/main/res/drawable-xhdpi/ic_news.png
 delete mode 100644 module2/src/main/java/com/heyongrui/module2/about/view/AboutActivity.java
 delete mode 100644 module2/src/main/res/drawable-xhdpi/ic_about.png
 delete mode 100644 module2/src/main/res/layout/activity_about.xml
 rename {module2/src/main/java/com/heyongrui/module2/about/view => user/src/main/java/com/heyongrui/user}/EncourageActivity.java (95%)
 rename {module2/src/main/java/com/heyongrui/module2 => user/src/main/java/com/heyongrui/user}/utils/AliPay.java (98%)
 rename {module2/src/main/java/com/heyongrui/module2 => user/src/main/java/com/heyongrui/user}/utils/WXPay.java (98%)
 create mode 100644 user/src/main/res/drawable-xhdpi/ic_about.png
 rename {module2 => user}/src/main/res/drawable-xhdpi/ic_ali_qrcode.png (100%)
 rename {module2 => user}/src/main/res/drawable-xhdpi/ic_wx_qrcode.png (100%)
 delete mode 100644 user/src/main/res/drawable-xhdpi/icon_qingmang.png
 rename {module2 => user}/src/main/res/layout/activity_encourage.xml (98%)

diff --git a/base/src/main/java/com/heyongrui/base/assist/ConfigConstants.java b/base/src/main/java/com/heyongrui/base/assist/ConfigConstants.java
index bfb060a..7c437d5 100644
--- a/base/src/main/java/com/heyongrui/base/assist/ConfigConstants.java
+++ b/base/src/main/java/com/heyongrui/base/assist/ConfigConstants.java
@@ -23,6 +23,7 @@ public class ConfigConstants {
     public static final String PATH_PLANET_BALL = "/main/planetBall";
     public static final String PATH_HOME_PROVIDER = "/home/main/service";
     //user模块路由路径
+    public static final String PATH_ENCOURAGE = "/user/encourage";
     public static final String PATH_KOTLIN = "/user/kotlin";
     public static final String PATH_LOGIN = "/user/login";
     public static final String PATH_USER = "/user/activity";
@@ -49,8 +50,6 @@ public class ConfigConstants {
     public static final String PATH_GANK = "/module2/gank";
     public static final String PATH_LEISURE_READ = "/module2/leisureRead";
     public static final String PATH_WELFARE = "/module2/welfare";
-    public static final String PATH_ABOUT = "/module2/about";
-    public static final String PATH_ENCOURAGE = "/module2/encourage";
     public static final String PATH_TODAY_HISTORY = "/module2/todayHistory";
     //科大讯飞Iflytek模块路径
     public static final String PATH_VOICE_DICATION_PROVIDER = "/iflytek/service";
diff --git a/base/src/main/java/com/heyongrui/base/widget/MarqueeTextView.java b/base/src/main/java/com/heyongrui/base/widget/MarqueeTextView.java
new file mode 100644
index 0000000..2d1adfd
--- /dev/null
+++ b/base/src/main/java/com/heyongrui/base/widget/MarqueeTextView.java
@@ -0,0 +1,29 @@
+package com.heyongrui.base.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+/**
+ * 自定义跑马灯TextView，不随焦点改变
+ */
+public class MarqueeTextView extends AppCompatTextView {
+
+    public MarqueeTextView(Context context) {
+        this(context, null);
+    }
+
+    public MarqueeTextView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public MarqueeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public boolean isFocused() {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/base/src/main/res/drawable/bg_circle_shadow.xml b/base/src/main/res/drawable/bg_circle_shadow.xml
new file mode 100644
index 0000000..3bfda15
--- /dev/null
+++ b/base/src/main/res/drawable/bg_circle_shadow.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <layer-list>
+            <item android:right="1dp" android:top="1dp">
+                <layer-list>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#08000000" />
+                            <padding android:bottom="3px" android:left="3px" android:right="3px" android:top="3px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#09000000" />
+                            <padding android:bottom="2px" android:left="2px" android:right="2px" android:top="2px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#10000000" />
+                            <padding android:bottom="2px" android:left="2px" android:right="2px" android:top="2px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#11000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#12000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#13000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#14000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#15000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#16000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                </layer-list>
+            </item><!-- Blue button pressed -->
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#90CAF9" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_enabled="true">
+        <layer-list>
+            <!-- Shadow -->
+            <item android:right="1dp" android:top="2dp">
+                <layer-list>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#08000000" />
+                            <padding android:bottom="4px" android:left="4px" android:right="4px" android:top="4px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#09000000" />
+                            <padding android:bottom="2px" android:left="2px" android:right="2px" android:top="2px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#10000000" />
+                            <padding android:bottom="2px" android:left="2px" android:right="2px" android:top="2px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#11000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#12000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#13000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#14000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#15000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                    <item>
+                        <shape android:shape="oval">
+                            <solid android:color="#16000000" />
+                            <padding android:bottom="1px" android:left="1px" android:right="1px" android:top="1px" />
+                        </shape>
+                    </item>
+                </layer-list>
+            </item>
+            <!-- Blue button -->
+            <item>
+                <shape android:shape="oval">
+                    <padding android:bottom="@dimen/dp_10" android:left="@dimen/dp_10" android:right="@dimen/dp_10" android:top="@dimen/dp_10" />
+                    <solid android:color="@color/colorAccent" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/main/src/main/java/com/heyongrui/main/HomeFragment.java b/main/src/main/java/com/heyongrui/main/HomeFragment.java
index 563193d..e41b99e 100644
--- a/main/src/main/java/com/heyongrui/main/HomeFragment.java
+++ b/main/src/main/java/com/heyongrui/main/HomeFragment.java
@@ -1,16 +1,32 @@
 package com.heyongrui.main;
 
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.View;
-import android.widget.Button;
+import android.view.ViewGroup;
+
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.ConvertUtils;
 import com.heyongrui.base.assist.ConfigConstants;
 import com.heyongrui.base.base.BaseFragment;
+import com.heyongrui.base.widget.MarqueeTextView;
 import com.heyongrui.base.widget.numberruntextview.NumberRunningTextView;
+import com.heyongrui.base.widget.planetball.adapter.PlanetAdapter;
+import com.heyongrui.base.widget.planetball.view.PlanetBallView;
 import com.heyongrui.base.widget.tickerview.TickerUtils;
 import com.heyongrui.base.widget.tickerview.TickerView;
+import com.heyongrui.main.data.dto.FloatingDto;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 public class HomeFragment extends BaseFragment implements View.OnClickListener {
@@ -24,8 +40,8 @@ public class HomeFragment extends BaseFragment implements View.OnClickListener {
     public static HomeFragment getInstance() {
         HomeFragment fragment = new HomeFragment();
         Bundle bundle = new Bundle();
-        bundle.putInt("tabIconId", R.drawable.icon_mono);
-        bundle.putInt("tabTitleId", R.string.app_name);
+        bundle.putInt("tabIconId", R.drawable.ic_tool);
+        bundle.putInt("tabTitleId", R.string.tool);
         fragment.setArguments(bundle);
         return fragment;
     }
@@ -38,11 +54,7 @@ protected int getLayoutId() {
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        if (id == R.id.btn_motion) {
-            ARouter.getInstance().build(ConfigConstants.PATH_KOTLIN).navigation();
-        } else if (id == R.id.btn_planet_ball) {
-            ARouter.getInstance().build(ConfigConstants.PATH_PLANET_BALL).navigation();
-        } else if (id == R.id.ticker_view) {
+        if (id == R.id.ticker_view) {
             if (tickerCount < 5) {
                 tickerView.setCharacterLists(TickerUtils.provideNumberList());
                 tickerView.setText("￥" + new Random().nextInt(500) + "." + new Random().nextInt(100));
@@ -63,12 +75,12 @@ public void onClick(View v) {
 
     @Override
     protected void initView(Bundle savedInstanceState) {
+        PlanetBallView planetBall = mView.findViewById(R.id.planet_ball);
+        initPlanetBallView(planetBall, getFloatListData());
+
         tickerView = mView.findViewById(R.id.ticker_view);
         numberRunTv = mView.findViewById(R.id.number_run_tv);
-        Button btnMotion = mView.findViewById(R.id.btn_motion);
-        Button btnPlanetBall = mView.findViewById(R.id.btn_planet_ball);
-
-        addOnClickListeners(this, tickerView, numberRunTv, btnMotion, btnPlanetBall);
+        addOnClickListeners(this, tickerView, numberRunTv);
     }
 
     @Override
@@ -76,6 +88,125 @@ protected void initData(Bundle savedInstanceState) {
 
     }
 
+    private void initPlanetBallView(PlanetBallView planetBallView, List<FloatingDto> floatingDtoList) {
+        int dp70 = ConvertUtils.dp2px(70);
+        planetBallView.setAdapter(new PlanetAdapter() {
+            @Override
+            public int getCount() {
+                if (null == floatingDtoList || floatingDtoList.isEmpty()) {
+                    return 0;
+                } else {
+                    return floatingDtoList.size();
+                }
+            }
+
+            @Override
+            public View getView(Context context, int position, ViewGroup parent) {
+                String name = "";
+                int iconRes = R.drawable.ic_launcher;
+                Object item = getItem(position);
+                if (null != item && item instanceof FloatingDto) {
+                    name = ((FloatingDto) item).getName();
+                    iconRes = ((FloatingDto) item).getIcon_res();
+                }
+                MarqueeTextView marqueeTextView = new MarqueeTextView(context);
+                ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(dp70, dp70);
+                marqueeTextView.setLayoutParams(layoutParams);
+                marqueeTextView.setBackgroundResource(R.drawable.bg_circle_shadow);
+                marqueeTextView.setGravity(Gravity.CENTER);
+                marqueeTextView.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+                marqueeTextView.setMarqueeRepeatLimit(-1);
+                marqueeTextView.setSingleLine(true);
+                marqueeTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
+                marqueeTextView.setTextColor(Color.WHITE);
+                marqueeTextView.setText(TextUtils.isEmpty(name) ? "" : name);
+                Drawable drawable = ContextCompat.getDrawable(context, iconRes);
+                drawable.setBounds(0, 0, 80, 80 * drawable.getIntrinsicHeight() / drawable.getIntrinsicWidth());
+                marqueeTextView.setCompoundDrawables(null, drawable, null, null);
+                marqueeTextView.setFocusable(true);
+                marqueeTextView.post(() -> marqueeTextView.onWindowFocusChanged(true));
+                marqueeTextView.setOnClickListener(view -> {
+                    if (null != item && item instanceof FloatingDto) {
+                        int type = ((FloatingDto) item).getType();
+                        switch (type) {
+                            case 1://分词解析
+                                break;
+                            case 2://航班查询
+                                break;
+                            case 3://身份证查询
+                                break;
+                            case 4://天气预报
+                                break;
+                            case 5://新华字典查询
+                                break;
+                            case 6://成语查询
+                                break;
+                            case 7://动作布局动画
+                                ARouter.getInstance().build(ConfigConstants.PATH_KOTLIN).navigation();
+                                break;
+                            case 8://星球
+                                ARouter.getInstance().build(ConfigConstants.PATH_PLANET_BALL).navigation();
+                                break;
+                            case 9://垃圾分类
+                                ARouter.getInstance().build(ConfigConstants.PATH_GARBAGE_CLASSIFY).navigation();
+                                break;
+                            case 10://智能机器人对话
+                                ARouter.getInstance().build(ConfigConstants.PATH_SMART_ROBOT).navigation();
+                                break;
+                            case 11://音乐搜索
+                                ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "https://ys.juan8014.cn/yin/").navigation();
+                                break;
+                        }
+                    }
+                });
+                return marqueeTextView;
+            }
+
+            @Override
+            public Object getItem(int position) {
+                if (null == floatingDtoList || floatingDtoList.isEmpty()) {
+                    return null;
+                } else {
+                    return floatingDtoList.get(position);
+                }
+            }
+
+            @Override
+            public int getPopularity(int position) {
+                return position % 10;
+            }
+
+            @Override
+            public void onThemeColorChanged(View view, int themeColor) {
+
+            }
+        });
+    }
+
+    private List<FloatingDto> getFloatListData() {
+        List<FloatingDto> floatingDtoList = new ArrayList<>();
+        floatingDtoList.add(creatFloatingDto(getString(R.string.participle_parse), R.drawable.ic_participle, 1));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.flight_query), R.drawable.ic_flight, 2));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.id_card_query), R.drawable.ic_id_card, 3));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.weather_forecast), R.drawable.ic_weather, 4));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.dictionary_query), R.drawable.ic_dictionary, 5));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.idiom_query), R.drawable.ic_idiom, 6));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.motion_layout_anim), R.drawable.ic_anim, 7));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.planet), R.drawable.ic_planet, 8));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.garbage_classify_query), R.drawable.ic_ashcan, 9));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.artificial_intelligence), R.drawable.ic_robot, 10));
+        floatingDtoList.add(creatFloatingDto(getString(R.string.music_search), R.drawable.ic_music_disc, 11));
+        return floatingDtoList;
+    }
+
+    private FloatingDto creatFloatingDto(String name, @DrawableRes int drawableRes, int type) {
+        FloatingDto floatingDto = new FloatingDto();
+        floatingDto.setName(name);
+        floatingDto.setIcon_res(drawableRes);
+        floatingDto.setType(type);
+        return floatingDto;
+    }
+
     private String generateChars(Random random, String list, int numDigits) {
         final char[] result = new char[numDigits];
         for (int i = 0; i < numDigits; i++) {
diff --git a/main/src/main/java/com/heyongrui/main/data/dto/FloatingDto.java b/main/src/main/java/com/heyongrui/main/data/dto/FloatingDto.java
new file mode 100644
index 0000000..e1a850f
--- /dev/null
+++ b/main/src/main/java/com/heyongrui/main/data/dto/FloatingDto.java
@@ -0,0 +1,77 @@
+package com.heyongrui.main.data.dto;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Created by lambert on 2019/9/11.
+ */
+
+public class FloatingDto implements Parcelable {
+    private String name;
+    private int icon_res;
+    private int type;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getIcon_res() {
+        return icon_res;
+    }
+
+    public void setIcon_res(int icon_res) {
+        this.icon_res = icon_res;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public FloatingDto() {
+    }
+
+    public FloatingDto(String name, int icon_res, int type) {
+        this.name = name;
+        this.icon_res = icon_res;
+        this.type = type;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.name);
+        dest.writeInt(this.icon_res);
+        dest.writeInt(this.type);
+    }
+
+    protected FloatingDto(Parcel in) {
+        this.name = in.readString();
+        this.icon_res = in.readInt();
+        this.type = in.readInt();
+    }
+
+    public static final Creator<FloatingDto> CREATOR = new Creator<FloatingDto>() {
+        @Override
+        public FloatingDto createFromParcel(Parcel source) {
+            return new FloatingDto(source);
+        }
+
+        @Override
+        public FloatingDto[] newArray(int size) {
+            return new FloatingDto[size];
+        }
+    };
+}
diff --git a/main/src/main/res/drawable-xhdpi/ic_anim.png b/main/src/main/res/drawable-xhdpi/ic_anim.png
new file mode 100644
index 0000000000000000000000000000000000000000..4161a02970bd629751b209469d5d7f684d99082f
GIT binary patch
literal 2074
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
Ef@#12r2qf`

literal 0
HcmV?d00001

diff --git a/module/src/main/res/drawable-xhdpi/ic_ashcan.png b/main/src/main/res/drawable-xhdpi/ic_ashcan.png
similarity index 100%
rename from module/src/main/res/drawable-xhdpi/ic_ashcan.png
rename to main/src/main/res/drawable-xhdpi/ic_ashcan.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_dictionary.png b/main/src/main/res/drawable-xhdpi/ic_dictionary.png
new file mode 100644
index 0000000000000000000000000000000000000000..51cddf8a45a21dc415a5f7fb62e4871e8db7a44a
GIT binary patch
literal 978
zcmV;@11<cCP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000A-Nkl<ZcwX&W
zxr-A~82^25j$+rVP>?kfP;@i8D%grPS||%*;{jS|rKLw<VWXlV3WA`Gg8zV^g&=F?
z36>TrWP*52V(`L7UGYsapX5-3C_C@rB(u&-70COp-}`+BGhYZf|4`23hXKGaAm<2Z
zr2qpWD7a%n@G5{7#u$7mQH*PTO+He+Ph|kgp0gW7rwEv@YAogRFa1z1RJEZ5K)LAb
zA<#utBYism!Vl#lRa=Px2nzN_2r==?0Ka3#O%T0MHJZlx)KehvockbJ({Y|349C$X
zuZE9l1k+EQi5O5B!CbbScOW7#$JC6*M(cPQc=mpfnAuN<|7Oc+$jgiCsH*ys3;@qw
z%Ovi#@1FU|(rUCKC_4K9I;Uzdz4LtA52JOe`jY`ru*O+fH#+R+$9^?hnP&iELD7;W
zAzoDq_CXe6SQYg&&J)W^eie09-Rca;WfAO6fu9h!+u#I<UaF#=_IcvwL%-U*p2UtO
z1Cpp7;2Gw2nvRBeK9v{B05I^1n1?|$cPizB{GH<Fc&XOx8QlKtjWPgWOq8l}bH#Jc
zgJ^HJHQoi$ok0fNDNWc(gvG6|sRH0v<#@U19wp#N$1aX74du~60}y!b1PB`q0EPi3
z1+q~CDxPy7CYs&K$r-Uc?bYzL^*vZ%ZDGq=u3IzwP@W_p`dvPAH6ZZZ*C32^ijpjp
zYIxlSpy*x!uvHfTYRGw|IzAWxenTL045)ba!I;FXHUlQ*S^on*bs4agfiYbM%x=gt
zBXvw>o&mZ6>dIw~0lI<c${7H%HVKwJ`!GnjtsCuaUFCwi0|KMEH|>Y=1ObiA*MPF;
zd?BKtmZNjN$r<zC;!C#(wjQsI>jE$w%b_1LMX!#`rGNn-?<t^5ab3C0rGRcAx^e~p
z(*`s4M96f3yw3qa!9K)7v<IQy=`AR_+Zb4;TkQN$9w(rg`AJYWKwUZ01+vx!bZ=5u
z&M?3*AY*fYE|qoVObVD3FezZ(4x88GW<MZ>1&Oj}Zy*vkJMD>Y`C+s^R~sTvi|$wx
zc+w7^`STD(#YwpPa<d}SeU|?WKzkpbfj7kb9z-j;p#0xUQmr7%Blc>t=pKkH-AS#V
za{qKo?1$qO&)v@83t8V0Wab9RXw-j;DgVroXiu>B<`}Rlp0kUIiv7INq_&9Th?<S7
zr8<HnGRgoXQ97N@7yzczZKdI>VL%$FPA8q;0mB_JeeZ|1IsgCw07*qoM6N<$g1C0a
ABLDyZ

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_flight.png b/main/src/main/res/drawable-xhdpi/ic_flight.png
new file mode 100644
index 0000000000000000000000000000000000000000..298a43e97aee8df38188ce8cb791ef1695989f9f
GIT binary patch
literal 2045
zcmV<Z2LkwsP)<h;3K|Lk000e1NJLTq002+`002M;1^@s6jmPjd000NXNkl<ZcwX(A
z2W(Yk7=|CPq79CsI0NDal{gVMI6)K<P(d64w<ZR~6&1z3<Bp1oTD9OFaYT)K8%NZ*
zqERup;}$id0_JJ{LrzccZEt(dZSQT)mq6Ql|M{Np|K9ie{?m=zQX$YSRqwnrIe;mh
zAO|o9FeL&hyXPL51DFzll-+X=%mGY^K+5jb?13YJS-{doFjxRw4xEq@qZYeYBY>`X
z8gOO_z}yK;D4|`un^YTsJpn-(Nw;ncJ$^DnrX0O!^YiBZ!41Pk@#~x~{mlP11Ab^X
zIwf?hCII^ZPXPTFudQXwHJ8zU_|A*AxM2Q#W=@#I7cal&XMX@&03VisL8>Oz0^p9o
zeL!7Z-#(15zn&EbtlMPckDNG_w`bk$XU4wW0@$g*DW!8Y0C*g53DCXYR)g7R#<kSe
zE!$*oZ`3#N_|&ta&ulMwbcj_lfJ*?k0^>zu(4+$xe)ef}Uu>}^z<6XECQM@C{P})9
z130WhkPDMkDuAm1j{zHXuc=}8i_c}_@q0DH<)_bQbJK2PkvxExfuTSnk{Oz@_ZncS
z0%Lw(i2!a1JOr#z+p8Dj>!;Iq(5B7So?zVBfpLGy5IBeG1H1$XVnM4k01pIi25MFw
zxIW`<na;AS>Wob-!MMKzn**O@4BpCslrDI>_!Tkl-Ud(td{Zd^E)HA;94QFvjU2(~
zD=(pDNyA`sdu-}iyjkDi7arGLfM?49-iyH6fDcHp-iXcd0<ax$ekB07Jn#sxrQ&#p
zlcuok<fDq>p;S?_1d}i%jx0^ji@-A^D52hoO|Uv($k5j4YydY3;PvUzvnOM(yMlFg
z+P)|l3C6t=I5tb<0OQ3ozyRP!z{Px!nByYgqyX}e&IC|-qD)yraXg`62EEr_t0*47
z%=wZVhmDFD*NjB5tZ2^4^ejD3;`lx=`p1dEyNB<30|x>1odKXi?!u@_QcN7j7cS$@
z7%_&QXMf?xre~&UjoKw6)8n28Rs=o`$F?z{PS|MR0pL$S5dZFI0P8|ZW?W(Lp%d9<
z+9}P%aeUDW7c8J*--%I<YfSRk7usBVvD_paTi5m;umkW@k-?1By8|}?huWq!0QD9(
zD+_G^tZCo`mTd28E4ZIRd;~DJ$Qq50Uzt(@+XmrY6u?^GG~n>ysujHNOqTXAun#b=
zh0&z`a{=RsPSj|HJW!Xm@)0$96SybDh;M=KfPXSscJ&M*PM-r3&B=gFToAy4!0Uh>
zXopFGnbK_4WB-i-Hw<D?RP8q>HmKp@qZq4tT>b)n3vCqIKG1l!p~!WN=wVvgUk3O(
zwzu^I=`2jMfe^-?4(nSfNStN>t_HjctO`5|n7y~;(xt3PumoW`5S5N+0(-`ia|-~^
z0S5qnr+pTV%1+^LpZW!WI>!g=COiq}1CgpWz*~WiazE#I5ZEJV%~IA|tc`asUJZzg
zcQK1BI>LLaX#h8D$}%M8F=-~Yud(!%z;ymCizyo}4FjwEP2pT*<Y7kuzXErKHs-qa
z6EHnaa&z1#!`L<(8^E)2qIujrLFU$RZ*S{<^lVw#Q=n7bp9FAFScDDS=%^NGyseXW
zh4!9|+ku|}ANIdV03{5cp6)4lS*rVT0=Qg|Q^wbFnVxPc*B>|=I3qccN7w}zH+Jo)
zdxQ*js}?f`_6ow+nq4`}FmX-@C&pjBu!#wvY$xj~U*c7Vax5r0rcYRz<Qn!5#8K+J
z#y<tV!gp)n{Zc!Y*iO>3#3n|@<Qoe0^Gli6D)40B>JkUfs+pu^;_grLOWz`pu}d*i
zFAJU?FUPQKoyBoBG+YlzteOQ6$*7<S;C?|qC^w{jlj@E%_1wK7$93MPf}|0Y)=bHz
zYVfC(6CFYJZjU*JOn<T0r(pn<f~BjXydZ%7lSsydPUd^+u#Pm>pboWs?(ce|#nL-U
zScD#^C%S24lt;NO!r3sQkT;%2rZeev>c|!?p32$byzn$z>(^1=d%0xYty%C+EMRcR
zn0lmKnDeL`P1P)@wra^-*h>hHL2Ff-RtHYeKoG_O2ZwdI5wie~c1xxNvsNcV>p51e
z+hP*gTW!4-?M$Fr+nhIFzN=wu(yYN96OMPWzK6u_NQ_;+(NI>aWB}c`#Q{AjVnGY3
zdZV?wVy4*j)i>jy*9KOS%4U@gV6<@yowtSBq`-JbYk{FyS<Ra|z45;?3++ygb#3(u
z^_iE!f~hH6^ssje3}hTM9vT<RCA1r-tricAV>B@ceyb#Un99LQvA@SnGV+#9hR#xG
zH<_dw0dxZriv%OlXnLXEn7oFJXDexicEJ-<tpG-+$Mn-HQZKozcw1cc-N3kzj%O=Y
z+kGV?vnz>e1~Br7WGW~_%hd6!&v>??I5+Fcq-@s}02Ig?;8fuB@Vl4pQxfmZ7z@qw
z_0~oAx@~2$Wc#iHV6-nU-7QS$m73X$#ggbveQTcHotXcg5{`c=47(bDf}w|bcjAjj
z?$7+zHx44(FjhE_cpBeKZ?APl03$4tsbC?D%zeERYPWS|00qTV(8_YLDvf2Z$J>ow
zl?v%J`^~&>SNFio0qg24Tz0^605gU-Kf);i%>m2-Oo>3s?zso%0H#DBW%t|za{yB!
bkh1&#FW8=f;+=P|00000NkvXXu0mjfhuP72

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_id_card.png b/main/src/main/res/drawable-xhdpi/ic_id_card.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d637a9f3e3cc4cdcca65774803403abf4d5abdf
GIT binary patch
literal 1644
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

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_idiom.png b/main/src/main/res/drawable-xhdpi/ic_idiom.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc78c4129c8d10deb5e85c74191895a028582e27
GIT binary patch
literal 2650
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
IM6N<$f^6RDrvLx|

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_music_disc.png b/main/src/main/res/drawable-xhdpi/ic_music_disc.png
new file mode 100644
index 0000000000000000000000000000000000000000..05b28586cfecb8db59287ccce12251a343b2ed7a
GIT binary patch
literal 1004
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!CIt9|xB}__6%|laUjDzd^gob<
zqs&YYyQ&JL03rxcTvCG20@seLrmPHM2t)z0b|4#BF+>V1m~!$$C(up$B|(0{49~)U
zy=PbWE`FJrpZoUWf><BHFFmgwt)Jaq>T05P@5t0z-91^U4yzikPp~?-CE#t(fhi0O
zOm{q8977@wznyk-+A0G9SMI|$9Y)+n77MrCdj9|ayIZf_Tsdacz5o0`>x|XxkX2e<
z^|L0tJFm+&=k5F*ymjf@Zl5?@uPQZ>f5WZvC2yapu_fI3<a%+NUf_Wb%F36QzB$*$
z_^|NVC1=(dmfpM#rq9y<m-A@s^p-ul;Ew&>qmmu^@^A8(L)xovF&~KCww`JB%gOf4
zH}Bf9eE2FgBm42c?ydqy6_$dhJl9@CZev?#<;%Q+<D==L`%)WXez7b#y;4Rqo=Lyr
zP*5$4!8+wDpAL52I5m%H%jSjq8Mx%8-7EDrVKp#N*uiNex9;khWtj&Az3PpWRvcVB
z&F&(5L*5r@uXKwK9(TJ}8PwdbJ{Y#*$InV$Plh=H`R^}={E(@=n!<49z$-hwgG}>I
z&04~sdO`M#Wsuw%Pd<mz?Td3oYudz?=_tIf+sRtNrgxI5<iXY4-^V*+re9+4`Y`Jc
zkImO(Q`zqb*glr^>kp9IaOj<6cm&7XsGV2Y8XWJHAN?V=qqv*#gOWQ>#DZ5o>4p*U
z;SajPoel`S5_urxlzYwPpd+Ij<6})0E}eV9@BDaXC{`Z3_duXl;#cvfkQF9Z78ZAy
znl)>u->XeHWOT2sSLI!gzT$(9_2=5o@4Z?nUinJ@^PcbPCowwyZ{gWnyx`)6{Id4W
zEB{P$tM6*H>{`*Ebg}i*tq_i@`;|}Wv-+4Uwob|SWh~w!>{=(RvCBHFP-;G_kcQJ8
z?W`9)K8ph!|4%>qFnYpOu2r}9EAs~5TW|d1?_D*Ir;O$m-wJkYnCQ>Ybm~mw%sKUp
z5AUn2ZQD5Y<9f-mZ5vF|HL^MDc}@%J&*bd6dHk<&$l|X?x(hBYdlSVLA^f$h?7&u;
zczxXm&n~sR;V|I)cH;GSo`{R=y0#7<eI4s|GF7nFPT3pIaAoJeZQu8>P2l;aHtm`E
zj?-SV&nE7)$(eQKaDVOkiEG}ZN<H#@xN*UK&ust5sBpK4tC`y}bAMf4@sH6uDll>P
T{ErubS%ksU)z4*}Q$iB};w|ur

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_participle.png b/main/src/main/res/drawable-xhdpi/ic_participle.png
new file mode 100644
index 0000000000000000000000000000000000000000..af29cc16265034a2db0a08b30424984b40e1b9c0
GIT binary patch
literal 2692
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

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_planet.png b/main/src/main/res/drawable-xhdpi/ic_planet.png
new file mode 100644
index 0000000000000000000000000000000000000000..b04194a3e87501c2376818cc1a73bb7dc58f5c37
GIT binary patch
literal 2628
zcmV-K3cK}*P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000ULNkl<ZcwX(A
z3sBV69>+gtcVQO<M4&*yup|*!qcpYAN~c7-SM&Dpk!5CCQ`|IbDzoXD_E3A+bxbX9
z_VA{Sk5cnm_Ano*WmXmjvVkT-gvuM_wU7UvI|mj86<8NYLw+;PI6LS6`+d*%{Lb%n
z5M1CQF7W-+PC&Z{T;L3}Ux5qU0osFL`xR)v0&S0hP#^}7z#gEgu`RZVD=>JLG#okf
z`gI3ZJ~_$hu#ZAYquR80P-nshkIB94zPbP2KHTROgixf^lQuy>zgaupNLex|QA+8E
zp1Qyu7;}w}tuUYb9UIA5H<#dke<N<%vX8b5GmLJN1O)dQa<D8rwR`XBo1|}ioDjO2
zb5+M(x@RXp&P*Wg=@o=tKWf~TVTM(8NoWfmpa)SJp76j|(TVd$>im4`9kR2cl9bsK
z&>Ur4`O;@=w+u6kYHI|91KF2PUYHm;GV#sY%{i?$oE23VIt6g(KeNc$xq@p~97z6Z
zsMi&3jer24BzVBcyRVwHZh7tI>_>9Z@(MBbiY9&jV-%%sr~lHVHt7Ls&p!j-4EfSN
z5X6=02dB+}wA&Eg-h4O7Oi-T$dQ4q-=hmTym2J%f)P8ORJ`e15-LyWhZF^pTUo{C1
zJLwA_<=D;->AU#5P2b+rV|a^Yf!I~rbc8b`b*$GDZq!l=&=BAnKou(L-c|s|fGl9E
zt7vh$p{t=K4*_oqFVo)8>u(Rzc^M;%_I<6h6&|I><V9~-=1rX3qIE#*8X4=<2>f-N
z__h(ysv?^U{9R=wUz7MLy1UU}j`Z%}Qz0U93+={(c@AC55u2fdx3G5d6(3|5J0DZo
z%R?f%0aJmiguzQ6Xdb+;C~5OEDn>M<ueH*k30MT&3w(e7=uW@9`c&AkfDZb|6F{62
zneBj|Y#jc>&g%W;Ec&683Wt=p#QS`(Y)|<FQIpDBRoo^(-WTF8-pxPm2AU9c9|50X
z1AU(R^zH760tPquohHFzNA9y>*I?<-$C<vRkb8UkRlYXJ|0>ffIcaX#^mvKe1USZD
zGRCkXYfTfDIsrcbX?xa1zIb&{|4j%2-9aahIN<9l#84lS|69t<tBx|Ln@KJk7d+PR
zbk>LN=<sBX+XT3wd?YYO-QV)0sE1A7rmgO7zE*cN345xb3=Wq#=(Qvpqd`Yl2mRt-
z3+&GUd2Zl1t0gT#Kwsc>pucK8C*E$1f9J)hFF~k)boP>FL;h$31S^w|GhstMmj`<}
z(+liYU@`FGsX;Azjl9$#9aHuT!;_2=+SwRwE&=Mqrvb}=3BY|?YV6eror=UBNwpVj
zReP<G(H|Y-Xqm<>aXy=$`l486l@7q8!27jpR7MigaYuQDVb0-uMWg-ysi4kCfHT#+
zT^F0uaNs(r<sRTSSG4afEj@2_V#x4l=d~Z%B=VzjkP4b4v)Dn;H?mnX`eLUanmJ*0
zfl8AP05gH-n`Nuo&rT8N{<utpxCBX&@Ga{iE<M~7qk5nacu2FDqg}vGYPCC|L_&}b
zTy1KTpv#=d&6QAIgYb^Exp?bg`RI@r^fNP`1=K$k69xdgo7C6Hg3}0)vX7UvSd&Fe
zN{kR^%){3KV}Z#oy$Qf4K!|3E+X*7Rp1p0A$Q&mGfVjyQyxhBWGRX$}?bWJQrIhi{
z&+^HA=8}V^XEQH%>EB4TRtB{w0ZN%n>k%TN)AJipyaeb9)YjGia#eZ*G>iGP!bPqv
zKQWaPBTUdyIZV@1Hx}fUYjl~P#l8o-$SY)yQM`p><{!X%Kq>UNU~=y`>f?O}P?g?Y
zuAfz84w31xbDf$_b!GMCx0)h{2m_*D^{CE0DRm+@R-RbvGbe*j#)UDon@=|}J0lYq
z2<!rsQk6D55>E(FuKzf2nTz?gY9Jvk=Jih4<`IfBeN^Q{u02V>Wec--eozqi#QP2q
zFJ!8F|1>ZWP;tj&@q_?X>K+0X05bqJgs@AC`TZ6ppj1O{JQ;sO=4G;UL<pl|OlI*y
zmOAl$E)o<DkHr%Ll(7c^6$_@g;=vU%quV%Vm0yv^NKXAQ*MZzzQx7<t64RW+?3&n_
zmv-g%`Q)Jef36G`QTP5!i+KdT;u{f}>^2Th2~fBaU6t7vKrbLdvzUv4jx9n$iVeB1
zCJX$0)JosCbC`cqu=TOe3)GM5^oP1;3e7Ut90HVKHHlGeZ%<%p+UHRnqasaX&IXa(
zYefX=pu1PS&*T>skY5wrAN(|rl_}-eol>)F)dkSY$}!HyPD5*(OMud=bg1gjO9;Yl
z9TK1$GQbaW4<qr>Cj2@yp7!LLazv;O2Kk)8XwP@><2xnn$f{yxN*O7+cH%?5nK3Z%
zw%ga`s?^t{$noLB5i(gU&ruVn2BjqkP|ELC9su0%<fPzDyOSzA?)jw>yIm3yW+1k^
ziJ0z2!b80X4%8FeNsoUWVhV~K9LaTX=yx06|5Cx;luFeB(m&i(T>-AMl#~8=*WbFn
z{CiZBJ6A#BjxJp_y<xo&@_^3z`*`so4K_$EMS#Nflj;kk#k^Q$1FOx+?xaf6GpwX#
zSo!skmD~ac1;rYLB^oxnBs9c8_{9b;3NlpxKO)SF_=~;h-_^)PS(4%s4fB#eNbKX!
zv)6VUC}w9iHh!yrh3*Q!5uGDhEI*d}XLx|J(Hl?zr)a6MaUOMq6;9-5RW<!yk!1J>
zN69L2uxo1P1;I12R0r7N;;{!rt&jl+$BR>km+J9RwW$f3CGLI@s#|nVR0E{u0DshY
z>x^xM)#I`44|iE_el`2Hx=LbJX^-jzMk#djQ^yF8tH9a-<{rR0t72B$hv*Qu?ziZt
zFiV^|%6<fxr&?q!HMXxio={!)e`5tJ*fhz6kMr1`S;^~TgBRTSUS9o^-zE*Q$Fvnl
zxm4<ezh$i9<FnpCoew<nfT&H<=v_f<>L_t~?O&r@d4j4CcPEYw+PG+D=SL9Y<V3g@
zK)F_v>oYX04#~So$9ehNV)S~UJ(1u$e9D?qRb!kcv8(N~1)^h-uYOw2%|g8|cq|?f
z;HEVdvDL&#k#X?)t9{d_+#MXyE6Nxjq0{+S9k7#Qv5}r<XG3}g8`8>gNSys5z1M9&
zU{y7~ng+DGv?c+y;MH55B4Gqj?`2jk&<PxR9XsqA8vylg*W!cE##sC_2&ijcwb5Zf
zmpV^l>Upd=Ph!pTl0Tb(W`S*ukJ|}o4Oah3I@>+quXI|ifwd()Ks|!0VWq0%)uW1f
z#d)hWKm+Q{|5e}!5bUxs-Sr0-?*XYmoIAE#k^p5-HAJehS3^rRt?hTF#}{{iHL*rj
zpz4nv)Fi5wfW2xq>3XBg0S>rhr=<yS$L4vprk#NE>Nw5;n06012c(}@CfhyWygH6^
m0H)mo&H?G?mB|a<1O5-@p?_`?W)n*Q0000<MNUMnLSTZcQwBN!

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_robot.png b/main/src/main/res/drawable-xhdpi/ic_robot.png
new file mode 100644
index 0000000000000000000000000000000000000000..561f5c8ac5e6c21c1ae0c690a2361477904f4297
GIT binary patch
literal 2090
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
UZY>%7*Z=?k07*qoM6N<$g2K=9Hvj+t

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_tool.png b/main/src/main/res/drawable-xhdpi/ic_tool.png
new file mode 100644
index 0000000000000000000000000000000000000000..977c17b4a3d56e87232e2f3e3bcb255481846777
GIT binary patch
literal 2329
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

literal 0
HcmV?d00001

diff --git a/main/src/main/res/drawable-xhdpi/ic_weather.png b/main/src/main/res/drawable-xhdpi/ic_weather.png
new file mode 100644
index 0000000000000000000000000000000000000000..be2949669f4777a69b5088c00d8879cab35dc323
GIT binary patch
literal 2639
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

literal 0
HcmV?d00001

diff --git a/main/src/main/res/layout/fragment_home.xml b/main/src/main/res/layout/fragment_home.xml
index 562f7c6..27a7781 100644
--- a/main/src/main/res/layout/fragment_home.xml
+++ b/main/src/main/res/layout/fragment_home.xml
@@ -12,6 +12,7 @@
         android:text="￥69.65"
         android:textColor="@color/colorPrimaryDark"
         android:textSize="@dimen/sp_30"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -26,45 +27,26 @@
         android:text="58"
         android:textColor="@color/colorPrimaryDark"
         android:textSize="@dimen/sp_30"
+        android:visibility="gone"
         app:duration="1500"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ticker_view" />
 
-    <TextView
-        android:id="@+id/tv_home"
+    <com.heyongrui.base.widget.planetball.view.PlanetBallView
+        android:id="@+id/planet_ball"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="home fragment"
-        android:textColor="@color/text_color"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        app:autoScrollMode="decelerate"
+        app:darkColor="#ff0000"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/btn_motion"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="Motion Layout"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_home" />
-
-    <Button
-        android:id="@+id/btn_planet_ball"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="Planet Ball"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_motion" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:lightColor="#00ff00"
+        app:radiusPercent="0.75"
+        app:scrollSpeed="20" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index ec94d8c..7c5d5d4 100644
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -1,5 +1,16 @@
 <resources>
     <string name="app_name">main</string>
-    <string name="gank">Gank</string>
+    <string name="tool">工具</string>
     <string name="tip_click_again_exit">再按一次退出程序</string>
+    <string name="participle_parse">分词解析</string>
+    <string name="flight_query">航班信息查询</string>
+    <string name="id_card_query">身份证信息查询</string>
+    <string name="weather_forecast">天气预报</string>
+    <string name="dictionary_query">新华字典查询</string>
+    <string name="idiom_query">成语查询</string>
+    <string name="motion_layout_anim">复杂动作布局动画</string>
+    <string name="planet">星球</string>
+    <string name="garbage_classify_query">垃圾分类查询</string>
+    <string name="artificial_intelligence">人工智障</string>
+    <string name="music_search">音乐搜索</string>
 </resources>
diff --git a/module/src/main/java/com/heyongrui/module/ModuleFragment.java b/module/src/main/java/com/heyongrui/module/ModuleFragment.java
index 95122e8..2562967 100644
--- a/module/src/main/java/com/heyongrui/module/ModuleFragment.java
+++ b/module/src/main/java/com/heyongrui/module/ModuleFragment.java
@@ -28,8 +28,8 @@ public class ModuleFragment extends BaseFragment {
     public static ModuleFragment getInstance() {
         ModuleFragment fragment = new ModuleFragment();
         Bundle bundle = new Bundle();
-        bundle.putInt("tabIconId", R.drawable.ic_mono);
-        bundle.putInt("tabTitleId", R.string.mono);
+        bundle.putInt("tabIconId", R.drawable.ic_news);
+        bundle.putInt("tabTitleId", R.string.news);
         fragment.setArguments(bundle);
         return fragment;
     }
@@ -79,22 +79,13 @@ private void initRecyclerView(RecyclerView recyclerView) {
                 case 3://诗词
                     ARouter.getInstance().build(ConfigConstants.PATH_POETRY).navigation();
                     break;
-                case 4://探索
-                    ARouter.getInstance().build(ConfigConstants.PATH_SMART_ROBOT).navigation();
-                    break;
-                case 5://音乐
-                    ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "https://ys.juan8014.cn/yin/").navigation();
-                    break;
-                case 6://开眼
+                case 4://开眼
                     ARouter.getInstance().build(ConfigConstants.PATH_KAIYAN_LIST).withInt("type", 1).navigation();
                     break;
-                case 7://垃圾分类
-                    ARouter.getInstance().build(ConfigConstants.PATH_GARBAGE_CLASSIFY).navigation();
-                    break;
-                case 8://电影
+                case 5://电影
                     ARouter.getInstance().build(ConfigConstants.PATH_DOUBAN).navigation();
                     break;
-                case 9://知乎日报
+                case 6://知乎日报
                     ARouter.getInstance().build(ConfigConstants.PATH_ZHIHU_DAILY_NEWS).navigation();
                     break;
             }
@@ -102,12 +93,9 @@ private void initRecyclerView(RecyclerView recyclerView) {
         dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.tea), R.drawable.ic_tea, 1)));
         dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.hitokoto_title), R.drawable.ic_yiyan, 2)));
         dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.poetry), R.drawable.ic_poetry, 3)));
-        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.explore), R.drawable.ic_explore, 4)));
-        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.music), R.drawable.ic_music_disc, 5)));
-        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.kaiyan), R.drawable.ic_kaiyan, 6)));
-        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.garbage_classification2), R.drawable.ic_ashcan, 7)));
-        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.movie), R.drawable.ic_movie, 8)));
-        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.zhihu_daily), R.drawable.ic_zhihu, 9)));
+        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.kaiyan), R.drawable.ic_kaiyan, 4)));
+        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.movie), R.drawable.ic_movie, 5)));
+        dataList.add(new ModuleSectionEntity(ModuleSectionEntity.MENU_CARD, new MenuCardDto(getString(R.string.zhihu_daily), R.drawable.ic_zhihu, 6)));
         monoAdapter.replaceData(dataList);
     }
 }
diff --git a/module/src/main/res/drawable-xhdpi/ic_explore.png b/module/src/main/res/drawable-xhdpi/ic_explore.png
deleted file mode 100644
index f0dac5c2025720087500f23ae58c4fe9a03a56fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1286
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz$hNz6XFWwnwXfVtE&S^2rxD_
zhA~ZmY$GEhJv}|Rl&PsHTo%XxD$vr>0;&Ome@8(^p#h)*xR(ECKnl>5{XNP6vE~0!
zhJQ!E2xbmY9H{>PF$N&g*VhMX1ge1w9%uM}0wnnVHUm%`Xb8k!pe#@gL>W*Qh<gI0
z0HpT_NF0QK1_H?wAOy7W?@?x;-oGFQNDAm$pkfQnAF{xpi7pB93ugGuV&ZGh_x<U4
zCtZ#=^9(;+KXzbd5Vxk(x6hlVRAk48THNjBe|UYz>LnBUZRF&BK014(t*IfvU2scL
zew2f%DC^xB)g|eP5uV!0A|Livmu32z8c98Wa&qM|Lko%7Ul<seojqL~Ln02p4LhE6
z%RwO3QNh8(W5zwhV+k_m2lh5Z$2{7xZ2!;y?>V$Nl@wbx@LPV=)7iWyv20g<BkP_A
z{4DJpKkQxjLSJ*T$?62IZ@cFy&c$Q4q3HwPujL%iPn_DQu+(`{fM1q`(x*(ns$C~;
z9$oSE<xMYk2SZza`wcuNRG<3?JO3;?FgrdqVfx0EhMI;OR*CQDd9pa{;Hk5h?;Wsl
z|Ljm{X3yGU9Cq+^xssK=@&4394q0OHLW1X_SeuI%&DH&7RhA~P$V9nPO5m~CN$HF8
z-p|ZPRq5!?*l|3GcSgY_yXXHDcS(EuH7t?-f35O+>x=96_-rFwJQdz8QegU;5VXxt
z#$D`WW7jfoCgyOyhYt!(w|~B=rnPhC0tK7!hsO>@%+@;p_>#GJnIhln-(I>m|N9&0
zes*K9c*wRm^YVo@n{R(#zPzc!Ycyq{F}K5cIp(8h{(Y4Zl)bl8J7B@bM_Eewri~Ay
z{{PwLWmWWh9oM>pUrsUTJl)GE;hWvQt<Nm{+cwSZmItk^tE77FY(02cYQ;?(VS~xx
z{J)=x#oqX79-R^vdiF!P_=YL2A}6F)ZqMb=dvRx7!qjb@alYBj&dd^A&q4zx);KOW
ze}4bV3j%hR4=-twcgg>Ag?-V!hOR$*3xkC>9-BX5=7xmQN1QIpK2<LW6FtbXnfpY5
z@g1GLx%>ZoKDg_A-}K{uC+?3BoZ!ATzv7vDTbE?(99u5G5Fy?N>19`PLbv=}-u7)y
zWx;HQ2{Pq*oD+K7CeBb7{;Mv<aCQ>Iq(~Rd4b11GcD!$8bcxbj?IozYcTT8GHP4&L
z%k0v+dv01?H@wjGQrGm6-@E0v1Pg9^*Y01ua7*K{!ddA}24Am!%ywmVUo8FHkRfYw
zq9EhO$X5wB^YeowA8PHKV!pj6F89jCIn&Z6Ygs6H>n^=}TXxZE6J;Zxj?SvAJ&Q^j
zUzk`o?`3Ib_R+qgJ?Xxk&9#`@xofvxd8s3rp}PC&i?+qS=^=KvVm2x|pWbz+l0Up}
zf!)2i1%2i3Sr2o*XKh}5=z!P1m3q6LXrHU`zP9P|xd6{+-q-GA$1R_<mCZ6Lgz?Jd
z_faNWQz9og)m#ioNxt|efAzZJo6lzc5j@gUYX2-cfsy|Y>#YSlZoW+Sy9vy-44$rj
JF6*2UngFUzHWUB=

diff --git a/module/src/main/res/drawable-xhdpi/ic_mono.png b/module/src/main/res/drawable-xhdpi/ic_mono.png
deleted file mode 100644
index 066d93ece7f03426be7ba7c6a2ddc60a43258632..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5006
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

diff --git a/module/src/main/res/drawable-xhdpi/ic_news.png b/module/src/main/res/drawable-xhdpi/ic_news.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eac7ee7671e8f055e787f30530bdc5f637ecb83
GIT binary patch
literal 9277
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

literal 0
HcmV?d00001

diff --git a/module/src/main/res/values/strings.xml b/module/src/main/res/values/strings.xml
index 2a77d23..22c706d 100644
--- a/module/src/main/res/values/strings.xml
+++ b/module/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">module</string>
-    <string name="mono">猫弄</string>
+    <string name="news">资讯</string>
     <string name="tea">早午茶</string>
     <string name="afternoon_tea">下午茶</string>
     <string name="morning_tea">早茶</string>
diff --git a/module2/src/main/AndroidManifest.xml b/module2/src/main/AndroidManifest.xml
index 466826e..4970c68 100644
--- a/module2/src/main/AndroidManifest.xml
+++ b/module2/src/main/AndroidManifest.xml
@@ -5,12 +5,6 @@
         <activity
             android:name=".gank.view.WelfareActivity"
             android:theme="@style/BaseAppTheme" />
-        <activity
-            android:name=".about.view.AboutActivity"
-            android:theme="@style/BaseAppTheme" />
-        <activity
-            android:name=".about.view.EncourageActivity"
-            android:theme="@style/BaseAppTheme" />
         <activity
             android:name=".gank.view.GankActivity"
             android:theme="@style/BaseAppTheme" />
diff --git a/module2/src/main/debug/AndroidManifest.xml b/module2/src/main/debug/AndroidManifest.xml
index 315863a..a9ac3b7 100644
--- a/module2/src/main/debug/AndroidManifest.xml
+++ b/module2/src/main/debug/AndroidManifest.xml
@@ -21,12 +21,6 @@
         <activity
             android:name=".gank.view.WelfareActivity"
             android:theme="@style/BaseAppTheme" />
-        <activity
-            android:name=".about.view.AboutActivity"
-            android:theme="@style/BaseAppTheme" />
-        <activity
-            android:name=".about.view.EncourageActivity"
-            android:theme="@style/BaseAppTheme" />
         <activity
             android:name=".gank.view.GankActivity"
             android:theme="@style/BaseAppTheme" />
diff --git a/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java b/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java
index 82aaa44..93e4f1d 100644
--- a/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java
+++ b/module2/src/main/java/com/heyongrui/module2/Module2Fragment.java
@@ -143,9 +143,6 @@ private void initBalls() {
                     case 8://瞎推荐
                         ARouter.getInstance().build(ConfigConstants.PATH_LEISURE_READ).navigation();
                         break;
-                    case 9://关于
-                        ARouter.getInstance().build(ConfigConstants.PATH_ABOUT).navigation();
-                        break;
                 }
             });
             poolBall.addView(floatingActionButton, layoutParams);
@@ -158,12 +155,10 @@ private List<GankMenuDto> getMenuList() {
         gankMenuDtos.add(new GankMenuDto(getString(R.string.android), R.drawable.ic_android, 2));
         gankMenuDtos.add(new GankMenuDto(getString(R.string.ios), R.drawable.ic_ios, 3));
         gankMenuDtos.add(new GankMenuDto(getString(R.string.today_history), R.drawable.ic_history_today, 4));
-//        gankMenuDtos.add(new GankMenuDto(getString(R.string.rest_video), R.drawable.ic_video, 4));
         gankMenuDtos.add(new GankMenuDto(getString(R.string.front_end), R.drawable.ic_js, 5));
         gankMenuDtos.add(new GankMenuDto(getString(R.string.expand), R.drawable.ic_expand, 6));
         gankMenuDtos.add(new GankMenuDto(getString(R.string.app), R.drawable.ic_app, 7));
         gankMenuDtos.add(new GankMenuDto(getString(R.string.blind_recommend), R.drawable.ic_recommend, 8));
-        gankMenuDtos.add(new GankMenuDto(getString(R.string.about), R.drawable.ic_about, 9));
         return gankMenuDtos;
     }
 
diff --git a/module2/src/main/java/com/heyongrui/module2/about/view/AboutActivity.java b/module2/src/main/java/com/heyongrui/module2/about/view/AboutActivity.java
deleted file mode 100644
index b264b4e..0000000
--- a/module2/src/main/java/com/heyongrui/module2/about/view/AboutActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.heyongrui.module2.about.view;
-
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.blankj.utilcode.util.AppUtils;
-import com.heyongrui.base.assist.ConfigConstants;
-import com.heyongrui.base.base.BaseActivity;
-import com.heyongrui.base.utils.DrawableUtil;
-import com.heyongrui.base.utils.UiUtil;
-import com.heyongrui.base.utils.UpdateCheckUtil;
-import com.heyongrui.module2.R;
-
-@Route(path = ConfigConstants.PATH_ABOUT)
-public class AboutActivity extends BaseActivity {
-
-    private UpdateCheckUtil mUpdateCheckUtil;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_about;
-    }
-
-    @Override
-    protected void init(Bundle savedInstanceState) {
-        TextView tvVersion = findViewById(R.id.tv_version);
-        tvVersion.setText(AppUtils.getAppVersionName());
-        addOnClickListeners(view -> {
-            int id = view.getId();
-            if (id == R.id.iv_back) {
-                finish();
-            } else if (id == R.id.cl_author) {
-                ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "https://github.com/HeYongRui").navigation();
-            } else if (id == R.id.cl_version) {
-                if (mUpdateCheckUtil == null) {
-                    mUpdateCheckUtil = new UpdateCheckUtil(this);
-                }
-                mUpdateCheckUtil.checkUpdate(getString(R.string.update_url), AppUtils.getAppPackageName() + ".fileProvider", getString(R.string.app_name));
-            } else if (id == R.id.cl_encourage) {
-                ARouter.getInstance().build(ConfigConstants.PATH_ENCOURAGE).navigation();
-            }
-        }, R.id.iv_back, R.id.cl_author, R.id.cl_version, R.id.cl_encourage);
-        ImageView ivBack = findViewById(R.id.iv_back);
-        Drawable drawable = DrawableUtil.tintDrawable(this, R.drawable.ic_back, ContextCompat.getColor(this, R.color.background));
-        ivBack.setImageDrawable(drawable);
-        UiUtil.setOnclickFeedBack(this, ContextCompat.getColor(this, R.color.background), ContextCompat.getColor(this, R.color.gray), findViewById(R.id.cl_author), findViewById(R.id.cl_version), findViewById(R.id.cl_encourage));
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == UpdateCheckUtil.REQUEST_CODE_APP_INSTALL) {
-            if (mUpdateCheckUtil != null) {
-                mUpdateCheckUtil.installApp(this, AppUtils.getAppPackageName() + ".fileProvider", getString(R.string.app_name));
-            }
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (mUpdateCheckUtil != null) {
-            mUpdateCheckUtil.cancelTask();
-        }
-        super.onDestroy();
-    }
-}
diff --git a/module2/src/main/java/com/heyongrui/module2/adapter/Module2SectionAdapter.java b/module2/src/main/java/com/heyongrui/module2/adapter/Module2SectionAdapter.java
index 0c56e6b..197148e 100644
--- a/module2/src/main/java/com/heyongrui/module2/adapter/Module2SectionAdapter.java
+++ b/module2/src/main/java/com/heyongrui/module2/adapter/Module2SectionAdapter.java
@@ -19,6 +19,7 @@
 import com.heyongrui.base.glide.GlideApp;
 import com.heyongrui.base.utils.TimeUtil;
 import com.heyongrui.base.utils.UiUtil;
+import com.heyongrui.base.widget.CollapsedTextView;
 import com.heyongrui.module2.R;
 import com.heyongrui.module2.data.dto.GankDto;
 import com.heyongrui.module2.data.dto.HistoryTodayDto;
@@ -124,7 +125,7 @@ public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? sup
             case Module2SectionEntity.TODAY_HISTORY: {
                 View dashTop = helper.getView(R.id.dash_top);
                 TextView tvDate = helper.getView(R.id.tv_date);
-                TextView tvContent = helper.getView(R.id.tv_content);
+                CollapsedTextView tvContent = helper.getView(R.id.tv_content);
                 View dashBottom = helper.getView(R.id.dash_bottom);
 
                 int layoutPosition = helper.getLayoutPosition();
diff --git a/module2/src/main/res/drawable-xhdpi/ic_about.png b/module2/src/main/res/drawable-xhdpi/ic_about.png
deleted file mode 100644
index 989124f8dc48ff8bfbace10131736bad76c4451c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1122
zcmV-o1fBbdP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000CjNkl<ZcwX(A
zPiz!r7{;G>TA{$q24bQm@q&pFE?(4t#snLUV*EpAO%P2?ya@-*Y{7^(Za|dIa1p#2
zjS&;sDG?PtNDoFZa`J$9P`Qa-z?}h>QuZ}XSaxGf_x<+UJR!7u-QPF!yuW_)XP;EC
zz(2CU=f|Re#T`I4u>F{>8ks3~D)6vCA5@WRQ2Z>wPt7Iadk3GB3(QE=OQ4pQPeJu#
z2=4mdAr*f^<kd6|zhz0F37D9={Af$Be=nH-zN3Ju1}_|_t~kb!KoRi9SGshlS)37(
zdrd>B{&RIUy662ZQkr-Vh$0}#%S525OHNhUkyXP<mo@#c6alq*@f`$XE&&yo&f>^v
zjmz=dEJZ+4Z~SK7{x^~-^jsEK*7P%!%bHtO0HA-Qam9AeaGCf&EJZ-AUQ9u-*(K*~
zbqUm_%2%NJiHiV0cBXN--))UMP1ymvRfCID#TkLzZ;7a?zptE)*6rRRGZx;5p$M1@
z_~z%$`+}jFlLEPOzQA)YLV*lDHaWih2cN;LYiR=J0wqT-twzxLNPs67+^cZ+z!Q1-
zgi33@syrZyQ9!Ri<aG0naPqePF=XAAOpba9FbA`qYf*sJ)F8Op(Mu0$s};_7ED3@#
z-Mr%TAkJqw26YD{dE;!acL9a|n#Gm1mhgjM$O4M<0^Hr>J>ah_jz$MDoaGp70Zjpx
z_7HG2i=z=s_(3o<0k56VkyRJVE0)j~R))(y9FwMn^<`)R-uki}ot@D?ErExZ$m(~W
z4bNLxUxp@N#}|#Yty%fS5;z#vb^D*MoVBpN3{Akqk;@x2xPH<SSXx7mOuo4Ml!f(W
zXaZ{WauY<qwggsSEQ_OQ3+v0!1SEN5Tp+nAu*x%OH9T%&Jt3NaTD{l`!KbFYikH)B
zblAjtLQDbMAUJ5stJt1aqeCXv6Cw&|?1IQ1Q(o0~(rRU|iS>kN0+M>US47{o<W-e@
zSvA~cVSO2*fZ~t{Ubh5R#Rpk6+Gb&W8J>W=I4r<RmcR;pmc`Ll3+u};1soUPX;Wau
z(X<+kn^;eXCZJX?rXkp9$*aIOSsZP$u)YjUK$16331qz`utI;#;>rdK>&q|&^lXFL
z!!TPRqJZ9QP)7i0tq@Z{&o-z_0Ie0G2ykhG+7ei;5JiAX8`KuSYK15QT-u<{WiY%Z
zi<h1Az03DnPZ8kK2DJmTYB7p{BrhHp;6$&#M)&uuT8tvVr4G9(fz%3-1UR%ootprq
z6=Dgnw?Q2Nlvao&z@ZJgDS*=oQ3SZOL7n+Itq@6oy$$Mm5*$e5C~<jm^uuxlIJ7~X
z9l)u@C<6NYS6NCeMiG$Yg}n~Du?1MI5J`Z&4eBaID6J4nfVmA~w?ZTV_BM#!3Q+{~
o^LS#dSrouBeXE{l!S8^70p1CXP;nGM6#xJL07*qoM6N<$f`TswqyPW_

diff --git a/module2/src/main/res/layout/activity_about.xml b/module2/src/main/res/layout/activity_about.xml
deleted file mode 100644
index b3f0cc4..0000000
--- a/module2/src/main/res/layout/activity_about.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/window_background"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    tools:context=".about.view.AboutActivity">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/tool_bar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar"
-        android:background="@color/colorPrimaryDark"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/iv_back"
-            android:layout_width="@dimen/dp_30"
-            android:layout_height="@dimen/dp_30"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_back"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:tint="@color/white" />
-
-        <TextView
-            android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/about"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <View
-        android:id="@+id/divide"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_5"
-        android:background="@drawable/tool_bar_shadow"
-        app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/cv_logo"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="@dimen/dp_30"
-        android:foreground="?android:attr/selectableItemBackground"
-        app:cardCornerRadius="@dimen/dp_10"
-        app:cardElevation="@dimen/dp_10"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintDimensionRatio="1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divide"
-        app:layout_constraintWidth_percent="0.3">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/ic_launcher" />
-
-    </androidx.cardview.widget.CardView>
-
-    <TextView
-        android:id="@+id/tv_intro"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginEnd="@dimen/dp_20"
-        android:layout_marginRight="@dimen/dp_20"
-        android:text="@string/app_intro"
-        android:textColor="@color/text_color"
-        android:textSize="@dimen/sp_14"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cv_logo" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_author"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@color/background"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingLeft="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_15"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingRight="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_15"
-        app:layout_constraintTop_toBottomOf="@+id/tv_intro">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/author"
-            android:textColor="@color/text_color"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableEnd="@drawable/fragmentation_ic_right"
-            android:drawableRight="@drawable/fragmentation_ic_right"
-            android:drawablePadding="@dimen/dp_10"
-            android:gravity="center"
-            android:text="HeYongRui"
-            android:textColor="@color/text_color"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_version"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_1"
-        android:background="@color/background"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingLeft="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_15"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingRight="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_15"
-        app:layout_constraintTop_toBottomOf="@+id/cl_author">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/version"
-            android:textColor="@color/text_color"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableEnd="@drawable/fragmentation_ic_right"
-            android:drawableRight="@drawable/fragmentation_ic_right"
-            android:drawablePadding="@dimen/dp_10"
-            android:gravity="center"
-            android:textColor="@color/text_color"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="1.0.0" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_encourage"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_1"
-        android:background="@color/background"
-        android:paddingStart="@dimen/dp_20"
-        android:paddingLeft="@dimen/dp_20"
-        android:paddingTop="@dimen/dp_15"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingRight="@dimen/dp_20"
-        android:paddingBottom="@dimen/dp_15"
-        app:layout_constraintTop_toBottomOf="@+id/cl_version">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/encourage"
-            android:textColor="@color/text_color"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableEnd="@drawable/fragmentation_ic_right"
-            android:drawableRight="@drawable/fragmentation_ic_right"
-            android:drawablePadding="@dimen/dp_10"
-            android:gravity="center"
-            android:textColor="@color/text_color"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/module2/src/main/res/values/strings.xml b/module2/src/main/res/values/strings.xml
index a98421f..fd55fba 100644
--- a/module2/src/main/res/values/strings.xml
+++ b/module2/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">module2</string>
-    <string name="gank">Gank</string>
+    <string name="gank">干货</string>
     <string name="qing_mang">轻芒</string>
     <string name="welfare">福利</string>
     <string name="android">Android</string>
@@ -11,12 +11,4 @@
     <string name="expand">拓展</string>
     <string name="app">App</string>
     <string name="blind_recommend">瞎推荐</string>
-    <string name="about">关于</string>
-    <string name="author">作者</string>
-    <string name="version">版本</string>
-    <string name="encourage">鼓励</string>
-    <string name="wx_encourage_tip">微信扫一扫，或者点击“鼓励”，点击微信右上角菜单中“从相册选取二维码”</string>
-    <string name="ali_encourage_tip">支付宝扫一扫，或者点击“鼓励”，你的鼓励就是我的动力</string>
-    <string name="wx_install_tip">未安装微信</string>
-    <string name="ali_install_tip">未安装支付宝</string>
 </resources>
diff --git a/user/src/main/AndroidManifest.xml b/user/src/main/AndroidManifest.xml
index 8df7509..981f464 100644
--- a/user/src/main/AndroidManifest.xml
+++ b/user/src/main/AndroidManifest.xml
@@ -11,6 +11,9 @@
         <activity
             android:name=".KotlinActivity"
             android:theme="@style/BaseAppTheme" />
+        <activity
+            android:name=".EncourageActivity"
+            android:theme="@style/BaseAppTheme" />
     </application>
 
 </manifest>
diff --git a/user/src/main/debug/AndroidManifest.xml b/user/src/main/debug/AndroidManifest.xml
index 0a9c28e..1abef3e 100644
--- a/user/src/main/debug/AndroidManifest.xml
+++ b/user/src/main/debug/AndroidManifest.xml
@@ -24,6 +24,9 @@
         <activity
             android:name=".KotlinActivity"
             android:theme="@style/BaseAppTheme" />
+        <activity
+            android:name=".EncourageActivity"
+            android:theme="@style/BaseAppTheme" />
     </application>
 
 </manifest>
diff --git a/module2/src/main/java/com/heyongrui/module2/about/view/EncourageActivity.java b/user/src/main/java/com/heyongrui/user/EncourageActivity.java
similarity index 95%
rename from module2/src/main/java/com/heyongrui/module2/about/view/EncourageActivity.java
rename to user/src/main/java/com/heyongrui/user/EncourageActivity.java
index b272bb9..849f21e 100644
--- a/module2/src/main/java/com/heyongrui/module2/about/view/EncourageActivity.java
+++ b/user/src/main/java/com/heyongrui/user/EncourageActivity.java
@@ -1,4 +1,4 @@
-package com.heyongrui.module2.about.view;
+package com.heyongrui.user;
 
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
@@ -18,9 +18,8 @@
 import com.heyongrui.base.base.BaseActivity;
 import com.heyongrui.base.utils.DialogUtil;
 import com.heyongrui.base.utils.DrawableUtil;
-import com.heyongrui.module2.R;
-import com.heyongrui.module2.utils.AliPay;
-import com.heyongrui.module2.utils.WXPay;
+import com.heyongrui.user.utils.AliPay;
+import com.heyongrui.user.utils.WXPay;
 
 import java.util.List;
 
diff --git a/user/src/main/java/com/heyongrui/user/UserFragment.java b/user/src/main/java/com/heyongrui/user/UserFragment.java
index bf8a372..ce0bd9f 100644
--- a/user/src/main/java/com/heyongrui/user/UserFragment.java
+++ b/user/src/main/java/com/heyongrui/user/UserFragment.java
@@ -1,19 +1,30 @@
 package com.heyongrui.user;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.AppUtils;
 import com.heyongrui.base.assist.ConfigConstants;
 import com.heyongrui.base.base.BaseFragment;
+import com.heyongrui.base.utils.UiUtil;
+import com.heyongrui.base.utils.UpdateCheckUtil;
+
+public class UserFragment extends BaseFragment implements View.OnClickListener {
 
-public class UserFragment extends BaseFragment {
+    private UpdateCheckUtil mUpdateCheckUtil;
 
     public static UserFragment getInstance() {
         UserFragment fragment = new UserFragment();
         Bundle bundle = new Bundle();
-        bundle.putInt("tabIconId", R.drawable.icon_qingmang);
-        bundle.putInt("tabTitleId", R.string.app_name);
+        bundle.putInt("tabIconId", R.drawable.ic_about);
+        bundle.putInt("tabTitleId", R.string.about);
         fragment.setArguments(bundle);
         return fragment;
     }
@@ -24,25 +35,61 @@ protected int getLayoutId() {
     }
 
     @Override
-    protected void initView(Bundle savedInstanceState) {
-        addOnClickListeners(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                int id = view.getId();
-                if (id == R.id.tv_user) {
-//                    Bundle bundle = new Bundle();
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.cl_author) {
+            ARouter.getInstance().build(ConfigConstants.PATH_H5).withString("h5Url", "https://github.com/HeYongRui").navigation();
+        } else if (id == R.id.cl_version) {
+            if (mUpdateCheckUtil == null) {
+                mUpdateCheckUtil = new UpdateCheckUtil(_mActivity);
+            }
+            mUpdateCheckUtil.checkUpdate(getString(R.string.update_url), AppUtils.getAppPackageName() + ".fileProvider", getString(R.string.app_name));
+        } else if (id == R.id.cl_encourage) {
+            ARouter.getInstance().build(ConfigConstants.PATH_ENCOURAGE).navigation();
+        } else {
+            Bundle bundle = new Bundle();
 //                    bundle.putString("test", "this is value");
 //                    ARouter.getInstance().build(ConfigConstants.PATH_USER)
 //                            .withBundle("bundle", bundle)
 //                            .withString("key3", "888")
 //                            .navigation();
-                    ARouter.getInstance().build(ConfigConstants.PATH_USER).withBoolean(ConfigConstants.IS_NEED_INTERCEPT, true).navigation();
-                }
-            }
-        }, R.id.tv_user);
+            ARouter.getInstance().build(ConfigConstants.PATH_USER).withBoolean(ConfigConstants.IS_NEED_INTERCEPT, true).navigation();
+        }
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        TextView tvVersion = mView.findViewById(R.id.tv_version);
+        ConstraintLayout clAuthor = mView.findViewById(R.id.cl_author);
+        ConstraintLayout clVersion = mView.findViewById(R.id.cl_version);
+        ConstraintLayout clEncourage = mView.findViewById(R.id.cl_encourage);
+        UiUtil.setOnclickFeedBack(mContext, ContextCompat.getColor(mContext, R.color.background),
+                ContextCompat.getColor(mContext, R.color.gray), clAuthor, clVersion, clEncourage);
+
+        tvVersion.setText(AppUtils.getAppVersionName());
+
+        addOnClickListeners(this, clAuthor, clVersion, clEncourage);
     }
 
     @Override
     protected void initData(Bundle savedInstanceState) {
     }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == UpdateCheckUtil.REQUEST_CODE_APP_INSTALL) {
+            if (mUpdateCheckUtil != null) {
+                mUpdateCheckUtil.installApp(_mActivity, AppUtils.getAppPackageName() + ".fileProvider", getString(R.string.app_name));
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        if (mUpdateCheckUtil != null) {
+            mUpdateCheckUtil.cancelTask();
+        }
+        super.onDestroy();
+    }
 }
diff --git a/module2/src/main/java/com/heyongrui/module2/utils/AliPay.java b/user/src/main/java/com/heyongrui/user/utils/AliPay.java
similarity index 98%
rename from module2/src/main/java/com/heyongrui/module2/utils/AliPay.java
rename to user/src/main/java/com/heyongrui/user/utils/AliPay.java
index 25dceed..95a4d19 100644
--- a/module2/src/main/java/com/heyongrui/module2/utils/AliPay.java
+++ b/user/src/main/java/com/heyongrui/user/utils/AliPay.java
@@ -1,4 +1,4 @@
-package com.heyongrui.module2.utils;
+package com.heyongrui.user.utils;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -11,7 +11,7 @@
 import android.service.quicksettings.TileService;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.heyongrui.module2.R;
+import com.heyongrui.user.R;
 
 import java.net.URISyntaxException;
 
diff --git a/module2/src/main/java/com/heyongrui/module2/utils/WXPay.java b/user/src/main/java/com/heyongrui/user/utils/WXPay.java
similarity index 98%
rename from module2/src/main/java/com/heyongrui/module2/utils/WXPay.java
rename to user/src/main/java/com/heyongrui/user/utils/WXPay.java
index 3ed29f4..8801453 100644
--- a/module2/src/main/java/com/heyongrui/module2/utils/WXPay.java
+++ b/user/src/main/java/com/heyongrui/user/utils/WXPay.java
@@ -1,4 +1,4 @@
-package com.heyongrui.module2.utils;
+package com.heyongrui.user.utils;
 
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -20,7 +20,7 @@
 import androidx.annotation.NonNull;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.heyongrui.module2.R;
+import com.heyongrui.user.R;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/user/src/main/res/drawable-xhdpi/ic_about.png b/user/src/main/res/drawable-xhdpi/ic_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..c032c098592081cc583bb6a09181980aa3cae9d5
GIT binary patch
literal 1877
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

literal 0
HcmV?d00001

diff --git a/module2/src/main/res/drawable-xhdpi/ic_ali_qrcode.png b/user/src/main/res/drawable-xhdpi/ic_ali_qrcode.png
similarity index 100%
rename from module2/src/main/res/drawable-xhdpi/ic_ali_qrcode.png
rename to user/src/main/res/drawable-xhdpi/ic_ali_qrcode.png
diff --git a/module2/src/main/res/drawable-xhdpi/ic_wx_qrcode.png b/user/src/main/res/drawable-xhdpi/ic_wx_qrcode.png
similarity index 100%
rename from module2/src/main/res/drawable-xhdpi/ic_wx_qrcode.png
rename to user/src/main/res/drawable-xhdpi/ic_wx_qrcode.png
diff --git a/user/src/main/res/drawable-xhdpi/icon_qingmang.png b/user/src/main/res/drawable-xhdpi/icon_qingmang.png
deleted file mode 100644
index 713eb98607a1d90753350a295a0391bdeb3a13c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3411
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
RHG(T5L|sK&xmM9S{67&bYcv1=

diff --git a/module2/src/main/res/layout/activity_encourage.xml b/user/src/main/res/layout/activity_encourage.xml
similarity index 98%
rename from module2/src/main/res/layout/activity_encourage.xml
rename to user/src/main/res/layout/activity_encourage.xml
index 0e50807..3da8e55 100644
--- a/module2/src/main/res/layout/activity_encourage.xml
+++ b/user/src/main/res/layout/activity_encourage.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".about.view.EncourageActivity">
+    android:fitsSystemWindows="true"
+    tools:context=".EncourageActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/tool_bar"
diff --git a/user/src/main/res/layout/fragment_user.xml b/user/src/main/res/layout/fragment_user.xml
index 28f091e..e8c8580 100644
--- a/user/src/main/res/layout/fragment_user.xml
+++ b/user/src/main/res/layout/fragment_user.xml
@@ -1,19 +1,173 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/window_background">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_logo"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/dp_30"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardCornerRadius="@dimen/dp_10"
+        app:cardElevation="@dimen/dp_10"
+        app:cardPreventCornerOverlap="true"
+        app:cardUseCompatPadding="false"
+        app:layout_constraintDimensionRatio="1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="0.3">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/ic_launcher" />
+
+    </androidx.cardview.widget.CardView>
 
     <TextView
-        android:id="@+id/tv_user"
-        android:layout_width="wrap_content"
+        android:id="@+id/tv_intro"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="user fragment\n测试登录拦截"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
+        android:text="@string/app_intro"
         android:textColor="@color/text_color"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textSize="@dimen/sp_14"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/cv_logo" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_author"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_20"
+        android:background="@color/background"
+        android:paddingStart="@dimen/dp_20"
+        android:paddingLeft="@dimen/dp_20"
+        android:paddingTop="@dimen/dp_15"
+        android:paddingEnd="@dimen/dp_20"
+        android:paddingRight="@dimen/dp_20"
+        android:paddingBottom="@dimen/dp_15"
+        app:layout_constraintTop_toBottomOf="@+id/tv_intro">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/author"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableEnd="@drawable/fragmentation_ic_right"
+            android:drawableRight="@drawable/fragmentation_ic_right"
+            android:drawablePadding="@dimen/dp_10"
+            android:gravity="center"
+            android:text="HeYongRui"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_version"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_1"
+        android:background="@color/background"
+        android:paddingStart="@dimen/dp_20"
+        android:paddingLeft="@dimen/dp_20"
+        android:paddingTop="@dimen/dp_15"
+        android:paddingEnd="@dimen/dp_20"
+        android:paddingRight="@dimen/dp_20"
+        android:paddingBottom="@dimen/dp_15"
+        app:layout_constraintTop_toBottomOf="@+id/cl_author">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/version"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableEnd="@drawable/fragmentation_ic_right"
+            android:drawableRight="@drawable/fragmentation_ic_right"
+            android:drawablePadding="@dimen/dp_10"
+            android:gravity="center"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="1.0.0" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_encourage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_1"
+        android:background="@color/background"
+        android:paddingStart="@dimen/dp_20"
+        android:paddingLeft="@dimen/dp_20"
+        android:paddingTop="@dimen/dp_15"
+        android:paddingEnd="@dimen/dp_20"
+        android:paddingRight="@dimen/dp_20"
+        android:paddingBottom="@dimen/dp_15"
+        app:layout_constraintTop_toBottomOf="@+id/cl_version">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/encourage"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableEnd="@drawable/fragmentation_ic_right"
+            android:drawableRight="@drawable/fragmentation_ic_right"
+            android:drawablePadding="@dimen/dp_10"
+            android:gravity="center"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/user/src/main/res/values/strings.xml b/user/src/main/res/values/strings.xml
index 02342ab..fad515f 100644
--- a/user/src/main/res/values/strings.xml
+++ b/user/src/main/res/values/strings.xml
@@ -1,3 +1,11 @@
 <resources>
     <string name="app_name">user</string>
+    <string name="about">关于</string>
+    <string name="author">作者</string>
+    <string name="version">版本</string>
+    <string name="encourage">鼓励</string>
+    <string name="wx_encourage_tip">微信扫一扫，或者点击“鼓励”，点击微信右上角菜单中“从相册选取二维码”</string>
+    <string name="ali_encourage_tip">支付宝扫一扫，或者点击“鼓励”，你的鼓励就是我的动力</string>
+    <string name="wx_install_tip">未安装微信</string>
+    <string name="ali_install_tip">未安装支付宝</string>
 </resources>