Button Set 버튼 추가

app/src/main/java/com/example/repeater/ListViewAdapter.java

@@ -70,7 +70,7 @@ public class ListViewAdapter extends BaseAdapter {
 
             @Override
             public void afterTextChanged(Editable s) {
-                Log.d("getView", s.toString());
+//                Log.d("getView", s.toString());
                 filteredItemList.get(holder.ref).setVal(s.toString());
 
 //                valeditText.setText(s.toString());
@@ -181,7 +181,7 @@ public class ListViewAdapter extends BaseAdapter {
             valbutton.setVisibility(View.VISIBLE);
             //   valbutton.setText(listViewItem.getVal());
         }
-        Log.d("getView", String.valueOf(getItem(position)) + "Position : " + position);
+//        Log.d("getView", String.valueOf(getItem(position)) + "Position : " + position);
 //        descTextView.setBackgroundColor();
         return convertView;
     }
@@ -225,8 +225,10 @@ public class ListViewAdapter extends BaseAdapter {
 }
 
 class ViewHolder {
+    TextView textView;
     EditText editText;
     EditText editText1;
     EditText editText2;
+    Button button;
     int ref;
 }

app/src/main/java/com/example/repeater/MainActivity.java

@@ -27,14 +27,22 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
     PrintWriter out;        //서버에 데이터를 전송한다.
     TextView textView_status;
     String data;
-    public Button button_port,button_control,listView_button;
+    public Button button_port,button_control,listView_button,button_set;
     public Context mContext;
     private Socket socket;  //소켓생성
     public boolean Connection_Status = false;
     public boolean isConnection_Status() {
         return Connection_Status;
     }
+    public boolean Send_Set =false;
+    public boolean isSend_Status() {
+        return Send_Set;
+    }
     public static int DATA_TEST = 0;
+    final private byte info_set = 1;
+    final private byte rf_set = 2;
+    final private byte not_setting = 0;
+    private byte info_rf_status = not_setting;
     public void setConnection_Status(boolean connection_Status) {
         Connection_Status = connection_Status;
         if(Connection_Status){
@@ -45,10 +53,7 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
             button_port.setText("Port Open");
         }
     }
-
     /*** WIFI END***/
-
-
     ImageButton imageButton01;
     ImageButton imageButton02;
     public static ListViewAdapter adapter_infor;
@@ -56,7 +61,6 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
     public static ListViewAdapter adapter_info_set;
     public static ListViewAdapter adapter_rf_set;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
@@ -66,8 +70,8 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
         //        listview_info_set.setOnItemClickListener(this);
 //        listview_rf_set.setOnItemClickListener(this);
         listView_button = findViewById(R.id.listView_button);
-        imageButton01 = findViewById(R.id.imageButton01);
-        imageButton02 = findViewById(R.id.imageButton02);
+        imageButton01 = findViewById(R.id.imageButton_info);
+        imageButton02 = findViewById(R.id.imageButton_rf);
         // Adapter 생성
         adapter_infor = new ListViewAdapter();
         adapter_rf = new ListViewAdapter();
@@ -79,10 +83,11 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
         listview_rf_set = findViewById(R.id.listview_rf_set);
 
 
-        imageButton02 = findViewById(R.id.imageButton02);
+        imageButton02 = findViewById(R.id.imageButton_rf);
 
         button_port = findViewById(R.id.button_port);
         button_control = findViewById(R.id.button_control);
+        button_set = findViewById(R.id.button_set);
         textView_status = findViewById(R.id.textView_status);
         new Thread(new Runnable() {
             @Override
@@ -120,20 +125,20 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
 
         listview = (ListView) findViewById(R.id.listview_info_set);
         listview.setAdapter(adapter_info_set);
-        adapter_info_set.addItem("firm info.", "0.1Ver", "", "READ");
-        adapter_info_set.addItem("FPGA Ver.", "0.2Ver", "", "READ");
-        adapter_info_set.addItem("F/W Ver.", "0.3Ver", "", "READ");
-        adapter_info_set.addItem("Config No.", "", "", "EDIT");
-        adapter_info_set.addItem("Sub Frame No.", "", "", "EDIT");
-        adapter_info_set.addItem("CH1 TTG", "", "", "EDIT");
-        adapter_info_set.addItem("CH1 RTG", "", "", "EDIT");
-        adapter_info_set.addItem("CH2 TTG", "", "", "EDIT");
-        adapter_info_set.addItem("CH2 RTG", "", "", "EDIT");
-        adapter_info_set.addItem("CH1 Polarity", "ON", "", "BUTTON");
-        adapter_info_set.addItem("CH1 Default", "ON", "", "BUTTON");
-        adapter_info_set.addItem("CH2 Polarity", "ON", "", "BUTTON");
-        adapter_info_set.addItem("CH2 Default", "ON", "", "BUTTON");
-        adapter_info_set.addItem("Auto Config", "MANUAL", "", "BUTTON");
+        adapter_info_set.addItem("firm info.", "0.1Ver", "0", "READ");
+        adapter_info_set.addItem("FPGA Ver.", "0.2Ver", "0", "READ");
+        adapter_info_set.addItem("F/W Ver.", "0.3Ver", "0", "READ");
+        adapter_info_set.addItem("Config No.", "0", "0", "EDIT");
+        adapter_info_set.addItem("Sub Frame No.", "0", "0", "EDIT");
+        adapter_info_set.addItem("CH1 TTG", "0", "0", "EDIT");
+        adapter_info_set.addItem("CH1 RTG", "0", "0", "EDIT");
+        adapter_info_set.addItem("CH2 TTG", "0", "0", "EDIT");
+        adapter_info_set.addItem("CH2 RTG", "0", "0", "EDIT");
+        adapter_info_set.addItem("CH1 Polarity", "ON", "0", "BUTTON");
+        adapter_info_set.addItem("CH1 Default", "ON", "0", "BUTTON");
+        adapter_info_set.addItem("CH2 Polarity", "ON", "0", "BUTTON");
+        adapter_info_set.addItem("CH2 Default", "ON", "0", "BUTTON");
+        adapter_info_set.addItem("Auto Config", "MANUAL", "0", "BUTTON");
         // 아이템을 [클릭]시의 이벤트 리스너를 등록
 /*        listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -149,33 +154,33 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
         });*/
         listview = (ListView) findViewById(R.id.listview_rf);
         listview.setAdapter(adapter_rf);
-        adapter_rf.addItem("input ATT", "0 Dbm", "", "READ");
-        adapter_rf.addItem("Output ATT", "0 Dbm", "", "READ");
-        adapter_rf.addItem("Input Offset ATT", "0 Dbm", "", "READ");
-        adapter_rf.addItem("Output Offset ATT", "0 Dbm", "", "READ");
-        adapter_rf.addItem("Gain(dB)", "0 dB", "", "READ");
-        adapter_rf.addItem("ALC Level", "0.6Ver", "", "READ");
-        adapter_rf.addItem("PA Enable", "0.7Ver", "", "READ");
-        adapter_rf.addItem("EX PA Enable", "0.8Ver", "", "READ");
-        adapter_rf.addItem("RF PLL Freq", "0.9Ver", "", "READ");
-        adapter_rf.addItem("AGD Level", "1.1Ver", "", "READ");
-        adapter_rf.addItem("ISO Level", "1.2Ver", "", "READ");
-        adapter_rf.addItem("Temperature", "1.3Ver", "", "READ");
+        adapter_rf.addItem("input ATT", "0 Dbm", "0", "READ");
+        adapter_rf.addItem("Output ATT", "0 Dbm", "0", "READ");
+        adapter_rf.addItem("Input Offset ATT", "0 Dbm", "0", "READ");
+        adapter_rf.addItem("Output Offset ATT", "0 Dbm", "0", "READ");
+        adapter_rf.addItem("Gain(dB)", "0 dB", "0", "READ");
+        adapter_rf.addItem("ALC Level", "0.6Ver", "0", "READ");
+        adapter_rf.addItem("PA Enable", "0.7Ver", "0", "READ");
+        adapter_rf.addItem("EX PA Enable", "0.8Ver", "0", "READ");
+        adapter_rf.addItem("RF PLL Freq", "0.9Ver", "0", "READ");
+        adapter_rf.addItem("AGD Level", "1.1Ver", "0", "READ");
+        adapter_rf.addItem("ISO Level", "1.2Ver", "0", "READ");
+        adapter_rf.addItem("Temperature", "1.3Ver", "0", "READ");
 
         listview = (ListView) findViewById(R.id.listview_rf_set);
         listview.setAdapter(adapter_rf_set);
-        adapter_rf_set.addItem("input ATT", " ", "", "EDIT2");
-        adapter_rf_set.addItem("Output ATT", " ", " ", "EDIT2");
-        adapter_rf_set.addItem("Input Offset ATT", "", " ", "EDIT2");
-        adapter_rf_set.addItem("Output Offset ATT", "", " ", "EDIT2");
-        adapter_rf_set.addItem("Gain(dB)", " ", " ", "EDIT2");
-        adapter_rf_set.addItem("ALC Level", " ", " ", "EDIT2");
-        adapter_rf_set.addItem("PA Enable", "ON", "", "BUTTON");
-        adapter_rf_set.addItem("EX PA Enable", "ON", "", "BUTTON");
-        adapter_rf_set.addItem("RF PLL Freq", "", "", "EDIT");
-        adapter_rf_set.addItem("AGD Level", "", "", "EDIT");
-        adapter_rf_set.addItem("ISO Level", "1.2Ver", "", "READ");
-        adapter_rf_set.addItem("Temperature", "1.3Ver", "", "READ");
+        adapter_rf_set.addItem("input ATT", "0", "0", "EDIT2");
+        adapter_rf_set.addItem("Output ATT", "0", "0", "EDIT2");
+        adapter_rf_set.addItem("Input Offset ATT", "0", "0", "EDIT2");
+        adapter_rf_set.addItem("Output Offset ATT", "0", "0", "EDIT2");
+        adapter_rf_set.addItem("Gain(dB)", "0", "0", "EDIT2");
+        adapter_rf_set.addItem("ALC Level", "0", "0", "EDIT2");
+        adapter_rf_set.addItem("PA Enable", "ON", "0", "BUTTON");
+        adapter_rf_set.addItem("EX PA Enable", "ON", "0", "BUTTON");
+        adapter_rf_set.addItem("RF PLL Freq", "0", "0", "EDIT");
+        adapter_rf_set.addItem("AGD Level", "0", "0", "EDIT");
+        adapter_rf_set.addItem("ISO Level", "1.2Ver", "0", "READ");
+        adapter_rf_set.addItem("Temperature", "1.3Ver", "0", "READ");
         // 아이템을 [클릭]시의 이벤트 리스너를 등록
       /*  listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
@@ -244,6 +249,7 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
                 if(button_control.getText() == "Status") {
                     button_control.setText("Control");
                     textView_status.setText("Status");
+                    button_set.setVisibility(view.INVISIBLE);
                     if(listview_info_set.getVisibility() == view.VISIBLE) {
                         listview_info.setVisibility(view.VISIBLE);
                         listview_info_set.setVisibility(view.INVISIBLE);
@@ -255,39 +261,51 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
                         listview_info.setVisibility(view.INVISIBLE);
                         listview_info_set.setVisibility(view.INVISIBLE);
                     }
+                    info_rf_status = not_setting;
                 }
                 else {
                     button_control.setText("Status");
                     textView_status.setText("Control");
+                    button_set.setVisibility(view.VISIBLE);
                     if(listview_info.getVisibility() == view.VISIBLE) {
                         listview_info.setVisibility(view.INVISIBLE);
                         listview_info_set.setVisibility(view.VISIBLE);
                         listview_rf.setVisibility(view.INVISIBLE);
                         listview_rf_set.setVisibility(view.INVISIBLE);
+                        info_rf_status = info_set;
                     }else{
                         listview_rf.setVisibility(view.INVISIBLE);
                         listview_rf_set.setVisibility(view.VISIBLE);
                         listview_info.setVisibility(view.INVISIBLE);
                         listview_info_set.setVisibility(view.INVISIBLE);
+                        info_rf_status = rf_set;
                     }
                 }
                 break;
-            case R.id.imageButton01:
+            case R.id.button_set:
+                /*Data Send 조건 */
+                if(isSend_Status() == true){
+                    Send_Set = false;
+                }else{
+                    Send_Set = true;
+                }
+
+                break;
+            case R.id.imageButton_info:
                 if(textView_status.getText() != "Control") {
                     listview_info.setVisibility(view.VISIBLE);
                     listview_rf.setVisibility(view.INVISIBLE);
                     listview_info_set.setVisibility(view.INVISIBLE);
-
                     listview_rf_set.setVisibility(view.INVISIBLE);
                 }else{
                     listview_info.setVisibility(view.INVISIBLE);
                     listview_rf.setVisibility(view.INVISIBLE);
                     listview_rf_set.setVisibility(view.INVISIBLE);
-
                     listview_info_set.setVisibility(view.VISIBLE);
+                    info_rf_status = info_set;
                 }
                 break;
-            case R.id.imageButton02:
+            case R.id.imageButton_rf:
 
                 if(textView_status.getText() != "Control") {
                     listview_info.setVisibility(view.INVISIBLE);
@@ -300,6 +318,7 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
                     listview_info_set.setVisibility(view.INVISIBLE);
                     listview_rf_set.setVisibility(view.VISIBLE);
                     listview_rf.setVisibility(view.INVISIBLE);
+                    info_rf_status = rf_set;
                 }
                 break;
         }
@@ -332,11 +351,18 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
                                 Prev_RecvStr = str;
 //                                adapter_rf.notifyDataSetChanged();
 //                                adapter_rf_set.notifyDataSetChanged();
-                                for(int i = 0; i < 12; i++) {
-                                    item = (ListViewItem)adapter_rf_set.getItem(i);
-                                    Log.d("getView", item.getVal() +  "||||||\r\n");
+                                if(info_rf_status != not_setting) {
+                                    if (info_rf_status == info_set) {
+                                        info_data_set();
+                                    } else {
+                                        rf_data_set();
+                                    }
                                 }
-                                Log.d("Mainactivity.class / runOnUiThread", "isConnection_Status : " + isConnection_Status());
+//                                for(int i = 0; i < 12; i++) {
+//                                    item = (ListViewItem)adapter_rf_set.getItem(i);
+//                                    Log.d("getView", item.getVal() +  "||||||\r\n");
+//                                }
+//                                Log.d("Mainactivity.class / runOnUiThread", "isConnection_Status : " + isConnection_Status());
                             }
 //
                         }catch (Exception e){
@@ -347,7 +373,29 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
                 });
             }
         }).start();
