zmiany do wersj pdstawoej

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -24,14 +24,19 @@ android {
 }
 
 dependencies {
+    def room_version = "2.2.5"
+
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "androidx.room:room-runtime:$room_version"
 
     implementation 'com.loopj.android:android-async-http:1.4.9'
-
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0'
+    annotationProcessor 'androidx.room:room-compiler:2.1.0'
 }

app/debug/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"app-debug.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.kfb.kfbv1">
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
@@ -14,9 +17,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/ic_launcher_round"
+        android:icon="@drawable/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
@@ -30,6 +33,7 @@
         </activity>
         <activity android:name=".MainActivity" android:noHistory="true"></activity>
         <activity android:name=".GateActivity" android:noHistory="true"></activity>
+        <activity android:name=".ConfigActivity" android:noHistory="true"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/kfb/kfbv1/GateActivity.java

@@ -1,27 +1,35 @@
 package com.kfb.kfbv1;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.view.MenuItem;
+import android.view.View;
 import android.view.WindowManager;
-import android.widget.TextView;
+import android.widget.Button;
+import android.widget.ImageButton;
+
 
 import androidx.appcompat.app.AppCompatActivity;
+
+import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.kfb.kfbv1.db.DbManage;
+import com.kfb.kfbv1.db.Urzadzenia;
 import com.kfb.kfbv1.dummy.DummyContent;
 
 import com.kfb.kfbv1.model.KfbGate;
-import com.kfb.kfbv1.model.KfbHttpRequest;
 import com.kfb.kfbv1.model.KfbModel;
 import com.kfb.kfbv1.model.KfbTask;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public class GateActivity  extends AppCompatActivity
 {
+    private Toolbar toolbar;
     private MyItemRecyclerViewAdapter listAdapter;
     private List<DummyContent.DummyItem> ld1 = new ArrayList<DummyContent.DummyItem>() ;
     private RecyclerView recycler;
@@ -30,11 +38,31 @@ public class GateActivity  extends AppCompatActivity
         @Override
         public void handleMessage(Message msg) {
             if(msg.what==2) {
-                DummyContent.DummyItem dr = ld1.get(msg.arg1);
-                dr.Temperatura = KfbModel.getData().getGates().getmGate().get(msg.arg1).getmMaxT();
-                dr.State = KfbModel.getData().getGates().getmGate().get(msg.arg1).getmStatus();
-                dr.Error = KfbModel.getData().getGates().getmGate().get(msg.arg1).getmError();
-                listAdapter.notifyDataSetChanged();
+                DummyContent.DummyItem dr=null;
+                for(int i = 0; i<ld1.size();i++)
+                {
+                    dr = ld1.get(msg.arg1);
+                    if(dr.id== msg.arg1)
+                    {
+                        break;
+                    }
+                }
+                if(dr!=null) {
+                    dr.Temperatura = KfbModel.getData().getGates().getmGate().get(msg.arg1).getmMaxT();
+                    dr.State = KfbModel.getData().getGates().getmGate().get(msg.arg1).getmStatus();
+                    dr.Error = KfbModel.getData().getGates().getmGate().get(msg.arg1).getmError();
+                    dr.imgHis = KfbModel.getData().getGates().getmGate().get(msg.arg1).getmMeasure().getHist();
+                    float t=0;
+                    if (dr.Temperatura != null) {
+                        t = Float.parseFloat(dr.Temperatura);
+                    }
+                    if (t > 38) {
+                         dr.Nok = "NOK";
+                    } else {
+                        dr.Nok = "OK";
+                    }
+                    listAdapter.notifyDataSetChanged();
+                }
             }
             super.handleMessage(msg);
         }
@@ -45,41 +73,128 @@ public class GateActivity  extends AppCompatActivity
         setContentView(R.layout.activity_gate);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
+        ImageButton bConf = (ImageButton)findViewById(R.id.idConfig);
+        bConf.setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View v) {
+                onConfigClik(v);
+            }
+        });
+
         recycler = findViewById(R.id.recview);
         recycler.setHasFixedSize(true);
         layoutManager = new LinearLayoutManager(this);
         recycler.setLayoutManager(layoutManager);
 
 
+
         listAdapter = new MyItemRecyclerViewAdapter( ld1,null);
         recycler.setAdapter(listAdapter);
