diff --git a/app/build.gradle b/app/build.gradle index 2d838ee..8d51b88 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.zyc.zcontrol" minSdkVersion 19 targetSdkVersion 28 - versionCode 13 - versionName "0.10.1" + versionCode 14 + versionName "0.10.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/release/app-release.apk b/app/release/app-release.apk index ba0c6a8..70d5539 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/java/com/zyc/zcontrol/MainActivity.java b/app/src/main/java/com/zyc/zcontrol/MainActivity.java index abc24c0..d667e8f 100644 --- a/app/src/main/java/com/zyc/zcontrol/MainActivity.java +++ b/app/src/main/java/com/zyc/zcontrol/MainActivity.java @@ -126,7 +126,7 @@ public void handleMessage(Message msg) { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); mSharedPreferences = getSharedPreferences("Setting", 0); @@ -408,7 +408,7 @@ public void onResume() { @Override public void onBackPressed() { - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + DrawerLayout drawer = findViewById(R.id.drawer_layout); if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); } else { diff --git a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java index adf4a90..c3c5f4d 100644 --- a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java +++ b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java @@ -446,7 +446,7 @@ public void onClick(DialogInterface dialog, int which) { @Override public void onServiceConnected(ComponentName componentName, IBinder service) { mConnectService = ((ConnectService.LocalBinder) service).getService(); - Send("{\"mac\":\"" + device_mac + "\",\"version\":null}"); + Send("{\"mac\":\"" + device_mac + "\",\"version\":null,\"lock\":null}"); } @Override diff --git a/app/src/main/res/layout/popupwindow_dc1_set_time_count_down.xml b/app/src/main/res/layout/popupwindow_dc1_set_time_count_down.xml index e67006f..edb4b12 100644 --- a/app/src/main/res/layout/popupwindow_dc1_set_time_count_down.xml +++ b/app/src/main/res/layout/popupwindow_dc1_set_time_count_down.xml @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@+id/hour_picker" - app:layout_constraintEnd_toEndOf="@+id/tbtn_week_7" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/textView4" app:layout_constraintTop_toTopOf="@+id/hour_picker" @@ -117,7 +117,7 @@ app:layout_constraintEnd_toEndOf="@+id/on_picker" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="@+id/hour_picker" - app:layout_constraintTop_toBottomOf="@+id/tbtn_week_1" + app:layout_constraintTop_toBottomOf="@+id/hour_picker" app:layout_constraintVertical_bias="0.5" /> diff --git a/app/src/main/res/layout/popupwindow_tc1_set_time_count_down.xml b/app/src/main/res/layout/popupwindow_tc1_set_time_count_down.xml index e67006f..edb4b12 100644 --- a/app/src/main/res/layout/popupwindow_tc1_set_time_count_down.xml +++ b/app/src/main/res/layout/popupwindow_tc1_set_time_count_down.xml @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@+id/hour_picker" - app:layout_constraintEnd_toEndOf="@+id/tbtn_week_7" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/textView4" app:layout_constraintTop_toTopOf="@+id/hour_picker" @@ -117,7 +117,7 @@ app:layout_constraintEnd_toEndOf="@+id/on_picker" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="@+id/hour_picker" - app:layout_constraintTop_toBottomOf="@+id/tbtn_week_1" + app:layout_constraintTop_toBottomOf="@+id/hour_picker" app:layout_constraintVertical_bias="0.5" />