From 1ffa53c909d62faaad515e3737be701cc91a5fb1 Mon Sep 17 00:00:00 2001 From: TrillGates Date: Wed, 27 Oct 2021 20:53:21 +0800 Subject: [PATCH] =?utf8?q?=E5=85=A8=E5=B1=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/release/output-metadata.json | 6 +++--- app/src/main/java/com/ic/temperature/MainActivity.kt | 5 ++--- .../com/ic/temperature/repository/TemperatureRepository.kt | 4 +++- app/src/main/res/values/themes.xml | 1 + app/version_code.properties | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 801905a..2d4519f 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,9 +10,9 @@ { "type": "SINGLE", "filters": [], - "versionCode": 24, - "versionName": "202110261726", - "outputFile": "ICL02Temperature_V24_202110261726_release.apk" + "versionCode": 26, + "versionName": "202110272051", + "outputFile": "ICL02Temperature_V26_202110272051_release.apk" } ] } \ No newline at end of file diff --git a/app/src/main/java/com/ic/temperature/MainActivity.kt b/app/src/main/java/com/ic/temperature/MainActivity.kt index ab7ce3b..0226d79 100644 --- a/app/src/main/java/com/ic/temperature/MainActivity.kt +++ b/app/src/main/java/com/ic/temperature/MainActivity.kt @@ -189,12 +189,11 @@ class MainActivity : AppCompatActivity() { } DIALOG_STATE_WAITING -> { - showDialog() + //showDialog() } DIALOG_STATE_GETTING -> { - Toast.makeText(that, R.string.background_wait, Toast.LENGTH_SHORT) + Toast.makeText(that, R.string.background_test, Toast.LENGTH_SHORT) .show() - } } } diff --git a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt index e72dd56..8b15f50 100644 --- a/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt +++ b/app/src/main/java/com/ic/temperature/repository/TemperatureRepository.kt @@ -43,8 +43,10 @@ class TemperatureRepository(context: Context) { } this.remoteDataCallback = callback IcLog.i(TAG, "bind remote service..") + val intent = Intent(Constants.ACTION_TEMPERATURE) + intent.setPackage("com.ic.work") context.bindService( - Intent(Constants.ACTION_TEMPERATURE), + intent, mRemoteConnection, Context.BIND_AUTO_CREATE ) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 7014b45..2144a82 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -4,6 +4,7 @@ @color/colorPrimary @color/colorPrimaryDark + true @color/colorAccent @color/colorMainBg diff --git a/app/version_code.properties b/app/version_code.properties index c6042a5..7036681 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Oct 26 17:26:18 CST 2021 -VERSION_CODE=24 +#Wed Oct 27 20:51:10 CST 2021 +VERSION_CODE=26 -- 2.17.1