| 
					
				 | 
			
			
				@@ -18,6 +18,8 @@ import androidx.annotation.NonNull; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import androidx.annotation.Nullable; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import androidx.fragment.app.Fragment; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import androidx.fragment.app.FragmentActivity; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import androidx.navigation.NavBackStackEntry; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import androidx.navigation.NavController; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import androidx.navigation.fragment.NavHostFragment; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.emato.ich.MainActivity; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -36,6 +38,7 @@ import com.emato.ich.utils.BaseUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.emato.ich.utils.ButtonUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.emato.ich.utils.JacksonUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.emato.ich.utils.LoggingUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.emato.ich.utils.NavUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.emato.ich.utils.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.emato.ich.utils.TimeOutUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.emato.ich.utils.ToastUtils; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -206,9 +209,9 @@ public class ChooseCabinetFragment extends Fragment { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 timer.cancel(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (null != exceptionBundle) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                NavHostFragment.findNavController(ChooseCabinetFragment.this).navigate(R.id.action_chooseCabinetFragment_to_exceptionFragment); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                NavUtils.navigate(this, R.id.action_chooseCabinetFragment_to_exceptionFragment); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                NavHostFragment.findNavController(ChooseCabinetFragment.this).navigate(R.id.action_chooseCabinetFragment_to_sendMainFragment); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                NavUtils.navigate(this, R.id.action_chooseCabinetFragment_to_sendMainFragment); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -278,8 +281,7 @@ public class ChooseCabinetFragment extends Fragment { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                         if (null != timer) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                             timer.cancel(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                                        NavHostFragment.findNavController(ChooseCabinetFragment.this) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                                                .navigate(R.id.action_chooseCabinetFragment_to_sendInfoConfirmFragment); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                                        NavUtils.navigate(ChooseCabinetFragment.this, R.id.action_chooseCabinetFragment_to_sendInfoConfirmFragment); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                     } catch (RuntimeException e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                         Log.e(TAG, "onResponse: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                         LoggingUtils.sendErrorLog("业务异常: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -312,8 +314,7 @@ public class ChooseCabinetFragment extends Fragment { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     timer.cancel(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 activity.getBundleMap().put(ChooseCabinetFragment.class.getName(), bundle); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                NavHostFragment.findNavController(ChooseCabinetFragment.this) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        .navigate(R.id.action_chooseCabinetFragment_to_inputInfoFragment, bundle); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                NavUtils.navigate(this, R.id.action_chooseCabinetFragment_to_inputInfoFragment, bundle); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch (RuntimeException | JsonProcessingException e) { 
			 |