+        DbManage dbRep = new DbManage(getApplicationContext());
+        List<Urzadzenia> urzdb = dbRep.getUrzadzeniaAll();
+            if(urzdb!=null) {
+                KfbModel.getData().clear();
+                for(int i=0;i<urzdb.size();i++){
 
-        KfbModel.getData().sendHttp=true;
-        KfbGate lGate = new KfbGate();
-        lGate.setmAdres("http://192.168.13.15");
-      //  lGate.setmAdres("http://p.sorveno.com/pp.html");
-        lGate.setmName("Gate 1");
-        KfbModel.getData().getGates().AddGate(lGate);
-        lGate = new KfbGate();
-        lGate.setmAdres("http://192.168.13.16");
-        lGate.setmName("Gate 2");
-        KfbModel.getData().getGates().AddGate(lGate);
-        for (int i =0; i<KfbModel.getData().getGates().getmSize();i++) {
-             DummyContent.DummyItem d1 = new DummyContent.DummyItem(String.valueOf(i)  ,KfbModel.getData().getGates().getmGate().get(i).getmName(), "ON", KfbModel.getData().getGates().getmGate().get(i).getmError(), KfbModel.getData().getGates().getmGate().get(i).getmStatus(), "", "", "", KfbModel.getData().getGates().getmGate().get(i).getmMaxT());
-            ld1.add(d1);
-        }
-        KfbModel.getData().handler = handler;
-        KfbModel.getData().setmAdapter(listAdapter);
-        this.StartMes();
-        listAdapter.notifyDataSetChanged();
-    }
+                    KfbGate lGate = new KfbGate();
+                    lGate.setId(urzdb.get(i).ID);
+                    lGate.setmAdres(urzdb.get(i).adres);
+                    if(i==0) {
+                        lGate.setmName("Gate 1");
+                    }
+                    if(i==1) {
+                        lGate.setmName("Gate 2");
+                    }
+                    if(i==2) {
+                        lGate.setmName("Gate 3");
+                    }
+                    if(i==3) {
+                        lGate.setmName("Gate 4");
+                    }
+                    lGate.setmActive(urzdb.get(i).active);
+                    KfbModel.getData().getGates().AddGate(lGate);
+                }
+            }
+                if (KfbModel.getData().getGates().getmSize() == 0) {
+                    KfbModel.getData().clear();
+                    KfbModel.getData().sendHttp = true;
+                    KfbGate lGate = new KfbGate();
+                    lGate.setId(0);
+                    lGate.setmAdres("http://192.168.1.15:6505");
+                    // lGate.setmAdres("http://51.83.130.248:3000");
+                    lGate.setmName("Gate 1");
+                    lGate.setmActive(true);
+                    KfbModel.getData().getGates().AddGate(lGate);
+                    Urzadzenia urzdbe = new Urzadzenia();
+
+                    urzdbe.active = lGate.ismActive();
+                    urzdbe.adres = lGate.getmAdres();
+                    urzdbe.ID =  lGate.getId();
+                    dbRep.insertUrzazenie(urzdbe);
 
+                    lGate = new KfbGate();
+                    lGate.setmAdres("http://192.168.1.16:6505");
+                    //lGate.setmAdres("http://p.sorveno.com/pp.html");
+                    lGate.setmName("Gate 2");
+                    lGate.setId(1);
+                    lGate.setmActive(true);
+                    KfbModel.getData().getGates().AddGate(lGate);
+                    urzdbe = new Urzadzenia();
+                    urzdbe.active = lGate.ismActive();
+                    urzdbe.adres = lGate.getmAdres();
+                    urzdbe.ID =  lGate.getId();
+                    dbRep.insertUrzazenie(urzdbe);
+                    lGate = new KfbGate();
+                    lGate.setmAdres("http://192.168.1.17:6505");
+                    //lGate.setmAdres("http://p.sorveno.com/pp.html");
+                    lGate.setmName("Gate 3");
+                    lGate.setId(2);
+                    lGate.setmActive(true);
+                    KfbModel.getData().getGates().AddGate(lGate);
+                    urzdbe = new Urzadzenia();
+                    urzdbe.active = lGate.ismActive();
+                    urzdbe.adres = lGate.getmAdres();
+                    urzdbe.ID =  lGate.getId();
+                    dbRep.insertUrzazenie(urzdbe);
+                    lGate = new KfbGate();
+                    lGate.setmAdres("http://192.168.1.18:6505");
+                    //lGate.setmAdres("http://p.sorveno.com/pp.html");
+                    lGate.setmName("Gate 4");
+                    lGate.setId(3);
+                    lGate.setmActive(true);
+                    urzdbe = new Urzadzenia();
+                    urzdbe.active = lGate.ismActive();
+                    urzdbe.adres = lGate.getmAdres();
+                    urzdbe.ID =  lGate.getId();
+                    dbRep.insertUrzazenie(urzdbe);
+                    KfbModel.getData().getGates().AddGate(lGate);
+                }
+            ld1.clear();
+            for (int i = 0; i < KfbModel.getData().getGates().getmSize(); i++) {
+                DummyContent.DummyItem d1 = new DummyContent.DummyItem(i, KfbModel.getData().getGates().getmGate().get(i).getmName(), "ON", KfbModel.getData().getGates().getmGate().get(i).getmError(), KfbModel.getData().getGates().getmGate().get(i).getmStatus(), "", "", "", KfbModel.getData().getGates().getmGate().get(i).getmMaxT());
+                 if( KfbModel.getData().getGates().getmGate().get(i).ismActive()) {
+                     ld1.add(d1);
+                 }
+            }
+            KfbModel.getData().handler = handler;
+            KfbModel.getData().setmAdapter(listAdapter);
+            this.StartMes();
+            listAdapter.notifyDataSetChanged();
+    }
+private void onConfigClik(View v)
+{
+    Intent i = new Intent(getApplicationContext(),ConfigActivity.class);
+    startActivity(i);
+}
     private void StartMes(){
         KfbModel.getData().sendHttp= true;
         KfbTask tr = new KfbTask();
         Thread T1 = new Thread(tr);
         T1.start();
     }