+    }
+
+    private String info_data_set(){
+        String temp_str = "be01";
+        for(int i = 3; i < 14; i++) {
+            item = (ListViewItem) adapter_info_set.getItem(i);
+             temp_str += item.getVal();
+        }
+        Log.d("Mainactivity.class / info_data_set", temp_str);
+        return temp_str;
+    }
 
+    private String rf_data_set(){
+        String temp_str = "";
+        for(int i = 0; i < 10; i++) {
+            item = (ListViewItem) adapter_rf_set.getItem(i);
+            temp_str += item.getVal();
+            if(i < 6) {
+                temp_str += item.getVal2();
+            }
+        }
+        Log.d("Mainactivity.class / rf_data_set", temp_str);
+        return temp_str;
     }
 
     @Override

app/src/main/java/com/example/repeater/send.java

@@ -36,7 +36,7 @@ public class send extends TimerTask {
 
     }
     //byte[] data = {"abcdefghijklmnopqrxtuvwxyz"};
-    String data = "abcdefghijklmnopqrxtuvwxyz";
+    String data = "BLUECELL";
     byte[] buffers = data.getBytes();
 
     @Override

app/src/main/res/layout/activity_list_view_item.xml

@@ -36,7 +36,9 @@
                                     android:layout_weight="2"
                                     android:ems="10"
                                     android:inputType="number"
