界面优化

app/build.gradle

@@ -15,10 +15,9 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
 

app/src/main/AndroidManifest.xml

@@ -24,11 +24,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.mine.AboutActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/BackTheme" />
-
         <activity
             android:name=".ui.mine.login.LoginActivity"
             android:screenOrientation="portrait"

app/src/main/java/com/itant/shibei/common/ConstantString.java

@@ -1,7 +1,7 @@
 package com.itant.shibei.common;
 
 /**
- * Copyright (C), 2019-2020, Genlot
+ *
  *
  * @author 詹子聪
  * @date 2020/7/11 16:35

app/src/main/java/com/itant/shibei/tool/StringTool.java

@@ -3,7 +3,7 @@ package com.itant.shibei.tool;
 import java.text.DecimalFormat;
 
 /**
- * Copyright (C), 2019-2020, Genlot
+ *
  *
  * @author 詹子聪
  * @date 2020/7/11 21:59

app/src/main/java/com/itant/shibei/tool/TimeTool.java

@@ -3,7 +3,7 @@ package com.itant.shibei.tool;
 import java.util.Calendar;
 
 /**
- * Copyright (C), 2019-2020, Genlot
+ *
  *
  * @author 詹子聪
  * @date 2020/7/24 9:15
@@ -15,7 +15,7 @@ public class TimeTool {
      * @return 返回当前是上午、中午、下午
      */
     public static String getCurrentTimePeriod() {
-        Calendar cal=Calendar.getInstance();
+        Calendar cal = Calendar.getInstance();
         int hour = cal.get(Calendar.HOUR_OF_DAY);
 
         if (hour >= 3 && hour < 6) {

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

@@ -11,6 +11,7 @@ import com.flyco.tablayout.SlidingTabLayout;
 import com.google.android.material.appbar.AppBarLayout;
 import com.itant.shibei.R;
 import com.itant.shibei.base.BaseShiBeiActivity;
+import com.itant.shibei.ui.about.AboutFragment;
 import com.itant.shibei.ui.function.FunctionFragment;
 import com.itant.shibei.ui.function.template.TemplateFragment;
 import com.itant.shibei.ui.home.GoodsFragment;
@@ -33,8 +34,9 @@ public class TabActivity extends BaseShiBeiActivity implements View.OnClickListe
 
     @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));
@@ -47,6 +49,8 @@ public class TabActivity extends BaseShiBeiActivity implements View.OnClickListe
 
         SlidingTabLayout stl_home = findViewById(R.id.stl_home);
         stl_home.setViewPager(vp_main, titles);
+        // 默认选中返利商品列表
+        stl_home.setCurrentTab(1);
 
         ViewTool.setOnClickListener(this, new int[]{R.id.fl_search, R.id.fl_search_top,
                 R.id.fl_more}, this);

app/src/main/java/com/itant/shibei/ui/about/AboutFragment.java

@@ -0,0 +1,47 @@
+package com.itant.shibei.ui.about;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.itant.shibei.R;
+import com.itant.shibei.tool.SystemTool;
+import com.miekir.mvp.view.BaseMVPFragment;
+
+/**
+ * @author 詹子聪
+ * @date 2020/6/18 16:48
+ * Description: 关于界面
+ * todo 点击版本号检查更新
+ */
+public class AboutFragment extends BaseMVPFragment implements View.OnClickListener {
+
+    @Override
+    public void onCreateViewFinished(@Nullable Bundle savedInstanceState) {
+        super.onCreateViewFinished(savedInstanceState);
+        TextView tv_title = rootView.findViewById(R.id.tv_title);
+        tv_title.setText(" 拾贝 v" + SystemTool.getVersionName(getActivity()));
+        rootView.findViewById(R.id.tv_feedback).setOnClickListener(this);
+    }
+
+    @Override
+    public int getLayoutResId() {
+        return R.layout.fragment_about;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.tv_feedback:
+                SystemTool.sendEmail(getActivity());
+                break;
+
+            case R.id.tv_update:
+                break;
+            default:
+                break;
+        }
+    }
+}

app/src/main/java/com/itant/shibei/ui/home/GoodsPresenter.java

@@ -4,11 +4,10 @@ import com.itant.shibei.bean.GoodsBean;
 import com.itant.shibei.tool.DataTool;
 import com.miekir.mvp.presenter.BasePresenter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Copyright (C), 2019-2020, Genlot
+ *
  *
  * @author 詹子聪
  * @date 2020/7/9 20:54

app/src/main/java/com/itant/shibei/ui/home/IGoodsView.java

