Merge pull request #1819 from fossasia/development

merge: development branch to master

Author: CloudyPadmal

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "io.pslab"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 15
-        versionName "2.0.14"
+        versionCode 16
+        versionName "2.0.15"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -70,8 +70,6 @@ dependencies {
     implementation 'com.github.Triggertrap:SeekArc:v1.1'
 
     implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:support-v4:28.0.0'
     annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
 
     // Map libraries

app/src/main/java/io/pslab/activity/DataLoggerActivity.java

@@ -43,6 +43,7 @@
 import io.pslab.models.SensorDataBlock;
 import io.pslab.models.ServoData;
 import io.pslab.models.ThermometerData;
+import io.pslab.models.WaveGeneratorData;
 import io.pslab.others.CSVLogger;
 import io.pslab.others.LocalDataLog;
 import io.realm.Realm;
@@ -67,6 +68,7 @@ public class DataLoggerActivity extends AppCompatActivity {
     private RealmResults<SensorDataBlock> categoryData;
     private String selectedDevice = null;
     private Realm realm;
+    private String caller;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -77,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) {
         deleteAllProgressBar = findViewById(R.id.delete_all_progbar);
         deleteAllProgressBar.setVisibility(View.GONE);
         realm = LocalDataLog.with().getRealm();
-        String caller = getIntent().getStringExtra(CALLER_ACTIVITY);
+        caller = getIntent().getStringExtra(CALLER_ACTIVITY);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
@@ -109,6 +111,13 @@ protected void onCreate(Bundle savedInstanceState) {
                 break;
             case "Robotic Arm":
                 categoryData = LocalDataLog.with().getTypeOfSensorBlocks(getString(R.string.robotic_arm));
+                break;
+            case "Wave Generator":
+                categoryData = LocalDataLog.with().getTypeOfSensorBlocks(getResources().getString(R.string.wave_generator));
+                break;
+            case "Oscilloscope":
+                categoryData = LocalDataLog.with().getTypeOfSensorBlocks(getResources().getString(R.string.oscilloscope));
+                break;
             default:
                 categoryData = LocalDataLog.with().getAllSensorBlocks();
                 getSupportActionBar().setTitle(getString(R.string.logged_data));
@@ -134,7 +143,41 @@ private void fillData() {
 
     @Override
     public void onBackPressed() {
-        finish();
+        getSupportActionBar().setTitle(caller);
+        switch (caller) {
+            case "Lux Meter":
+                startActivity(new Intent(this,LuxMeterActivity.class));
+                break;
+            case "Barometer":
+                startActivity(new Intent(this,BarometerActivity.class));
+                break;
+            case "Accelerometer":
+                startActivity(new Intent(this,AccelerometerActivity.class));
+                break;
+            case "Multimeter":
+                startActivity(new Intent(this,MultimeterActivity.class));
+                break;
+            case "Gyroscope":
+                startActivity(new Intent(this,GyroscopeActivity.class));
+                break;
+            case "Compass":
+                startActivity(new Intent(this,CompassActivity.class));
+                break;
+            case "Thermometer":
+                startActivity(new Intent(this,ThermometerActivity.class));
+                break;
+            case "Robotic Arm":
+                startActivity(new Intent(this,RoboticArmActivity.class));
+                break;
+            case "Wave Generator":
+                startActivity(new Intent(this, WaveGeneratorActivity.class));
+                break;
+            case "Oscilloscope":
+                startActivity(new Intent(this, OscilloscopeActivity.class));
+                break;
+            default:
+                startActivity(new Intent(this,MainActivity.class));
+        }
     }
 
     @Override
@@ -489,6 +532,41 @@ private void getFileData(File file) {
             } catch (IOException e) {
                 e.printStackTrace();
             }
+        } else if (selectedDevice != null && selectedDevice.equals(getResources().getString(R.string.wave_generator))) {
+            try {
+                FileInputStream is = new FileInputStream(file);
+                BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+                String line = reader.readLine();
+                int i = 0;
+                long block = 0, time = 0;
+                while (line != null) {
+                    if (i != 0) {
+                        String[] data = line.split(",");
+                        try {
+                            time += 1000;
+                            WaveGeneratorData waveData = new WaveGeneratorData(time, block, data[2], data[3], data[4], data[5], data[6],data[7],Float.valueOf(data[8]), Float.valueOf(data[9]));
+                            realm.beginTransaction();
+                            realm.copyToRealm(waveData);
+                            realm.commitTransaction();
+                        } catch (Exception e) {
+                            Log.d("exception", i + " " + e.getMessage());
+                            Toast.makeText(this, getResources().getString(R.string.incorrect_import_format), Toast.LENGTH_SHORT).show();
+                        }
+                    } else {
+                        block = System.currentTimeMillis();
+                        time = block;
+                        realm.beginTransaction();
+                        realm.copyToRealm(new SensorDataBlock(block, getResources().getString(R.string.wave_generator)));
+                        realm.commitTransaction();
+                    }
+                    i++;
+                    line = reader.readLine();
+                }
+                fillData();
+                DataLoggerActivity.this.toolbar.getMenu().findItem(R.id.delete_all).setVisible(true);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }
 }