You can not select more than 25 topics
			Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
		
		
		
		
		
			
	
		
			
				
					
						 
						陈福行
					
				
				
						fe8e9a81bb
						
				
				
				Merge remote-tracking branch 'origin/master'
				
					
					
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/MainActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/ShowBleActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/config/BleDeviceConfig.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/airdetector_test/AirDetectorActivityTest.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/broadcast_height/BroadcastHeightActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/meat_probe/MeatProbeActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/meat_probe_charger/MeatProbeChargerActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/weight_scale/WeightScaleActivity.java
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/values/colors.xml 
				
			    
			 | 
			2 vuotta sitten | 
		
	
	
		
		
			
			
			
				
					| 
						
							
								
								
								
								
									
										app
									
								
							
						
					 | 
				
				
					
						Merge remote-tracking branch 'origin/master'
					
				 | 
				2 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								
								
								
									
										gradle/wrapper
									
								
							
						
					 | 
				
				
					
						适配android12
					
				 | 
				2 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								.gitignore
							
						
					 | 
				
				
					
						First submission
					
				 | 
				5 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								README.md
							
						
					 | 
				
				
					
						Update documentation
					
				 | 
				5 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								build.gradle
							
						
					 | 
				
				
					
						适配android12
					
				 | 
				2 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								git
							
						
					 | 
				
				
					
						First submission
					
				 | 
				5 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								gradle.properties
							
						
					 | 
				
				
					
						First submission
					
				 | 
				5 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								gradlew
							
						
					 | 
				
				
					
						First submission
					
				 | 
				5 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								gradlew.bat
							
						
					 | 
				
				
					
						First submission
					
				 | 
				5 vuotta sitten | 
			
		
			
			
			
				
					| 
						
							
								
								settings.gradle
							
						
					 | 
				
				
					
						First submission
					
				 | 
				5 vuotta sitten |