diff --git a/app/src/main/java/com/stan220/ztef660control/MainActivity.java b/app/src/main/java/com/stan220/ztef660control/MainActivity.java index 83917a6..a3f2c1d 100644 --- a/app/src/main/java/com/stan220/ztef660control/MainActivity.java +++ b/app/src/main/java/com/stan220/ztef660control/MainActivity.java @@ -61,15 +61,25 @@ public class MainActivity extends AppCompatActivity { } public void onSwitchClick(View view) { - System.out.println("### click: " + view); + System.out.println("### switch clicked: " + view); new DownloadFilesTask(this).execute((SwitchMaterial) view); } + public void onRefreshButtonClick(View view) { + System.out.println("### refresh clicked: " + view); + new DownloadFilesTask(this).execute(); + } + private static class DownloadFilesTask extends AsyncTask> { private MainActivity context; public DownloadFilesTask(MainActivity context) { + context.findViewById(R.id.switchTab).setEnabled(false); + context.findViewById(R.id.switchTv).setEnabled(false); + context.findViewById(R.id.switchAlisa).setEnabled(false); + context.findViewById(R.id.button_refresh).setEnabled(false); + this.context = context; } @@ -77,7 +87,7 @@ public class MainActivity extends AppCompatActivity { protected List doInBackground(SwitchMaterial... switches) { List result = new ArrayList<>(); - Socket s = null; + Socket s; try { s = new Socket(InetAddress.getByName("192.168.100.1"), 23); @@ -175,6 +185,11 @@ public class MainActivity extends AppCompatActivity { switchAlisa.setChecked(false); } + context.findViewById(R.id.switchTab).setEnabled(true); + context.findViewById(R.id.switchTv).setEnabled(true); + context.findViewById(R.id.switchAlisa).setEnabled(true); + context.findViewById(R.id.button_refresh).setEnabled(true); + Toast.makeText(context, "Статус обновлён!", Toast.LENGTH_LONG).show(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c9739a6..bd9f279 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -9,10 +9,19 @@ android:orientation="vertical" android:padding="20dp"> +