-                                    android:text="Name"
+                                    android:textAlignment="center"
+                                    android:maxLength="2"
+                                    android:text="0"
                                     />
                                 <Button
                                     android:id="@+id/listView_button"
@@ -59,7 +61,9 @@
                                             android:layout_weight="1"
                                             android:ems="10"
                                             android:inputType="number"
-                                            android:text="Name" />
+                                            android:maxLength="2"
+                                            android:textAlignment="center"
+                                            android:text="0" />
 
                                         <EditText
                                             android:id="@+id/editText2"
@@ -68,7 +72,9 @@
                                             android:layout_weight="1"
                                             android:ems="10"
                                             android:inputType="number"
-                                            android:text="Name" />
+                                            android:textAlignment="center"
+                                            android:maxLength="2"
+                                            android:text="0" />
                                 </LinearLayout>
 
                         </FrameLayout>

app/src/main/res/layout/activity_main.xml

@@ -42,12 +42,21 @@
         android:onClick="onClick" />
         <TextView
             android:id="@+id/textView_status"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="30dp"
             android:layout_marginTop="20dp"
             android:text="Status"
             android:textSize="46sp" />
+        <Button
+            android:id="@+id/button_set"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginBottom="10dp"
+            android:text="set"
+            android:visibility="invisible"
+            android:onClick="onClick" />
     </LinearLayout>
     <TextView
         android:id="@+id/textView"
@@ -94,7 +103,7 @@
         android:orientation="horizontal">
 
         <ImageButton
-            android:id="@+id/imageButton01"
+            android:id="@+id/imageButton_info"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleType="fitStart"
@@ -102,7 +111,7 @@
             android:onClick="onClick"
             app:srcCompat="@android:drawable/zoom_plate" />
         <ImageButton
-            android:id="@+id/imageButton02"
+            android:id="@+id/imageButton_rf"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files