From 222de3533cfadea95ca76d8ebba5d832fc19234b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Jun 2018 00:09:26 +0200 Subject: [PATCH] we did things --- .../user/myapp/DisplayMessageActivity.java | 14 ++++++++++---- .../java/com/example/user/myapp/GlobalState.java | 6 +++--- .../com/example/user/myapp/MainActivity.java | 16 ++++++---------- .../com/example/user/myapp/MyIntentService.java | 4 ++++ .../main/res/layout/activity_display_message.xml | 12 ++++++++++++ 5 files changed, 35 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java b/app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java index bf5df51..2a54828 100644 --- a/app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java +++ b/app/src/main/java/com/example/user/myapp/DisplayMessageActivity.java @@ -10,6 +10,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.widget.TextView; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -53,7 +54,7 @@ public class DisplayMessageActivity extends AppCompatActivity { serviceIntent.putExtra("extra.intent.name", "readOnlyCoil"); getApplicationContext().startService(serviceIntent); - handlerCoil.postDelayed(this, 2000); + handlerCoil.postDelayed(this, 10000); } }; @@ -75,7 +76,7 @@ public class DisplayMessageActivity extends AppCompatActivity { TextView textView = findViewById(R.id.textView1); Date currentTime = Calendar.getInstance().getTime(); textView.setText(new Double(Math.random()).toString()); - handlerCoil.postDelayed(this, 1000); + handlerCoil.postDelayed(this, 2000); } }; @@ -99,7 +100,7 @@ public class DisplayMessageActivity extends AppCompatActivity { TextView textView4 = findViewById(R.id.textView4); textView4.setText(new Boolean(booleanArray[3]).toString()); - TextView textView5 = findViewById(R.id.textView5); + /* TextView textView5 = findViewById(R.id.textView5); textView5.setText(new Boolean(booleanArray[4]).toString()); TextView textView6 = findViewById(R.id.textView6); @@ -109,14 +110,19 @@ public class DisplayMessageActivity extends AppCompatActivity { textView7.setText(new Boolean(booleanArray[6]).toString()); TextView textView8 = findViewById(R.id.textView8); - textView8.setText(new Boolean(booleanArray[7]).toString()); + textView8.setText(new Boolean(booleanArray[7]).toString()); */ } }; private BroadcastReceiver inputRegisterMessageReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + Bundle bundle = intent.getExtras(); + ArrayList integers = bundle.getIntegerArrayList("irValues"); + TextView textView9 = findViewById(R.id.textView9); + textView9.setText(integers.get(0).toString()); } }; diff --git a/app/src/main/java/com/example/user/myapp/GlobalState.java b/app/src/main/java/com/example/user/myapp/GlobalState.java index 68c2592..7cc8b01 100644 --- a/app/src/main/java/com/example/user/myapp/GlobalState.java +++ b/app/src/main/java/com/example/user/myapp/GlobalState.java @@ -18,9 +18,9 @@ public class GlobalState extends Application { // public enum InputConfig { - COIL (8192, 8), - INPUT_REGISTER (1, 1), - DISCRETE_INPUT(1, 12); + COIL (8192, 80), + INPUT_REGISTER (0, 2), + DISCRETE_INPUT(0, 12); private int startReference; private int count; diff --git a/app/src/main/java/com/example/user/myapp/MainActivity.java b/app/src/main/java/com/example/user/myapp/MainActivity.java index 09640ca..a53f039 100644 --- a/app/src/main/java/com/example/user/myapp/MainActivity.java +++ b/app/src/main/java/com/example/user/myapp/MainActivity.java @@ -18,16 +18,12 @@ public class MainActivity extends AppCompatActivity { /** Called when the user taps the Send button */ public void sendMessage(View view) { EditText editText1 = (EditText) findViewById(R.id.ipAddress); - String ipAddress = editText1.getText().toString(); + // String ipAddress = editText1.getText().toString(); + String ipAddress = "10.0.0.60"; + int port = 502; EditText editText2 = (EditText) findViewById(R.id.port); - int port = Integer.parseInt(editText2.getText().toString()); - - EditText editText3 = (EditText) findViewById(R.id.ref); - int ref = Integer.parseInt(editText3.getText().toString()); - - EditText editText4 = (EditText) findViewById(R.id.count); - int count = Integer.parseInt(editText4.getText().toString()); + // int port = Integer.parseInt(editText2.getText().toString()); GlobalState state = (GlobalState) getApplicationContext(); state.setIpAddress(ipAddress); @@ -44,7 +40,7 @@ public class MainActivity extends AppCompatActivity { coilServiceIntent.putExtra("extra.intent.name", "readOnlyCoil"); this.startService(coilServiceIntent); - Intent discretInputserviceIntent = new Intent(this, MyIntentService.class); + /* Intent discretInputserviceIntent = new Intent(this, MyIntentService.class); discretInputserviceIntent.setAction("read.discrete.input"); discretInputserviceIntent.putExtra("extra.ip.address", ipAddress); discretInputserviceIntent.putExtra("extra.ip.port", port); @@ -60,7 +56,7 @@ public class MainActivity extends AppCompatActivity { inputRegisterServiceIntent.putExtra("extra.ref", GlobalState.InputConfig.INPUT_REGISTER.getStartReference()); inputRegisterServiceIntent.putExtra("extra.count", GlobalState.InputConfig.INPUT_REGISTER.getCount()); inputRegisterServiceIntent.putExtra("extra.intent.name", "readOnlyInputRegister"); - this.startService(inputRegisterServiceIntent); + this.startService(inputRegisterServiceIntent); */ Intent nextIntent = new Intent(this, DisplayMessageActivity.class); this.startActivity(nextIntent); diff --git a/app/src/main/java/com/example/user/myapp/MyIntentService.java b/app/src/main/java/com/example/user/myapp/MyIntentService.java index dacaab9..a967868 100644 --- a/app/src/main/java/com/example/user/myapp/MyIntentService.java +++ b/app/src/main/java/com/example/user/myapp/MyIntentService.java @@ -71,6 +71,7 @@ public class MyIntentService extends IntentService { List listBooleanBit = new ArrayList<>(); for (int i = 0; i < count; i++) { listBooleanBit.add(bv.getBit(i)); + System.out.println("input discrete values : "+i+" - "+bv.getBit(i)); } sendBooleanListToActivity(listBooleanBit, intentReceiveName); master.disconnect(); @@ -87,6 +88,7 @@ public class MyIntentService extends IntentService { BitVector bv = master.readCoils(ref,count); List listBooleanBit = new ArrayList<>(); for (int i = 0; i < count; i++) { + System.out.println("coil values : "+i+" - "+bv.getBit(i)); listBooleanBit.add(bv.getBit(i)); } sendBooleanListToActivity(listBooleanBit, intentReceiveName); @@ -104,9 +106,11 @@ public class MyIntentService extends IntentService { InputRegister [] inputRegisters = master.readInputRegisters(ref, count); ArrayList listIntegerInputRegister = new ArrayList<>(); for (InputRegister ir : inputRegisters) { + System.out.println("ir values : "+Math.random()+" - "+ir.getValue()); listIntegerInputRegister.add(ir.getValue()); } sendIntegerListToActivity (listIntegerInputRegister, intentReceiveName); + master.disconnect(); } catch (Exception e) { System.out.println("Exception in reading input register " + e); } diff --git a/app/src/main/res/layout/activity_display_message.xml b/app/src/main/res/layout/activity_display_message.xml index 4338afd..408d105 100644 --- a/app/src/main/res/layout/activity_display_message.xml +++ b/app/src/main/res/layout/activity_display_message.xml @@ -6,6 +6,18 @@ android:layout_height="match_parent" tools:context=".DisplayMessageActivity"> + +