-
-
+    @Override
+    protected void onStop() {
+        super.onStop();
+        KfbModel.getData().sendHttp=false;
+    }
 }

app/src/main/java/com/kfb/kfbv1/MainActivity.java

@@ -16,6 +16,8 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.kfb.kfbv1.db.DbManage;
+import com.kfb.kfbv1.db.User;
 import com.kfb.kfbv1.hotspot.WifiApManager;
 import com.kfb.kfbv1.model.KfbGate;
 import com.kfb.kfbv1.model.KfbGates;
@@ -79,6 +81,10 @@ public class MainActivity extends AppCompatActivity {
        //wifiApManager.setWifiApEnabled(con, true);
     }
     private void onLoginClik(View v) {
+
+        DbManage dbRep = new DbManage(getApplicationContext());
+        User us = dbRep.getUser("admin");
+
         Intent i = new Intent(getApplicationContext(),GateActivity.class);
         startActivity(i);
 
@@ -93,7 +99,7 @@ public class MainActivity extends AppCompatActivity {
 
         KfbGate g1 = new KfbGate();
         g1.setmName("Test1");
-    //    KfbModel.getData().getGates().AddGate(g1);
+        KfbModel.getData().getGates().AddGate(g1);
 
         T1 = new Thread(tr);
         T1.start();
@@ -102,7 +108,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onResume() {
         super.onResume();
 
-        wifiApManager.showWritePermissionSettings(false);
+      //  wifiApManager.showWritePermissionSettings(false);
     }
 
 }

app/src/main/java/com/kfb/kfbv1/MyItemRecyclerViewAdapter.java

@@ -3,6 +3,7 @@ package com.kfb.kfbv1;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
@@ -39,8 +40,28 @@ public class MyItemRecyclerViewAdapter extends RecyclerView.Adapter<MyItemRecycl
         holder.Nazwa.setText(mValues.get(position).Nazwa);
         holder.Status.setText(mValues.get(position).Status);
         holder.Error.setText(mValues.get(position).Error);
+        holder.Error.setTextColor(0XFFFF0000);
         holder.State.setText(mValues.get(position).State);
+        holder.Nok.setText(mValues.get(position).Nok);
+        if(mValues.get(position).Nok!=null) {
+            if (mValues.get(position).Nok.equals("NOK")) {
+                holder.Nok.setTextColor(0XFFFF0000);
+            } else {
+                holder.Nok.setTextColor(0XFF00FF00);
+            }
+        }
         holder.Temperatura.setText(mValues.get(position).Temperatura);
+        String t = mValues.get(position).Temperatura;
+        if(t!=null) {
+            if (Float.parseFloat(t) >= 38.0F) {
+                holder.Temperatura.setTextColor(0XFFFF0000);
+            } else {
+                holder.Temperatura.setTextColor(0XFF00FF00);
+            }
+        }
+        if(mValues.get(position).imgHis!=null) {
+            holder.ImgHis.setImageBitmap(mValues.get(position).imgHis);
+        }
         holder.mView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -65,6 +86,8 @@ public class MyItemRecyclerViewAdapter extends RecyclerView.Adapter<MyItemRecycl
         public final TextView Error;
         public final TextView State;
         public final TextView Temperatura;
+        public final TextView Nok;
+        public final ImageView ImgHis;
 
         public DummyContent.DummyItem mItem;
 
@@ -76,6 +99,8 @@ public class MyItemRecyclerViewAdapter extends RecyclerView.Adapter<MyItemRecycl
             Error = (TextView) view.findViewById(R.id.idError);
             State = (TextView) view.findViewById(R.id.idState);
             Temperatura = (TextView) view.findViewById(R.id.idTemperatura);
+            Nok = (TextView) view.findViewById(R.id.idOK);
+            ImgHis = (ImageView) view.findViewById(R.id.imgHis);
         }
 
         @Override

app/src/main/java/com/kfb/kfbv1/dummy/DummyContent.java

@@ -1,5 +1,7 @@
 package com.kfb.kfbv1.dummy;
 