@@ -6,7 +6,7 @@ import com.miekir.mvp.view.IView;
 import java.util.List;
 
 /**
- * Copyright (C), 2019-2020, Genlot
+ *
  *
  * @author 詹子聪
  * @date 2020/7/9 20:52

app/src/main/java/com/itant/shibei/ui/mine/AboutActivity.java

@@ -1,37 +0,0 @@
-package com.itant.shibei.ui.mine;
-
-import android.os.Bundle;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.itant.shibei.R;
-import com.itant.shibei.base.BaseShiBeiActivity;
-import com.itant.shibei.tool.SystemTool;
-
-/**
- *
- *
- * @author 詹子聪
- * @date 2020/6/18 16:48
- * Description: 关于界面
- * todo 点击版本号检查更新
- */
-public class AboutActivity extends BaseShiBeiActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setTitle("关于");
-    }
-
-    @Override
-    public int getLayoutID() {
-        return R.layout.activity_about;
-    }
-
-    @Override
-    public void initViews(Bundle savedInstanceState) {
-        TextView tv_title = findViewById(R.id.tv_title);
-        tv_title.setText(" 拾贝 v" + SystemTool.getVersionName(this));
-    }
-}

app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java

@@ -18,9 +18,8 @@ public class MineActivity extends BaseShiBeiActivity implements View.OnClickList
 
     @Override
     public void onClick(View v) {
-switch (v.getId()) {
+        switch (v.getId()) {
             case R.id.ll_about:
-                startActivity(new Intent(this, AboutActivity.class));
                 break;
 
             case R.id.ll_user:
@@ -38,7 +37,7 @@ switch (v.getId()) {
 
             default:
                 break;
-}
+        }
     }
 
     @Override
@@ -53,11 +52,6 @@ switch (v.getId()) {
         //tv_hello.setText(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod(), "主人"));
 
 
-
-
-
-
-
         ViewTool.setOnClickListener(this, new int[]{R.id.ll_about, R.id.ll_user, R.id.ll_feedback}, this);
     }
 }

app/src/main/java/com/itant/shibei/ui/mine/MineFragment.java

@@ -32,7 +32,7 @@ public class MineFragment extends Fragment implements View.OnClickListener {
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.ll_about:
-                startActivity(new Intent(getActivity(), AboutActivity.class));
+                //startActivity(new Intent(getActivity(), AboutActivity.class));
                 break;
 
             case R.id.ll_user:

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

@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import com.google.android.material.appbar.AppBarLayout;
 
 /**
- * Copyright (C), 2019-2020, Genlot
+ *
  *
  * @author 詹子聪
  * @date 2020/7/21 8:35

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

@@ -75,7 +75,7 @@
             android:id="@+id/tv_forget"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="忘记密码？"
+            android:text="忘记密码"
             android:textColor="@color/gray_hint"
             android:textStyle="bold"
             android:textSize="@dimen/text_s"/>

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

@@ -183,15 +183,5 @@
         android:layout_height="0dp"
         android:layout_weight="1"/>
 
-    <include layout="@layout/view_divider" />
 
-    <!--TODO 隐私政策、用户协议-->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/height_sliding_tab"
-        android:background="?attr/selectableItemBackground"
-        android:gravity="center"
-        android:text="隐私权限 · 服务条款"
-        android:textSize="@dimen/text_s"
-        android:textColor="@color/black_title"/>
 </LinearLayout>

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

@@ -27,18 +27,18 @@
                 android:layout_gravity="center_vertical"
                 android:scaleType="fitXY"
                 android:src="@mipmap/logo_gray"
-                android:tint="@color/black_theme" />
+                android:tint="@color/black_theme"
+                android:visibility="gone"/>
             <TextView
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="拾贝"
+                android:text="拾贝 · 让您购物少花费"
                 android:textStyle="bold"
                 android:layout_gravity="center_vertical"
                 android:textColor="@color/black_theme"
-                android:textSize="@dimen/size_title"
-                android:layout_marginLeft="@dimen/margin_s"/>
+                android:textSize="@dimen/size_title" />
 
             <Space
                 android:layout_width="0dp"
@@ -106,8 +106,6 @@
             </RelativeLayout>
         </LinearLayout>
 
-
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:descendantFocusability="blocksDescendants">
+    <!--todo RecyclerView还是会自动获取焦点-->
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_width="match_parent"

common/src/androidTest/java/com/genlot/common/ExampleInstrumentedTest.java

@@ -1,14 +1,14 @@
-package com.genlot.common;
+package com.itant.common;
 
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -22,6 +22,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.genlot.common.test", appContext.getPackageName());
+        assertEquals("com.itant.common.test", appContext.getPackageName());
     }
 }

common/src/androidTest/java/com/miekir/common/ExampleInstrumentedTest.java

@@ -2,13 +2,13 @@ package com.miekir.common;
 
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -22,6 +22,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.genlot.common.test", appContext.getPackageName());
+        assertEquals("com.itant.common.test", appContext.getPackageName());
     }
 }

common/src/test/java/com/genlot/common/ExampleUnitTest.java

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

network/src/androidTest/java/com/genlot/network/ExampleInstrumentedTest.java

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

network/src/androidTest/java/com/miekir/network/ExampleInstrumentedTest.java

@@ -2,13 +2,13 @@ package com.miekir.network;
 
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -22,6 +22,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.genlot.network.test", appContext.getPackageName());
+        assertEquals("com.itant.network.test", appContext.getPackageName());
     }
 }

network/src/test/java/com/genlot/network/ExampleUnitTest.java

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