界面优化

app/src/main/java/com/itant/shibei/ui/TabActivity.java

@@ -19,6 +19,7 @@ import com.itant.shibei.ui.home.about.AboutFragment;
 import com.itant.shibei.ui.home.coupon.TemplateFragment;
 import com.itant.shibei.ui.home.goods.GoodsFragment;
 import com.itant.shibei.ui.home.search.SearchActivity;
+import com.itant.shibei.ui.home.tool.ToolFragment;
 import com.itant.shibei.ui.mine.MineActivity;
 import com.itant.shibei.ui.mine.login.LoginActivity;
 import com.itant.shibei.widget.AppbarTranslateListener;
@@ -38,12 +39,13 @@ public class TabActivity extends BaseBeiActivity implements View.OnClickListener
 
     @Override
     public void initViews(Bundle savedInstanceState) {
-        String[] titles = {"关于", "推荐", "好券", "模板"};
+        String[] titles = {"关于", "推荐", "好券", "工具"};
         List<Fragment> fragments = new ArrayList<>();
         fragments.add(new AboutFragment());
         fragments.add(new GoodsFragment());
         fragments.add(new TemplateFragment(FunctionFragment.TEMPLATE_TYPE_BONUS));
-        fragments.add(new TemplateFragment(FunctionFragment.TEMPLATE_TYPE_TEMPLATE));
+        //fragments.add(new TemplateFragment(FunctionFragment.TEMPLATE_TYPE_TEMPLATE));
+        fragments.add(new ToolFragment());
 
         ViewPager vp_main = findViewById(R.id.vp_main);
         TabFragmentAdapter adapter = new TabFragmentAdapter(getSupportFragmentManager(), fragments);

app/src/main/java/com/itant/shibei/ui/home/coupon/TemplateFragment.java

@@ -69,7 +69,7 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
         LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false);
         rv_template.setLayoutManager(layoutManager);
 
-        int dividerWidth = (int) getResources().getDimension(R.dimen.margin_s);
+        int dividerWidth = (int) getResources().getDimension(R.dimen.padding_full_width);
         DividerItemDecoration decoration = new DividerItemDecoration(dividerWidth);
         rv_template.addItemDecoration(decoration);
         // 本地写死的数据

app/src/main/java/com/itant/shibei/ui/home/tool/ToolFragment.java

@@ -0,0 +1,50 @@
+package com.itant.shibei.ui.home.tool;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.itant.shibei.R;
+import com.itant.shibei.manager.UserInfoManager;
+import com.itant.shibei.ui.mine.login.LoginActivity;
+import com.miekir.common.utils.ToastTool;
+import com.miekir.mvp.view.BaseMVPFragment;
+
+/**
+ * @author Miekir
+ * @date 2020/6/18 16:48
+ * Description: 工具界面
+ *
+ */
+public class ToolFragment extends BaseMVPFragment implements View.OnClickListener {
+
+    @Override
+    public void onCreateViewFinished(@Nullable Bundle savedInstanceState) {
+        super.onCreateViewFinished(savedInstanceState);
+
+        rootView.findViewById(R.id.fl_get_json).setOnClickListener(this);
+    }
+
+    @Override
+    public int getLayoutResId() {
+        return R.layout.fragment_tool;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.fl_get_json:
+                if (UserInfoManager.getInstance().isLogin()) {
+
+                } else {
+                    ToastTool.showShort("请先登录");
+                    startActivity(new Intent(getActivity(), LoginActivity.class));
+                }
+                break;
+            default:
+                break;
+        }
+    }
+}

app/src/main/java/com/itant/shibei/widget/DividerItemDecoration.java

@@ -18,10 +18,10 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
     @Override
     public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
 
-        if (parent.getPaddingLeft() != halfSpace) {
+        /*if (parent.getPaddingLeft() != halfSpace) {
             parent.setPadding(halfSpace, halfSpace, halfSpace, halfSpace);
             parent.setClipToPadding(false);
-        }
+        }*/
 
         outRect.top = halfSpace;
         outRect.left = halfSpace;

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

@@ -72,7 +72,6 @@
             android:layout_height="@dimen/height_tab_bar"
             android:background="?attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
             android:text="处理提现工单"
@@ -86,7 +85,6 @@
             android:layout_height="@dimen/height_tab_bar"
             android:background="?attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
             android:text="手动上架商品"
@@ -100,7 +98,6 @@
             android:layout_height="@dimen/height_tab_bar"
             android:background="?attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
             android:text="解析商品链接"
@@ -114,7 +111,6 @@
             android:layout_height="@dimen/height_tab_bar"
             android:background="?attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
             android:text="上架新优惠券"

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

@@ -18,8 +18,8 @@
         android:minHeight="@dimen/height_tab_bar"
         android:background="@null"
         android:singleLine="true"
-        android:paddingStart="@dimen/margin_s"
-        android:paddingEnd="@dimen/margin_s"
+        android:paddingStart="@dimen/margin_default"
+        android:paddingEnd="@dimen/margin_default"
         android:paddingTop="@dimen/margin_ss"
         android:paddingBottom="@dimen/margin_ss"
         android:textSize="@dimen/text_normal_p"

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

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
     android:orientation="vertical">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?><!--启用深色模式之后，需要使用fitsSystemWindows来不让布局上滑-->
+
+<!--阴影效果android:background="?android:attr/listDivider"-->
+<!--<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorPrimary"
+    android:orientation="vertical">
+
+
+</ScrollView>-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="@dimen/activity_horizontal_margin_ss">
+
+    <include layout="@layout/view_divider_common" />
+
+    <FrameLayout
+        android:id="@+id/fl_get_json"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:foreground="?attr/selectableItemBackground">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/height_tab_bar"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/activity_horizontal_margin"
+            android:paddingEnd="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/margin_s"
+            android:paddingBottom="@dimen/margin_s"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="GetJson微服务"
+                android:textSize="@dimen/text_sub_title"
+                android:textColor="@color/black_text" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_sss"
+                android:textColor="@color/gray_text_s"
+                android:textSize="@dimen/text_normal_s"
+                android:text="把JSON字符串保存到云，GET请求获取保存的JSON"/>
+        </LinearLayout>
+    </FrameLayout>
+
+    <include layout="@layout/view_divider_common" />
+</LinearLayout>