Connect 에 MainActivity 상속받을 수 있도록 수정 /ListViewAdapter Log 제거 / Run Class Thread 생성 /

.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

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

@@ -62,7 +62,6 @@ public class ListViewAdapter extends BaseAdapter {
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 temp_str[0] = s.toString();
 //                Log.d("getView",temp_str[0] );
-
             }
 
             @Override
@@ -92,7 +91,7 @@ public class ListViewAdapter extends BaseAdapter {
 
             @Override
             public void afterTextChanged(Editable s) {
-                Log.d("EDIT TEXT POSITION1 : ", String.valueOf(pos));
+//                Log.d("EDIT TEXT POSITION1 : ", String.valueOf(pos));
                 filteredItemList.get(holder.ref).setVal(s.toString());
 
             }
@@ -111,7 +110,7 @@ public class ListViewAdapter extends BaseAdapter {
 
             @Override
             public void afterTextChanged(Editable s) {
-                Log.d("EDIT TEXT POSITION2 :  ", String.valueOf(pos));
+//                Log.d("EDIT TEXT POSITION2 :  ", String.valueOf(pos));
 
                 filteredItemList.get(holder.ref).setVal2(s.toString());
             }

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

@@ -3,6 +3,7 @@ package com.example.repeater;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
@@ -40,27 +41,27 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
     PrintWriter out;        //서버에 데이터를 전송한다.
     TextView textView_status;
     String data;
-    Button button_port,button_control,listView_button;
+    public Button button_port,button_control,listView_button;
     public Context mContext;
     private Socket socket;  //소켓생성
-
+    public boolean Connection_Status = false;
     public boolean isConnection_Status() {
         return Connection_Status;
     }
     public static int DATA_TEST = 0;
     public void setConnection_Status(boolean connection_Status) {
         Connection_Status = connection_Status;
-        if(connection_Status){
-            Log.d("Port Close", "성공");
+        if(Connection_Status){
+            Log.d("setConnection_Status", String.valueOf(Connection_Status));
             button_port.setText("Port Close");
         }else{
-            Log.d("Port Open", "성공");
+            Log.d("setConnection_Status", String.valueOf(Connection_Status));
             button_port.setText("Port Open");
         }
     }
 
     /*** WIFI END***/
-    private boolean Connection_Status = false;
+
 
     ImageButton imageButton01;
     ImageButton imageButton02;
@@ -76,7 +77,6 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         Log.d("MainActivity / Oncreate 실행","성공");
-        DATA_TEST = 33;
         //        listview_info_set.setOnItemClickListener(this);
 //        listview_rf_set.setOnItemClickListener(this);
         listView_button = findViewById(R.id.listView_button);
@@ -227,23 +227,28 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
     {
         Log.d("Click Success : " + adapter_info_set.getItemId(0), "성공");
     }
-
-
+    Runnable start = new RunnableImplements(this);
+    Thread T = new Thread(start);
     public void onClick(View view) {
         switch(view.getId()) {
             case R.id.button_port:
+
                 if(button_port.getText() == "Port Close") {
                     setConnection_Status(false);
+                    T.interrupt();
                 }
                 else {
                     // 버튼을 누르는 이벤트 발생, 이벤트 제어문이기 때문에 이벤트 발생 때마다 발동된다. 시스템이 처리하는 부분이 무한루프문에
                     //있더라도 이벤트가 발생하면 자동으로 실행된다.
                     try{
-                        Runnable start = new MainActivity();
-                        Thread T = new Thread(start);
+                        setConnection_Status(true);
+
+                        Log.d("Mainactivity.class / run", "isConnection_Status : " + isConnection_Status());
+
+
                         T.start();
+                        Log.d("Mainactivity.class / run", "button_port : " + isConnection_Status());
                         Log.d("MainActivity / 쓰레드 실행","성공");
-                        setConnection_Status(true);
                     }catch (Exception e){
                         Log.e("MainActivity / 쓰레드 실행","실패");
                     }
@@ -319,6 +324,11 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
         this.Recv_Context =context;
     }
     String Prev_RecvStr;
+
+    int sendtest = 0;
+    public int Send_Test(){
+        return ++sendtest;
+    }
     public void ListViewDataSet(int position, final String str){
         new Thread(new Runnable() {
             @Override
@@ -331,8 +341,11 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
 //            adapter_rf.removeItem(11);
                             if(str != Prev_RecvStr) {
                                 adapter_rf.setItem("Temperature", str, "", "READ", 11);
+                                adapter_rf_set.setItem("Temperature", str, "", "READ", 11);
                                 Prev_RecvStr = str;
                                 adapter_rf.notifyDataSetChanged();
+                                adapter_rf_set.notifyDataSetChanged();
+                                Log.d("Mainactivity.class / runOnUiThread", "isConnection_Status : " + isConnection_Status());
                             }
 //
                         }catch (Exception e){
@@ -345,17 +358,38 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
         }).start();
 
     }
+
     @Override
     public void run() {
-        connect con = new connect(this);
-        con.run();
+//        connect con = new connect(this);
+//        try {
+//            Log.d("YJ TEST ", String.valueOf(DATA_TEST));
+//            Log.d("MainActivity / Run 함수 실행", "성공");
+//        } catch (Exception e) {
+//            Log.e("MainActivity / Run 함수 실행", "실패");
+//            //  setConnection_Status(false);
+//        }
+//        con.run();
+    }
+
+}
+class RunnableImplements implements Runnable {
+    MainActivity mActivity = null;
+
+    public RunnableImplements(MainActivity Activity) {
+        this.mActivity = Activity;
+    }
+
+    public void run(){
+        connect con = new connect(this.mActivity);
         try {
-            Log.d("YJ TEST ", String.valueOf(DATA_TEST));
+//            Log.d("YJ TEST ", String.valueOf(DATA_TEST));
             Log.d("MainActivity / Run 함수 실행", "성공");
         } catch (Exception e) {
             Log.e("MainActivity / Run 함수 실행", "실패");
-            setConnection_Status(false);
+            //  setConnection_Status(false);
         }
+        con.run();
+        // 작업
     }
-
-}
+}

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

@@ -13,28 +13,29 @@ public class connect implements Runnable  {
     private Socket socket;
     private Timer timer = null;
     private MainActivity mAcitivity = null;
-    public connect(MainActivity Acitivity) {
+    private Context mContext = null;
+    public connect(MainActivity Activity) {
         try {
             socket = new Socket(ip, port);    //서버에 연결
             timer = new Timer();
-            this.mAcitivity=Acitivity;
+            this.mAcitivity=Activity;
             Log.d("connect.class / 소켓 연결", "성공");
+//            MainActivity t = (MainActivity)context.getApplicationContext();
+            Log.d("connect.class / run", "isConnection_Status " + String.valueOf(this.mAcitivity.isConnection_Status()));
         }
         catch(Exception e) {
             Log.e("connect.class / 소켓 연결", "실패");
-            ((MainActivity)Acitivity).setConnection_Status(false);
+            //    ((MainActivity)Acitivity).setConnection_Status(false);
         }
-        Log.e("run", String.valueOf((Acitivity).DATA_TEST));
     }
     @Override
     public void run() {
     // TODO Auto-generated method stub
-
         send s = new send(socket,this.mAcitivity);    //서버에 연결된 socket을 생성자를 통해 넘긴다
         receive r = new receive(socket,this.mAcitivity);  //서버에 연결된 socket을 생성자를 통해 넘긴다
-//        ((MainActivity)this.activity).RecvContext_set(r);
         timer.scheduleAtFixedRate(s, 1000, 7000);
         r.run();        //스레드 실행
+        timer.cancel();
     }
 }
 

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

@@ -37,24 +37,16 @@ public class receive implements Runnable{
         // TODO Auto-generated method stub
 
         try {
+
             while(true) {
                 myCompleteMessage = new StringBuilder();    //StringBuilder 객체 초기화
                 buffRead = new BufferedReader(new InputStreamReader(m_socket.getInputStream()));
                 numberOfBytesRead = buffRead.read(buff, 0, buff.length);//char 배열 buff에 받아들이고
                 myCompleteMessage.append(buff, 0, numberOfBytesRead); //buff의 데이터를 StringBuilder객체로 이동
                 temp = Integer.parseInt(myCompleteMessage.toString()) * ADC_Calc;
-                temp = ((temp  * 1000) -500) / 10;
+                temp = ((temp  * 1000) -500) / 10;/*ADC값 계산 식 */
                 this.mAcitivity.ListViewDataSet(11, String.valueOf(temp));
                 Log.d("receive.class / 데이터 수신", "성공 : DATA : " + temp +">>> LENGTH : " +numberOfBytesRead);//toString메소드를 통해
-                /*
-                myCompleteMessage = new StringBuilder();    //StringBuilder 객체 초기화
-                Log.d("receive1.class / 데이터 수신", "성공 : " + myCompleteMessage.toString());//toString메소드를 통해
-                numberOfBytesRead = buffRead.read(buff, 0, buff.length);//char 배열 buff에 받아들이고
-                Log.d("receive2.class / 데이터 수신", "성공 : " + myCompleteMessage.toString());//toString메소드를 통해
-                //받아들인 byte수를 반환
-                myCompleteMessage.append(buff, 2, numberOfBytesRead-2); //buff의 데이터를 StringBuilder객체로 이동
-                Log.d("receive.class / 데이터 수신", "성공 : " + myCompleteMessage.toString());//toString메소드를 통해
-                //String으로 변환*/
             }
         } catch(Exception e) {
             Log.e("receive.class / 데이터 수신", "실패" + numberOfBytesRead);

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

@@ -15,10 +15,10 @@ public class send extends TimerTask {
     private Socket m_socket = null;
     private String message = "hello!";
     private byte[] b = {'d','a','t','a','1','2','\r','\n'};
-    private Context mContext = null;
-    public send(Socket socket, Context context){
+    private MainActivity mAcitivity = null;
+    public send(Socket socket,MainActivity Acitivity){
         try{
-            this.mContext = context;
+            this.mAcitivity = Acitivity;
             m_socket = socket;
             out = socket.getOutputStream();
             dos = new DataOutputStream(out);
@@ -30,7 +30,9 @@ public class send extends TimerTask {
     @Override
     public void run() {
         try {
-            dos.writeBytes(" data12\r\n");
+            String testdata = String.valueOf((this.mAcitivity).Send_Test());
+            Log.d("send.class / run", testdata);
+            dos.writeBytes(testdata);
             //dos.write(b, 0, b.length);
             Log.d("send.class / 메시지 전송", "성공");
         }catch(Exception e){

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

@@ -25,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Port Open"
-            android:onClick="onClick" />
+            android:onClick="onClick"  />
     </LinearLayout>
 
     <LinearLayout

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 24 17:30:00 KST 2019
+#Thu Aug 22 21:32:04 KST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip