diff --git a/.gitignore b/.gitignore
index 26f9544..9a7509b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
/import-summary.txt
.gradle
/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea/
.DS_Store
-/build
+/build/*
+/app/build/
+/.idea/*
+
+
+/.gradle/
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 08357f6..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-org.thecongers.mtpms
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 217af47..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index fe865d3..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 856a07f..b6a7bc6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,28 @@
-
-
-
-
-
+
+
+
+
+
@@ -16,96 +34,26 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- localhost
- 5050
-
+
+
+
+
+
+
+
+ 1.8
+
+
+
+
+
+
-
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0d14bb3..40377b3 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,5 +6,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
-
-
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 9be5538..495617f 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,9 +12,9 @@
-
-
-
+
+ generateDebugSources
+
@@ -23,7 +23,7 @@
-
+
@@ -32,14 +32,16 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -47,6 +49,15 @@
+
+
+
+
+
+
+
+
+
@@ -54,6 +65,7 @@
+
@@ -61,34 +73,46 @@
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a64aada..3f2ea71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,6 @@ repositories{
}
dependencies {
- compile 'com.android.support:appcompat-v7:+'
+ compile 'com.android.support:appcompat-v7:21.+'
compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:+'
}
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..e135e24
--- /dev/null
+++ b/app/src/main/res/values-zh/strings.xml
@@ -0,0 +1,80 @@
+
+
+ Motorcycle TPMS
+ mTPMS
+
+ 设置
+ 重置传感器标识
+ 关于
+ 退出
+
+ 界面
+ 温度单位
+
+ - 华氏
+ - 摄氏
+
+
+ - 0
+ - 1
+
+ 压力单位
+
+ - psi(磅/平方英寸)
+ - KPa(千帕)
+ - Kg-f(公斤力/平方厘米)
+ - Bar(巴)
+
+
+ - 0
+ - 1
+ - 2
+ - 3
+
+ 夜间模式
+ 启用夜间模式, 关闭自动切换
+ 自动切换
+ 启用自动切换夜间模式(设备需具备感光元件)
+ 自动切换延迟
+ 设置自动切换延迟时间,单位为秒
+ 通知设置
+ 音效选择
+ 通知音效选择
+ 音效
+ 启用音效
+ 震动
+ 启用震动
+ LED
+ 启用 LED
+ 前轮设置
+ 后轮设置
+ 轮圈传感器标识
+ 选择传感器
+ 胎压不足
+ 低压提醒最小值
+ 胎压过高
+ 高压提醒最小值
+ 高级设置
+ 数据日志
+ 将数据日志输出至 /sdcard/mTPMS/目录
+
+ 安装说明
+ 首先需要将你的手机与 iTPMSystem(胎压监测系统)进行配对.\n\n传感器会在连接成功后的大概一分钟内显示出来.\n\n你就可以建立轮胎与传感器的标识映射.
+
+ 好的
+ 关于
+ 好的
+
+ 发现新传感器:
+ 没有找到已匹配的iTPM系统
+ 连接到:
+
+ 前轮胎压不足!
+ 前轮胎压过高!
+ 后轮胎压不住!
+ 后轮胎压过高!
+ 前后轮胎压不足!
+ 前后轮胎压过高!
+ 前轮胎压过低,后轮胎压过高!
+ 前轮胎压过高,后轮胎压过低!
+
diff --git a/build.gradle b/build.gradle
index e26cdee..305dc05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:2.2.0'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..3b3ae8e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Oct 14 10:36:20 CST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/org.thecongers.mtpms.iml b/org.thecongers.mtpms.iml
index 0bb6048..c034d3e 100644
--- a/org.thecongers.mtpms.iml
+++ b/org.thecongers.mtpms.iml
@@ -1,13 +1,14 @@
-
+
+
-
+
@@ -15,5 +16,4 @@
-
-
+
\ No newline at end of file