詹子聪 il y a 5 ans
Parent
commit
91fc363df4

+ 12 - 0
app/src/main/java/com/itant/shibei/ui/TabActivity.java

@@ -33,6 +33,7 @@ import com.itant.shibei.ui.upgrade.UpgradePresenter;
 import com.itant.shibei.widget.AppbarTranslateListener;
 import com.miekir.common.adapter.TabFragmentAdapter;
 import com.miekir.common.utils.ActivityTool;
+import com.miekir.common.utils.ToastTool;
 import com.miekir.common.utils.ViewTool;
 import com.miekir.mvp.presenter.InjectPresenter;
 
@@ -150,4 +151,15 @@ public class TabActivity extends BaseBeiActivity implements View.OnClickListener
             alertDialog.show();
         }
     }
+
+    private long mLastBackMillis;
+    @Override
+    public void onBackPressed() {
+        if (System.currentTimeMillis() - mLastBackMillis > 3000) {
+            ToastTool.showShort("再按一次退出");
+            mLastBackMillis = System.currentTimeMillis();
+        } else {
+            super.onBackPressed();
+        }
+    }
 }

+ 2 - 2
app/src/main/java/com/itant/shibei/ui/home/tool/json/JsonActivity.java

@@ -4,7 +4,6 @@ package com.itant.shibei.ui.home.tool.json;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
@@ -15,6 +14,7 @@ import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.tool.SystemTool;
 import com.miekir.common.utils.ToastTool;
+import com.miekir.common.view.AlignTextView;
 import com.miekir.mvp.presenter.InjectPresenter;
 
 public class JsonActivity extends BaseBeiActivity implements View.OnClickListener, IJsonView {
@@ -25,7 +25,7 @@ public class JsonActivity extends BaseBeiActivity implements View.OnClickListene
 
     private BeiUser mUser;
 
-    private TextView tv_json_url;
+    private AlignTextView tv_json_url;
     private EditText et_json;
 
     private JsonBean mJsonBean;

+ 2 - 2
app/src/main/java/com/itant/shibei/ui/home/tool/weather/WeatherActivity.java

@@ -4,7 +4,6 @@ package com.itant.shibei.ui.home.tool.weather;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.itant.shibei.BuildConfig;
 import com.itant.shibei.R;
@@ -13,6 +12,7 @@ import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.tool.SystemTool;
 import com.miekir.common.utils.ToastTool;
+import com.miekir.common.view.AlignTextView;
 
 /**
  * 天气界面
@@ -22,7 +22,7 @@ public class WeatherActivity extends BaseBeiActivity implements View.OnClickList
 
     private BeiUser mUser;
 
-    private TextView tv_weather_url;
+    private AlignTextView tv_weather_url;
     @Override
     public int getLayoutID() {
         return R.layout.activity_weather;

+ 2 - 2
app/src/main/java/com/itant/shibei/ui/home/tool/yiji/YijiActivity.java

@@ -4,7 +4,6 @@ package com.itant.shibei.ui.home.tool.yiji;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.itant.shibei.BuildConfig;
 import com.itant.shibei.R;
@@ -13,6 +12,7 @@ import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.tool.SystemTool;
 import com.miekir.common.utils.ToastTool;
+import com.miekir.common.view.AlignTextView;
 
 /**
  * 黄历界面
@@ -22,7 +22,7 @@ public class YijiActivity extends BaseBeiActivity implements View.OnClickListene
 
     private BeiUser mUser;
 
-    private TextView tv_yiji_url;
+    private AlignTextView tv_yiji_url;
 
     @Override
     public int getLayoutID() {

+ 1 - 1
app/src/main/res/layout/activity_json.xml

@@ -38,7 +38,7 @@
                 android:textSize="@dimen/text_sub_title"
                 android:textStyle="bold"/>
 
-            <TextView
+            <com.miekir.common.view.AlignTextView
                 android:id="@+id/tv_json_url"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

+ 1 - 1
app/src/main/res/layout/activity_mine.xml

@@ -12,7 +12,7 @@
     <LinearLayout
         android:id="@+id/ll_user"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/width_min_code"
+        android:layout_height="@dimen/size_image_big"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingStart="@dimen/activity_horizontal_margin"

+ 1 - 1
app/src/main/res/layout/activity_weather.xml

@@ -38,7 +38,7 @@
                 android:textSize="@dimen/text_normal_p"
                 android:textStyle="bold"/>
 
-            <TextView
+            <com.miekir.common.view.AlignTextView
                 android:id="@+id/tv_weather_url"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

+ 1 - 1
app/src/main/res/layout/activity_yiji.xml

@@ -37,7 +37,7 @@
                 android:textSize="@dimen/text_normal_p"
                 android:textStyle="bold"/>
 
-            <TextView
+            <com.miekir.common.view.AlignTextView
                 android:id="@+id/tv_yiji_url"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

+ 1 - 1
app/src/main/res/layout/view_toolbar.xml

@@ -11,7 +11,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/height_tool_bar"
+            android:layout_height="?attr/actionBarSize"
             android:background="@color/white"
             app:titleTextAppearance="@style/Toolbar.TitleText" />