| 
					
				 | 
			
			
				@@ -1,20 +1,21 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package jx.cn.escort.ui.activity 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import android.content.Context 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import android.os.Bundle 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import android.view.LayoutInflater 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import android.view.MenuItem 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import android.view.View 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import android.view.ViewGroup 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import android.widget.Toast 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import androidx.appcompat.app.AppCompatActivity 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import androidx.constraintlayout.widget.ConstraintLayout 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import androidx.fragment.app.Fragment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import androidx.fragment.app.FragmentContainerView 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import androidx.fragment.app.FragmentTransaction 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import androidx.navigation.Navigation 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.google.android.material.navigation.NavigationView 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.google.android.material.bottomnavigation.BottomNavigationView 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.google.android.material.navigation.NavigationBarView 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.xuexiang.xui.widget.actionbar.TitleBar 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import jx.cn.escort.R 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import jx.cn.escort.ui.fragment.BaseNavFragment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 class MainActivity : AppCompatActivity() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     override fun onCreate(savedInstanceState: Bundle?) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -32,24 +33,33 @@ class MainActivity : AppCompatActivity() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       var layoutInflater=baseContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        var bottomNav= findViewById<NavigationView>(R.id.bottom_nav) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        var navContent=findViewById<ViewGroup>(R.id.nav_content) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        bottomNav.setNavigationItemSelectedListener(object:NavigationView.OnNavigationItemSelectedListener{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        var bottomNav= findViewById<BottomNavigationView>(R.id.bottom_nav) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        bottomNav.setOnItemSelectedListener(object: NavigationBarView.OnItemSelectedListener { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             override fun onNavigationItemSelected(item: MenuItem): Boolean { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                var id=item.itemId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 when(id){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                   R.id.index-> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        val  fragment=  layoutInflater.inflate(R.layout.fragment_index,navContent)   as  Fragment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                       switchFragment(fragment) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                   jx.cn.escort.R.id.index-> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                       var  fragmentContainerView=findViewById<FragmentContainerView>(R.id.nav_content) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                       var density=resources.displayMetrics.density 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                       fragmentContainerView.setPadding( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                           fragmentContainerView.paddingLeft, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                           (62*density+0.5f).toInt(),  // 设置paddingTop为50dp 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                           fragmentContainerView.paddingRight, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                           fragmentContainerView.paddingBottom 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                       ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                       fragmentContainerView.requestLayout() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                       switchFragment(BaseNavFragment(R.layout.fragment_index, context = baseContext)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     R.id.tasks->{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        val  fragment=  layoutInflater.inflate(R.layout.fragment_tasks,navContent)   as  Fragment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        switchFragment(fragment) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        switchFragment(BaseNavFragment(R.layout.fragment_tasks, context = baseContext)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     R.id.mine->{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        val  fragment=  layoutInflater.inflate(R.layout.fragment_mine,navContent)   as  Fragment 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        switchFragment(fragment) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        switchFragment(BaseNavFragment(R.layout.fragment_mine,context = baseContext)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -57,9 +67,13 @@ class MainActivity : AppCompatActivity() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -69,7 +83,10 @@ class MainActivity : AppCompatActivity() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         var  transaction: FragmentTransaction =fm.beginTransaction() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         transaction.replace(R.id.nav_content,fragment) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          transaction.commitAllowingStateLoss() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |