| 
					
				 | 
			
			
				@@ -85,7 +85,9 @@ public class TakeSuccessFragment extends Fragment { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (null != timer) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 timer.cancel(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            timer2.cancel(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (null != timer2) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                timer2.cancel(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             NavUtils.navigate(this, R.id.action_takeSuccessFragment_to_takeCodeFragment); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -110,6 +112,7 @@ public class TakeSuccessFragment extends Fragment { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Bundle bundle = activity.getBundleMap().get(TakeCodeFragment.class.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             binding.openCabinetHintNo.setText(bundle.getString("takeCabinetNo")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 倒计时 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            s = StringUtils.isNullOrEmpty(s) ? "15" : s; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int i = Integer.parseInt(s); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             timer2 = new CountDownTimer(i * 1000, 1000) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 @Override 
			 |