恢复隐藏内容

app/src/main/java/com/mints/street/main/MainActivity.kt

@@ -47,21 +47,21 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         binding.mainBottom.init {
             when (it) {
                 R.id.menu_home -> binding.mainViewpager.setCurrentItem(0, false)
-//                R.id.menu_square -> binding.mainViewpager.setCurrentItem(1, false)
+                R.id.menu_square -> binding.mainViewpager.setCurrentItem(1, false)
                 R.id.menu_my -> {
                     binding.mainViewpager.setCurrentItem(2, false)
 //                     stopAnim()
                 }
             }
         }
-//        //加载本地GIF动图
-//        ImageLoader.ImageBuilder.with(this)
-//                .setDrawable(R.mipmap.ic_earth_map)
-//                .setTargetView(binding.ivTakephoto).start()
+        //加载本地GIF动图
+        ImageLoader.ImageBuilder.with(this)
+                .setDrawable(R.mipmap.ic_earth_map)
+                .setTargetView(binding.ivTakephoto).start()
 
         binding.mainBottom.interceptLongClick(
                 R.id.menu_home,
-//                R.id.menu_square,
+                R.id.menu_square,
                 R.id.menu_my
         )
 
@@ -72,8 +72,8 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
                 .subscribe {
                 }
 
-//        UpdateHelper.processUpdate(this@MainActivity, UpgradeInfo("1","2","3","4",
-//            "5","6","7",false))
+        UpdateHelper.processUpdate(this@MainActivity, UpgradeInfo("1","2","3","4",
+            "5","6","7",false))
 
     }
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
+
     <data>
+
         <variable
             name="viewModel"
             type="com.mints.street.main.MainViewModel" />
     </data>
+
     <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"
         tools:context=".main.MainActivity">
+
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/mainViewpager"
             android:layout_width="match_parent"
@@ -35,7 +39,7 @@
                 app:menu="@menu/menu_navigation" />
         </FrameLayout>
 
-        <!--<FrameLayout
+        <FrameLayout
             android:id="@+id/flTakephoto"
             android:layout_width="68dp"
             android:layout_height="68dp"
@@ -50,8 +54,7 @@
                 android:layout_height="60dp"
                 android:layout_gravity="center"
                 android:scaleType="fitXY" />
-        </FrameLayout>-->
-
+        </FrameLayout>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

library_base/src/main/res/menu/menu_navigation.xml

@@ -7,10 +7,10 @@
         android:icon="@drawable/menu_main"
         android:title="@string/bottom_name_home" />
 
-<!--    <item-->
-<!--        android:id="@+id/menu_square"-->
-<!--        android:icon="@drawable/menu_square"-->
-<!--        tools:ignore="MenuTitle" />-->
+    <item
+        android:id="@+id/menu_square"
+        android:icon="@drawable/menu_square"
+        tools:ignore="MenuTitle" />
 
 
     <item