Browse Source

1.添加启动判断token是否为空

王鹏鹏 2 years ago
parent
commit
2ac9674560

+ 8 - 2
app/src/main/java/com/yingyangfly/MainActivity.kt

@@ -7,14 +7,20 @@ import com.yingyangfly.baselib.base.BaseActivity
 import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
+import com.yingyangfly.baselib.utils.User
 import com.yingyangfly.databinding.ActivityMainBinding
 
 class MainActivity : BaseActivity<ActivityMainBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         if (AccountConfig.SINGLE_MODULE.not()) {
-            ARouter.getInstance().build(RouterUrlCommon.login)
-                .navigation()
+            if (User.getToken().isNullOrEmpty()) {
+                ARouter.getInstance().build(RouterUrlCommon.login)
+                    .navigation()
+            } else {
+                ARouter.getInstance().build(RouterUrlCommon.home)
+                    .navigation()
+            }
             finish()
         }
         super.onCreate(savedInstanceState)

+ 39 - 2
workbenches/src/main/res/values/themes.xml → workbenches/src/main/res/values/styles.xml

@@ -1,4 +1,40 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+    <!--自适应高度-->
+    <style name="layout_properties_self_adaption" tools:ignore="ResourceName">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <!--指定宽度和高度-->
+    <style name="layout_properties_specify_width_geight" tools:ignore="ResourceName">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
+    <!--指定宽度-->
+    <style name="layout_properties_specify_width" tools:ignore="ResourceName">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="text_personal_center" tools:ignore="ResourceName">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">@dimen/divider_24px</item>
+        <item name="android:textColor">@color/color_FF333333</item>
+        <item name="layout_constraintHorizontal_weight">1</item>
+    </style>
+
+    <style name="text_bottom_live_broadcast" tools:ignore="ResourceName">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">@dimen/divider_24px</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:layout_marginTop">@dimen/divider_49px</item>
+    </style>
 
     <style name="workbenches_home_text">
         <item name="android:layout_width">wrap_content</item>
@@ -166,4 +202,5 @@
         <item name="android:textColor">@color/coloe_FF9FA5B4</item>
         <item name="android:textSize">@dimen/divider_24px</item>
     </style>
-</resources>
+
+</resources>