@@ -1,6 +1,6 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<project version="4"> | |||
<component name="CompilerConfiguration"> | |||
<bytecodeTargetLevel target="1.8" /> | |||
<bytecodeTargetLevel target="11" /> | |||
</component> | |||
</project> |
@@ -4,17 +4,16 @@ | |||
<component name="GradleSettings"> | |||
<option name="linkedExternalProjectsSettings"> | |||
<GradleProjectSettings> | |||
<option name="testRunner" value="PLATFORM" /> | |||
<option name="testRunner" value="GRADLE" /> | |||
<option name="distributionType" value="DEFAULT_WRAPPED" /> | |||
<option name="externalProjectPath" value="$PROJECT_DIR$" /> | |||
<option name="gradleJvm" value="Embedded JDK" /> | |||
<option name="modules"> | |||
<set> | |||
<option value="$PROJECT_DIR$" /> | |||
<option value="$PROJECT_DIR$/app" /> | |||
</set> | |||
</option> | |||
<option name="resolveModulePerSourceSet" value="false" /> | |||
<option name="useQualifiedModuleNames" value="true" /> | |||
</GradleProjectSettings> | |||
</option> | |||
</component> |
@@ -5,7 +5,7 @@ | |||
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> | |||
</configurations> | |||
</component> | |||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |||
<output url="file://$PROJECT_DIR$/build/classes" /> | |||
</component> | |||
<component name="ProjectType"> |
@@ -1,12 +0,0 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<project version="4"> | |||
<component name="RunConfigurationProducerService"> | |||
<option name="ignoredProducers"> | |||
<set> | |||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> | |||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> | |||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> | |||
</set> | |||
</option> | |||
</component> | |||
</project> |
@@ -16,7 +16,6 @@ import android.widget.LinearLayout; | |||
import android.widget.ListView; | |||
import android.widget.TextView; | |||
import com.pingwang.tpmslibrary.TpmsScan; | |||
import java.util.ArrayList; | |||
import java.util.EnumMap; | |||
@@ -31,6 +30,8 @@ import aicare.net.cn.sdk.tmpsrepositoryandroid.utils.SPUtils; | |||
import aicare.net.cn.sdk.tmpsrepositoryandroid.views.SetIdDialog; | |||
import androidx.appcompat.app.AppCompatActivity; | |||
import com.pingwang.tpmslibrary.TpmsScan; | |||
public class MainActivity extends AppCompatActivity implements View.OnClickListener, TpmsScan.TpmsScanListener, OnIdSetListener { | |||
private Button btn_get_info, btn_clear_log, btn_stop_scan; |
@@ -20,7 +20,7 @@ | |||
android:layout_width="0dp" | |||
android:layout_height="match_parent" | |||
android:layout_weight="1" | |||
android:text="扫描(获取胎压信息)" /> | |||
android:text="Start scan" /> | |||
<Button | |||
@@ -28,14 +28,14 @@ | |||
android:layout_width="0dp" | |||
android:layout_height="match_parent" | |||
android:layout_weight="1" | |||
android:text="清空Log" /> | |||
android:text="Clear Log" /> | |||
<Button | |||
android:id="@+id/btn_stop_scan" | |||
android:layout_width="0dp" | |||
android:layout_height="match_parent" | |||
android:layout_weight="1" | |||
android:text="停止扫描" /> | |||
android:text="Stop scan" /> | |||
</LinearLayout> | |||
<LinearLayout |
@@ -4,10 +4,10 @@ buildscript { | |||
repositories { | |||
google() | |||
jcenter() | |||
} | |||
dependencies { | |||
classpath 'com.android.tools.build:gradle:3.4.0' | |||
classpath 'com.android.tools.build:gradle:4.1.3' | |||
// NOTE: Do not place your application dependencies here; they belong | |||
// in the individual module build.gradle files | |||
@@ -16,9 +16,9 @@ buildscript { | |||
allprojects { | |||
repositories { | |||
maven { url 'https://jitpack.io' } | |||
google() | |||
jcenter() | |||
maven { url 'https://jitpack.io' } | |||
} | |||
} | |||
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME | |||
distributionPath=wrapper/dists | |||
zipStoreBase=GRADLE_USER_HOME | |||
zipStorePath=wrapper/dists | |||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip | |||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip |