|
@@ -234,6 +234,15 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
|
234
|
234
|
}
|
235
|
235
|
Runnable start = new RunnableImplements(this);
|
236
|
236
|
Thread T = new Thread(start);
|
|
237
|
+
|
|
238
|
+ public byte getInfo_rf_status() {
|
|
239
|
+ return info_rf_status;
|
|
240
|
+ }
|
|
241
|
+
|
|
242
|
+ public void setInfo_rf_status(byte info_rf_status) {
|
|
243
|
+ this.info_rf_status = info_rf_status;
|
|
244
|
+ }
|
|
245
|
+
|
237
|
246
|
public void onClick(View view) {
|
238
|
247
|
switch(view.getId()) {
|
239
|
248
|
case R.id.button_port:
|
|
@@ -275,7 +284,8 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
|
275
|
284
|
listview_info.setVisibility(view.INVISIBLE);
|
276
|
285
|
listview_info_set.setVisibility(view.INVISIBLE);
|
277
|
286
|
}
|
278
|
|
- info_rf_status = not_setting;
|
|
287
|
+ setInfo_rf_status(not_setting);
|
|
288
|
+ //info_rf_status = not_setting;
|
279
|
289
|
}
|
280
|
290
|
else {
|
281
|
291
|
button_control.setText("Status");
|
|
@@ -286,13 +296,15 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
|
286
|
296
|
listview_info_set.setVisibility(view.VISIBLE);
|
287
|
297
|
listview_rf.setVisibility(view.INVISIBLE);
|
288
|
298
|
listview_rf_set.setVisibility(view.INVISIBLE);
|
289
|
|
- info_rf_status = info_set;
|
|
299
|
+ //info_rf_status = info_set;
|
|
300
|
+ setInfo_rf_status(info_set);
|
290
|
301
|
}else{
|
291
|
302
|
listview_rf.setVisibility(view.INVISIBLE);
|
292
|
303
|
listview_rf_set.setVisibility(view.VISIBLE);
|
293
|
304
|
listview_info.setVisibility(view.INVISIBLE);
|
294
|
305
|
listview_info_set.setVisibility(view.INVISIBLE);
|
295
|
|
- info_rf_status = rf_set;
|
|
306
|
+ setInfo_rf_status(rf_set);
|
|
307
|
+ //info_rf_status = rf_set;
|
296
|
308
|
}
|
297
|
309
|
}
|
298
|
310
|
break;
|
|
@@ -301,7 +313,18 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
|
301
|
313
|
if(isSend_Status() == true){
|
302
|
314
|
isSend_Set(false);
|
303
|
315
|
}else{
|
304
|
|
- Tx_buffers[4] = (byte) adapter_infor.getItem(4);
|
|
316
|
+ if(getInfo_rf_status() == rf_set){
|
|
317
|
+ for (int i = 0; i < 10; i++) {
|
|
318
|
+ TxdataGet(adapter_rf_set, i);
|
|
319
|
+ }
|
|
320
|
+ }else {
|
|
321
|
+ for (int i = 3; i < 14; i++) {
|
|
322
|
+ TxdataGet(adapter_info_set, i);
|
|
323
|
+ }
|
|
324
|
+ }
|
|
325
|
+
|
|
326
|
+ // Tx_buffers[3] = (byte)Integer.parseInt(item.getVal());
|
|
327
|
+ // Tx_buffers[4] = (byte) adapter_infor.getItem(4);
|
305
|
328
|
isSend_Set(true);
|
306
|
329
|
}
|
307
|
330
|
|
|
@@ -317,7 +340,8 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
|
317
|
340
|
listview_rf.setVisibility(view.INVISIBLE);
|
318
|
341
|
listview_rf_set.setVisibility(view.INVISIBLE);
|
319
|
342
|
listview_info_set.setVisibility(view.VISIBLE);
|
320
|
|
- info_rf_status = info_set;
|
|
343
|
+ setInfo_rf_status(info_set);
|
|
344
|
+ // info_rf_status = info_set;
|
321
|
345
|
}
|
322
|
346
|
break;
|
323
|
347
|
case R.id.imageButton_rf:
|
|
@@ -333,12 +357,57 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
|
333
|
357
|
listview_info_set.setVisibility(view.INVISIBLE);
|
334
|
358
|
listview_rf_set.setVisibility(view.VISIBLE);
|
335
|
359
|
listview_rf.setVisibility(view.INVISIBLE);
|
336
|
|
- info_rf_status = rf_set;
|
|
360
|
+ setInfo_rf_status(rf_set);
|
|
361
|
+ // info_rf_status = rf_set;
|
337
|
362
|
}
|
338
|
363
|
break;
|
339
|
364
|
}
|
340
|
365
|
}
|
|
366
|
+ private void TxdataGet(ListViewAdapter Adapter,int position){
|
|
367
|
+ String Tmpstr,Tmpstr2;
|
|
368
|
+ if(Adapter == adapter_info_set) {
|
|
369
|
+ item = (ListViewItem) adapter_info_set.getItem(position);
|
|
370
|
+ Tmpstr = item.getVal();
|
|
371
|
+ if(position > 8){
|
|
372
|
+ if(Tmpstr == "ON" || Tmpstr == "MANUAL"){
|
|
373
|
+ Tmpstr = "1";
|
|
374
|
+ }else{
|
|
375
|
+ Tmpstr = "0";
|
|
376
|
+ }
|
|
377
|
+
|
|
378
|
+ }
|
|
379
|
+ Tx_buffers[position] = (byte) Integer.parseInt(Tmpstr);
|
|
380
|
+ }else{
|
|
381
|
+ item = (ListViewItem) adapter_rf_set.getItem(position);
|
|
382
|
+ Tmpstr = item.getVal();
|
|
383
|
+ Tmpstr2 = item.getVal2();
|
|
384
|
+ if(position == 6 ) {
|
|
385
|
+ if (Tmpstr == "ON") {
|
|
386
|
+ Tmpstr = "1";
|
|
387
|
+ } else {
|
|
388
|
+ Tmpstr = "0";
|
|
389
|
+ }
|
|
390
|
+ Tx_buffers[26] = (byte) Integer.parseInt(Tmpstr);
|
|
391
|
+ }else if(position == 7){
|
|
392
|
+ if (Tmpstr == "ON") {
|
|
393
|
+ Tmpstr = "1";
|
|
394
|
+ } else {
|
|
395
|
+ Tmpstr = "0";
|
|
396
|
+ }
|
|
397
|
+ Tx_buffers[27] = (byte) Integer.parseInt(Tmpstr);
|
|
398
|
+ }
|
|
399
|
+ else if (position < 6){
|
|
400
|
+ Tx_buffers[(position * 2)+ 14 ] = (byte) Integer.parseInt(Tmpstr);
|
|
401
|
+ Tx_buffers[(position * 2)+ 15 ] = (byte) Integer.parseInt(Tmpstr2);
|
|
402
|
+ }else{
|
|
403
|
+ if(position == 8)
|
|
404
|
+ Tx_buffers[28] = (byte) Integer.parseInt(Tmpstr);
|
|
405
|
+ else if(position == 9)
|
|
406
|
+ Tx_buffers[29] = (byte) Integer.parseInt(Tmpstr);
|
|
407
|
+ }
|
341
|
408
|
|
|
409
|
+ }
|
|
410
|
+ }
|
342
|
411
|
receive Recv_Context = null;
|
343
|
412
|
public void RecvContext_set(receive context){
|
344
|
413
|
this.Recv_Context =context;
|
|
@@ -366,8 +435,8 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
|
366
|
435
|
Prev_RecvStr = str;
|
367
|
436
|
// adapter_rf.notifyDataSetChanged();
|
368
|
437
|
// adapter_rf_set.notifyDataSetChanged();
|
369
|
|
- if(info_rf_status != not_setting) {
|
370
|
|
- if (info_rf_status == info_set) {
|
|
438
|
+ if(getInfo_rf_status() != not_setting) {
|
|
439
|
+ if (getInfo_rf_status() == info_set) {
|
371
|
440
|
info_data_set();
|
372
|
441
|
} else {
|
373
|
442
|
rf_data_set();
|