+import android.graphics.Bitmap;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -21,7 +23,7 @@ public class DummyContent {
     /**
      * A map of sample (dummy) items, by ID.
      */
-    public static final Map<String, DummyItem> ITEM_MAP = new HashMap<String, DummyItem>();
+    public static final Map<Integer, DummyItem> ITEM_MAP = new HashMap<Integer, DummyItem>();
 
     private static final int COUNT = 4;
 
@@ -38,7 +40,7 @@ public class DummyContent {
     }
 
     private static DummyItem createDummyItem(int position) {
-        return new DummyItem(String.valueOf(position), "Test1","ON","ERROR","Empty","1","1","1","23.3");
+        return new DummyItem(1, "Test1","ON","ERROR","Empty","1","1","1","23.3");
     }
 
     private static String makeDetails(int position) {
@@ -54,7 +56,7 @@ public class DummyContent {
      * A dummy item representing a piece of content.
      */
     public static class DummyItem {
-        public final String id;
+        public final int id;
         public final String Nazwa;
         public final String Status;
         public String Error;
@@ -63,8 +65,9 @@ public class DummyContent {
         public final String s2;
         public final String s3;
         public String Temperatura;
-
-        public DummyItem(String id, String aNazwa,String aStatus,String aError,String aState,String aS1,String aS2,String aS3,String aTemperatura) {
+        public Bitmap imgHis;
+        public String Nok;
+        public DummyItem(int id, String aNazwa,String aStatus,String aError,String aState,String aS1,String aS2,String aS3,String aTemperatura) {
             this.id = id;
             this.Nazwa = aNazwa;
             this.State = aState;

app/src/main/java/com/kfb/kfbv1/model/KfbGate.java

@@ -3,13 +3,48 @@ package com.kfb.kfbv1.model;
 import java.util.ArrayList;
 
 public class KfbGate {
+    private int Id;
     private String mName;
     private String mAdres;
     private String mMaxT;
     private String mStatus;
+    private String mStat;
     private String mError;
+    private boolean mNoPing;
+    private boolean mActive;
+    private KfbMeasure mMeasure;
 
-    private ArrayList<KfbMeasure> mMeasure;
+    public String getmStat() {
+        return mStat;
+    }
+
+    public void setmStat(String mStat) {
+        this.mStat = mStat;
+    }
+
+    public boolean ismNoPing() {
+        return mNoPing;
+    }
+
+    public void setmNoPing(boolean mNoPing) {
+        this.mNoPing = mNoPing;
+    }
+
+    public boolean ismActive() {
+        return mActive;
+    }
+
+    public int getId() {
+        return Id;
+    }
+
+    public void setId(int id) {
+        Id = id;
+    }
+
+    public void setmActive(boolean mActive) {
+        this.mActive = mActive;
+    }
 
     public void setmName(String mName) {
         this.mName = mName;
@@ -23,7 +58,7 @@ public class KfbGate {
         return mAdres;
     }
 
-    public void setmMeasure(ArrayList<KfbMeasure> mMeasure) {
+    public void setmMeasure(KfbMeasure mMeasure) {
         this.mMeasure = mMeasure;
     }
 
@@ -31,13 +66,14 @@ public class KfbGate {
         return mName;
     }
 
-    public ArrayList<KfbMeasure> getmMeasure() {
+    public KfbMeasure getmMeasure() {
         return mMeasure;
     }
 
     public KfbGate()
     {
-        mMeasure = new ArrayList<KfbMeasure>();
+        mMeasure = new KfbMeasure();
+        mNoPing = true;
     }
 
     public void setmMaxT(String mMaxT) {

app/src/main/java/com/kfb/kfbv1/model/KfbHttpRequest.java

@@ -1,35 +1,44 @@
 package com.kfb.kfbv1.model;
 
-import android.content.Context;
-import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Message;
 import android.util.Log;
-import android.widget.Toast;
 
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
-import com.loopj.android.http.ResponseHandlerInterface;
+import com.loopj.android.http.HttpGet;
 import com.loopj.android.http.SyncHttpClient;
 
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
+import java.io.BufferedReader;
 import java.io.IOException;
-import java.net.HttpURLConnection;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
 import java.net.URL;
-
-import javax.net.ssl.HttpsURLConnection;
+import java.net.UnknownHostException;
 
 import cz.msebera.android.httpclient.Header;
+import cz.msebera.android.httpclient.HttpEntity;
+import cz.msebera.android.httpclient.HttpResponse;
+import cz.msebera.android.httpclient.client.HttpClient;
+import cz.msebera.android.httpclient.impl.client.DefaultHttpClient;
+
 
 public class KfbHttpRequest {
     private  KfbGate mGate;
-    public  String outS;
-    private SyncHttpClient client;
+    static Handler handler = KfbModel.getData().handler;
+    public  static String outS;
+    private static String muri;
+    private static SyncHttpClient client;
+    private static AsyncHttpClient client1= new AsyncHttpClient();
 
     public String getTest(String aUrl)
     {
         client = new SyncHttpClient();
         try {
             String uri = aUrl;
+            muri = uri;
              client.get(uri, new AsyncHttpResponseHandler() {
                 @Override
                 public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
@@ -51,7 +60,14 @@ public class KfbHttpRequest {
                   // KfbModel.getData().textViewout.setText(outS);
 
                 }
-            });
+
+                 @Override
+                 public void onRetry(int retryNo) {
+                     super.onRetry(retryNo);
+                     KfbModel.getData().tekser =outS;
+                     KfbModel.getData().error = true;
+                 }
+             });
             return  outS;
         }catch (Exception e)
         {
@@ -59,18 +75,109 @@ public class KfbHttpRequest {
             return "";
         }
     }
+    public void checkIP(KfbGate aGate)
+    {
+        InetAddress in;
+        in = null;
+        // Definimos la ip de la cual haremos el ping
+        try {
+            URL u = new URL(aGate.getmAdres());
+
+            in = InetAddress.getByName(u.getHost());
+        } catch (UnknownHostException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+        // Definimos un tiempo en el cual ha de responder
+        try {
+            if (in.isReachable(500)) {
+            //    info.setText("Responde OK");
+                aGate.setmNoPing(false);
+            } else {
+                LogFile.appendLog("Blad polaczenia  "+ muri);
+                aGate.setmNoPing(true);
+            }
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            aGate.setmNoPing(true);
+        }
+    }
+    public static void getRequest1(KfbGate aGate) {
+        HttpClient httpclient = new DefaultHttpClient();
+        String uri = aGate.getmAdres();
+        muri = uri;
+        HttpGet httpget = new HttpGet(muri);
+
+        // Execute the request
+        HttpResponse response;
+        try {
+            response = httpclient.execute(httpget);
+            // Examine the response status
+            //Log.i("Praeda",response.getStatusLine().toString());
+
+            // Get hold of the response entity
+            HttpEntity entity = response.getEntity();
+            // If the response does not enclose an entity, there is no need
+            // to worry about connection release
+
+            if (entity != null) {
+
+                // A Simple JSON Response Read
+                InputStream instream = entity.getContent();
+                String result= convertStreamToString(instream);
+                outS = result;
+                KfbModel.getData().tekser =outS;
+                KfbModel.getData().error = false;
+             //  LogFile.appendLog("Mam dane ");
+                instream.close();
+            }
+
+
+        } catch (Exception e) {}
+    }
+    private static String convertStreamToString(InputStream is) {
+        /*
+         * To convert the InputStream to String we use the BufferedReader.readLine()
+         * method. We iterate until the BufferedReader return null which means
+         * there's no more data to read. Each line will appended to a StringBuilder
+         * and returned as String.
+         */
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        StringBuilder sb = new StringBuilder();
+
+        String line = null;
+        try {
+            while ((line = reader.readLine()) != null) {
+                sb.append(line + "\n");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return sb.toString();
+    }
+
     public void getRequest(KfbGate aGate) {
         mGate = aGate;
-
+         LogFile.appendLog("Wykonuje polaczenie ");
         client = new SyncHttpClient();
         try {
             String uri = aGate.getmAdres();
+            muri = uri;
          client.get(uri, new AsyncHttpResponseHandler() {
              @Override
              public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
                  outS = new String(responseBody);
                  KfbModel.getData().tekser =outS;
                  KfbModel.getData().error = false;
+                 LogFile.appendLog("Mam dane ");
              }
 
              @Override
@@ -78,6 +185,15 @@ public class KfbHttpRequest {
                  outS = "ERROR"+ error.getMessage();
                  KfbModel.getData().tekser =outS;
                  KfbModel.getData().error = true;
+                 LogFile.appendLog("Blad polaczenia  "+ muri);
+             }
+             @Override
+             public void onRetry(int retryNo) {
+                 super.onRetry(retryNo);
+                 KfbModel.getData().tekser =outS;
+                 KfbModel.getData().error = true;
+                 LogFile.appendLog("Ponawiam  "+ retryNo);
+
              }
          });
 

app/src/main/java/com/kfb/kfbv1/model/KfbKttpRequest2.java

@@ -0,0 +1,54 @@
+package com.kfb.kfbv1.model;
+
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Message;
+
+import com.loopj.android.http.AsyncHttpClient;
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.loopj.android.http.SyncHttpClient;
+
+import cz.msebera.android.httpclient.Header;
+
+public class KfbKttpRequest2 extends AsyncTask<KfbGate,Void,String> {
+    Handler handler = KfbModel.getData().handler;
+    KfbParser p = new KfbParser();
+    SyncHttpClient client = new SyncHttpClient();
+
+    @Override
+    protected String doInBackground(final KfbGate... g) {
+        client.get(g[0].getmAdres(), new AsyncHttpResponseHandler() {
+
+            @Override
+            public void onStart() {
+                // called before request is started
+            }
+
+            @Override
+            public void onSuccess(int statusCode, Header[] headers, byte[] response) {
+                g[0].setmError("");
+                int i = g[0].getId();
+                String outS = new String(response);
+                KfbModel.getData().tekser =outS;
+                p.dataParser(KfbModel.getData().tekser, KfbModel.getData().getGates().getmGate().get(i));
+                KfbModel.getData().getGates().getmGate().get(i).getmMeasure().CreateBitMap();
+                Message msg = handler.obtainMessage();
+                msg.what = 2;
+                msg.obj = "Pomiar";
+                msg.arg1 =  KfbModel.getData().getGates().getmGate().get(i).getId();
+                handler.sendMessage(msg);
+            }
+
+            @Override
+            public void onFailure(int statusCode, Header[] headers, byte[] errorResponse, Throwable e) {
+                // called when response HTTP status is "4XX" (eg. 401, 403, 404)
+            }
+
+            @Override
+            public void onRetry(int retryNo) {
+                // called when request is retried
+            }
+        });
+        return "";
+    }
+}

app/src/main/java/com/kfb/kfbv1/model/KfbMeasure.java

@@ -1,5 +1,64 @@
 package com.kfb.kfbv1.model;
 
+import android.graphics.Bitmap;
+import android.graphics.Matrix;
+
+import java.util.HashMap;
+
 public class KfbMeasure {
-    private float mTemp;
+    public float[] mTemp;
+    public int[] mTempI;
+    int width = 8;
+    int height = 8;
+    Bitmap bitmap;
+
+public KfbMeasure(){
+    mTemp = new float[64];
+    mTempI = new int[64];
+}
+
+private int mapingColor(float aTemp)
+{
+    if(aTemp > 45 )
+    {
+        return 0xFFFFFFFF; //czerwony
+    }
+    if(aTemp > 38 )
+    {
+        return 0xFFFF0000; //czerwony
+    }
+    if(aTemp < 25 )
+    {
+        return 0xFF000000;
+    }
+    String f = String.format("%.1f", aTemp);
+    return KfbModel.getData().getMapColor().getKolor(f);
+}
+
+public void CreateBitMap()
+{
+    for(int i = 0 ; i < 64; i++)
+    {
+        mTempI[i] = this.mapingColor(mTemp[i]);
+
+        //  mTempI[i] = 0xFFFFFF00;
+    }
+    bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+    bitmap.setPixels(mTempI, 0, width, 0, 0, width, height);
+
+    float scaleWidth = ((float) 350) / width;
+    float scaleHeight = ((float) 350) / height;
+    Matrix matrix = new Matrix();
+    // RESIZE THE BIT MAP
+    matrix.postScale(scaleWidth, scaleHeight);
+
+    // "RECREATE" THE NEW BITMAP
+    Bitmap resizedBitmap = Bitmap.createBitmap(
+            bitmap, 0, 0, width, height, matrix, false);
+    bitmap.recycle();
+    bitmap = resizedBitmap;
+}
+public Bitmap getHist(){
+    return bitmap;
+}
 }

app/src/main/java/com/kfb/kfbv1/model/KfbModel.java

@@ -24,17 +24,20 @@ public class KfbModel {
     private KfbModel()
     {
         mGates = new KfbGates();
+        mMapColor = new KfbMapColor();
     }
     // data private
     private KfbGates mGates;
+    private KfbTablet mTablets;
     private MyItemRecyclerViewAdapter mAdapter;
+    private KfbMapColor mMapColor;
     // data
     public boolean sendHttp;
     public KfbProgrsBar progresBar;
     public String  tekser;
     public boolean error;
     public Handler handler;
- public String url;
+    public String url;
 
     public MyItemRecyclerViewAdapter getmAdapter() {
         return mAdapter;
@@ -47,4 +50,13 @@ public class KfbModel {
     public KfbGates getGates(){
         return mGates;
     }
+    public KfbTablet getTabletss(){
+        return mTablets;
+    }
+public void clear(){
+    mGates = new KfbGates();
+}
+    public KfbMapColor getMapColor(){
+        return mMapColor;
+    }
 }

app/src/main/java/com/kfb/kfbv1/model/KfbParser.java

@@ -4,11 +4,29 @@ public class KfbParser {
     public KfbGate dataParser(String aData,KfbGate aGate)
     {
         KfbGate k = aGate;
-        int p = aData.lastIndexOf("Tmax =");
-        p = p+6;
-        String t = aData.substring(p ,p+5);
-        k.setmMaxT(t);
+        int p  =0;
+        String[] aa =null;
+        float ff = 0;
+        KfbMeasure mm;
 
+        p = aData.lastIndexOf("Dane:");
+        p = p+5;
+        String t = aData.substring(p ,p+384);
+        aa = null;
+        aa = t.split(",");
+        for(int i=0;i<64;i++)
+        {
+            ff = Float.parseFloat(aa[i]);
+            k.getmMeasure().mTemp[i]=ff;
+        }
+        p = aData.lastIndexOf("Tmax:");
+        p = p+5;
+        t = aData.substring(p ,p+5);
+        k.setmMaxT(t);
+        p = aData.lastIndexOf("Stat:");
+        p = p+5;
+        t = aData.substring(p ,p+1);
+        k.setmStat(t);
         p = aData.lastIndexOf("status:");
         p=p+7;
         t = aData.substring(p ,p+6);

app/src/main/java/com/kfb/kfbv1/model/KfbTablet.java

@@ -0,0 +1,31 @@
+package com.kfb.kfbv1.model;
+
+import java.util.ArrayList;
+
+public class KfbTablet {
+    private int mSize;
+    private ArrayList<KfbGate> mGate;
+
+    public KfbTablet()
+    {
+        mGate = new ArrayList<KfbGate>();
+        mSize = 0;
+    }
+
+    public void AddTablet(KfbGate aGate){
+        mGate.add(aGate);
+        mSize++;
+    }
+
+    public void setmTablet(ArrayList<KfbGate> mGate) {
+        this.mGate = mGate;
+    }
+
+    public int getmSize() {
+        return mSize;
+    }
+
+    public ArrayList<KfbGate> getmGate() {
+        return mGate;
+    }
+}

app/src/main/java/com/kfb/kfbv1/model/KfbTask.java

@@ -16,9 +16,10 @@ public class KfbTask  implements Runnable {
         if(KfbModel.getData().tekser!=null)
         {
             KfbParser p = new KfbParser();
-           // if(KfbModel.getData().error==false) {
-          //      p.dataParser(KfbModel.getData().tekser, KfbModel.getData().getGates().getmGate().get(0));
-          //  }
+            if(KfbModel.getData().error==false) {
+                p.dataParser(KfbModel.getData().tekser, KfbModel.getData().getGates().getmGate().get(0));
+
+            }
             Message msg = handler.obtainMessage();
             msg.what = 1;
             msg.obj = "tekst";
@@ -30,25 +31,35 @@ public class KfbTask  implements Runnable {
         while(KfbModel.getData().sendHttp==true)
         {
             KfbParser p = new KfbParser();
+
             for (int i = 0 ;i<KfbModel.getData().getGates().getmSize();i++)
             {
-                HttpKfb.getRequest(KfbModel.getData().getGates().getmGate().get(i));
-                if(KfbModel.getData().error==false) {
-                    p.dataParser(KfbModel.getData().tekser, KfbModel.getData().getGates().getmGate().get(i));
-                    Message msg = handler.obtainMessage();
-                    msg.what = 2;
-                    msg.obj = "Pomiar";
-                    msg.arg1 = i;
-                    handler.sendMessage(msg);
-                }
-                else
-                {
-                    KfbModel.getData().getGates().getmGate().get(i).setmError("ERROR");
-                    Message msg = handler.obtainMessage();
-                    msg.what = 2;
-                    msg.obj = "Pomiar";
-                    msg.arg1 = i;
-                    handler.sendMessage(msg);
+                if(KfbModel.getData().getGates().getmGate().get(i).ismActive()==true) {
+                    if (KfbModel.getData().getGates().getmGate().get(i).ismNoPing() == true) {
+                        HttpKfb.checkIP(KfbModel.getData().getGates().getmGate().get(i));
+                    } else {
+                        HttpKfb.getRequest1(KfbModel.getData().getGates().getmGate().get(i));
+
+
+                        if (KfbModel.getData().error == false) {
+                            KfbModel.getData().getGates().getmGate().get(i).setmError("");
+                            p.dataParser(KfbModel.getData().tekser, KfbModel.getData().getGates().getmGate().get(i));
+                            KfbModel.getData().getGates().getmGate().get(i).getmMeasure().CreateBitMap();
+                            Message msg = handler.obtainMessage();
+                            msg.what = 2;
+                            msg.obj = "Pomiar";
+                            msg.arg1 =  KfbModel.getData().getGates().getmGate().get(i).getId();
+                            handler.sendMessage(msg);
+                        } else {
+                            KfbModel.getData().getGates().getmGate().get(i).setmNoPing(true);
+                            KfbModel.getData().getGates().getmGate().get(i).setmError("ERROR");
+                            Message msg = handler.obtainMessage();
+                            msg.what = 2;
+                            msg.obj = "Pomiar";
+                            msg.arg1 = KfbModel.getData().getGates().getmGate().get(i).getId();
+                            handler.sendMessage(msg);
+                        }
+                    }
                 }
             }
             try {

app/src/main/java/com/kfb/kfbv1/model/LogFile.java

@@ -32,6 +32,7 @@ public class LogFile {
             {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
+
             }
         }
         try

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
+<vector
     android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>

app/src/main/res/drawable/ic_launcher_doc.xml

@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="49.59793"
+                android:startX="42.9492"
+                android:endY="92.4963"
+                android:endX="85.84757"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000"/>
+</vector>

app/src/main/res/drawable/splash.xml

@@ -3,5 +3,5 @@
     android:opacity="opaque"><item android:drawable="@android:color/holo_purple" /><item>
     <bitmap
         android:gravity="center"
-        android:src="@drawable/logo" />
+        android:src="@drawable/ekranstartowy" />
 </item></layer-list>

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

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ConfigActivity">
+
+    <Switch
+        android:id="@+id/t3s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Tab3"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g3s" />
+
+    <ImageButton
+        android:id="@+id/back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="5dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@android:drawable/ic_menu_revert" />
+
+    <Switch
+        android:id="@+id/g1s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="108dp"
+        android:text="Gate1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Switch
+        android:id="@+id/g2s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Gate2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/t1s" />
+
+    <Switch
+        android:id="@+id/g3s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
+        android:text="Gate3"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/t2s" />
+
+    <Switch
+        android:id="@+id/g4s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="20dp"
+        android:text="Gate4"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/t3s" />
+
+    <Switch
+        android:id="@+id/t1s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
+        android:text="Tab1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g1s" />
+
+    <Switch
+        android:id="@+id/t2s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        android:text="Tab2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g2s" />
+
+    <Switch
+        android:id="@+id/t4s"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        android:text="Tab4"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g4s" />
+
+    <Button
+        android:id="@+id/idSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="201dp"
+        android:layout_marginTop="469dp"
+        android:text="Zapisz"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/g1t"
+        android:layout_width="292dp"
+        android:layout_height="43dp"
+        android:layout_marginStart="140dp"
+        android:layout_marginTop="91dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/t1t"
+        android:layout_width="292dp"
+        android:layout_height="44dp"
+        android:layout_marginStart="140dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g1t" />
+
+    <EditText
+        android:id="@+id/g2t"
+        android:layout_width="292dp"
+        android:layout_height="42dp"
+        android:layout_marginStart="140dp"
+        android:layout_marginTop="-1dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/t1t" />
+
+    <EditText
+        android:id="@+id/t2t"
+        android:layout_width="292dp"
+        android:layout_height="42dp"
+        android:layout_marginStart="140dp"
+        android:layout_marginTop="-1dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g2t" />
+
+    <EditText
+        android:id="@+id/g3t"
+        android:layout_width="292dp"
+        android:layout_height="41dp"
+        android:layout_marginStart="140dp"
+        android:layout_marginTop="-1dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/t2t" />
+
+    <EditText
+        android:id="@+id/t3t"
+        android:layout_width="292dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="140dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g3t" />
+
+    <EditText
+        android:id="@+id/g4t"
+        android:layout_width="292dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="140dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/t3t" />
+
+    <EditText
+        android:id="@+id/t4t"
+        android:layout_width="292dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="140dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/g4t" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,10 +6,17 @@
     android:layout_height="match_parent"
     tools:context=".GateActivity">
 
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recview"
         android:layout_width="598dp"
         android:layout_height="1022dp"
+        android:layout_marginTop="65dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -81,6 +81,7 @@
         android:layout_marginStart="36dp"
         android:layout_marginTop="207dp"
         android:text="Adres"
+        android:visibility="invisible"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView2" />
 
@@ -92,7 +93,8 @@
         android:layout_marginTop="115dp"
         android:ems="10"
         android:inputType="textPersonName"
-        android:text="http://"
+        android:text="http://p.sorveno.com/pp.html"
+        android:visibility="invisible"
         app:layout_constraintStart_toEndOf="@+id/textView3"
         app:layout_constraintTop_toBottomOf="@+id/login" />
 
@@ -105,6 +107,7 @@
         android:ems="10"
         android:gravity="start|top"
         android:inputType="textMultiLine"
+        android:visibility="invisible"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/editText" />
 
@@ -115,8 +118,10 @@
         android:layout_marginStart="456dp"
         android:layout_marginTop="37dp"
         android:text="Wykonaj"
+        android:visibility="invisible"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editText4" />
+        app:layout_constraintTop_toBottomOf="@+id/editText4"
+        tools:visibility="invisible" />
 
 
 

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

@@ -41,11 +41,13 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:id="@+id/imageView7"
+            android:id="@+id/imgHis"
             android:layout_width="150dp"
             android:layout_height="199dp"
             android:layout_marginStart="64dp"
+            android:adjustViewBounds="true"
             android:contentDescription=" "
+            android:scaleType="centerInside"
             android:visibility="visible"
             app:layout_constraintStart_toEndOf="@+id/idTemperatura"
             app:layout_constraintTop_toTopOf="parent"
@@ -69,7 +71,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="26dp"
             android:layout_marginTop="27dp"
-            android:text="Step 1"
+            android:text="Stan"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/idState" />
 
@@ -80,8 +82,10 @@
             android:layout_marginStart="26dp"
             android:layout_marginTop="10dp"
             android:text="Step 2"
+            android:visibility="invisible"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView27" />
+            app:layout_constraintTop_toBottomOf="@+id/textView27"
+            tools:visibility="invisible" />
 
         <TextView
             android:id="@+id/textView29"
@@ -90,6 +94,7 @@
             android:layout_marginStart="26dp"
             android:layout_marginTop="10dp"
             android:text="Step 3"
+            android:visibility="invisible"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textView28" />
 
@@ -99,32 +104,36 @@
             android:layout_height="30dp"
             android:layout_marginStart="148dp"
             android:layout_marginTop="52dp"
-            android:visibility="visible"
+            android:visibility="invisible"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textView24"
             app:srcCompat="@drawable/emot"
             tools:srcCompat="@tools:sample/avatars"
-            tools:visibility="visible" />
+            tools:visibility="invisible" />
 
         <ImageView
             android:id="@+id/imageView9"
             android:layout_width="31dp"
             android:layout_height="30dp"
             android:layout_marginStart="148dp"
+            android:visibility="invisible"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/imageView10"
             app:srcCompat="@drawable/emot"
-            tools:srcCompat="@tools:sample/avatars" />
+            tools:srcCompat="@tools:sample/avatars"
+            tools:visibility="invisible" />
 
         <ImageView
             android:id="@+id/imageView10"
             android:layout_width="31dp"
             android:layout_height="30dp"
             android:layout_marginStart="148dp"
+            android:visibility="invisible"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/imageView8"
             app:srcCompat="@drawable/emot"
-            tools:srcCompat="@tools:sample/avatars" />
+            tools:srcCompat="@tools:sample/avatars"
+            tools:visibility="invisible" />
 
         <TextView
             android:id="@+id/idTemperatura"
@@ -166,6 +175,27 @@
             android:text="Error"
             app:layout_constraintStart_toEndOf="@+id/idStatus"
             app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/idOK"
+            android:layout_width="63dp"
+            android:layout_height="22dp"
+            android:layout_marginStart="72dp"
+            android:layout_marginTop="88dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ToggleButton
+            android:id="@+id/mikrofon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="200dp"
+            android:layout_marginTop="145dp"
+            android:button="@android:drawable/ic_btn_speak_now"
+            android:text="ToggleButton"
+            android:textOff="OFF"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>

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

@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <ImageButton
+        android:id="@+id/idConfig"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        app:srcCompat="@android:drawable/ic_menu_preferences" />
+</LinearLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>