59 app/src/main/java/nl/tue/demothermostat/WeekOverview.java
View file
@@ -36,6 +36,9 @@ public class WeekOverview extends Activity {
Button sundayB;
Button[] buttonArray;
Button addB;
Button backB;
serverTemp ST;
WeekProgram wpg;



@@ -46,8 +49,9 @@ public class WeekOverview extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.week_overview);
ST= new serverTemp();


wpg = new WeekProgram();



@@ -59,7 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
saturdayB = (Button) findViewById(R.id.saturdayB);
sundayB = (Button) findViewById(R.id.sundayB);
addB = (Button) findViewById(R.id.addB);

backB = (Button) findViewById(R.id.backB);

buttonArray = new Button[7];
buttonArray[0] = mondayB;
@@ -81,7 +85,8 @@ public void onClick(View view) {
startActivity(intent);

day="Monday";
}

}
});

tuesdayB.setOnClickListener(new View.OnClickListener() {
@@ -90,7 +95,9 @@ public void onClick(View view) {
Intent intent = new Intent(view.getContext(),DailyOverview.class);
startActivity(intent);


day="Tuesday";

}
});

@@ -101,6 +108,8 @@ public void onClick(View view) {
startActivity(intent);
day="Wednesday";



}
});

@@ -111,6 +120,7 @@ public void onClick(View view) {
startActivity(intent);
day="Thursday";


}
});

@@ -121,6 +131,8 @@ public void onClick(View view) {
startActivity(intent);
day="Friday";



}
});

@@ -131,6 +143,7 @@ public void onClick(View view) {
startActivity(intent);
day="Saturday";


}
});

@@ -141,13 +154,51 @@ public void onClick(View view) {
startActivity(intent);
day="Sunday";


}
});

addB.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(view.getContext(),AddingSchedule.class);

Thread s = new Thread() {

public void run() {
try {
wpg = HeatingSystem.getWeekProgram();
// Set the week program to default
for(int i = 0; i<10; i++){
wpg.data.get("Monday").set(i, new Switch(DailyOverview.type1[i], true, DailyOverview.day1[i]));
wpg.data.get("Tuesday").set(i, new Switch(DailyOverview.type2[i], true, DailyOverview.day2[i]));
wpg.data.get("Wednesday").set(i, new Switch(DailyOverview.type3[i], true, DailyOverview.day3[i]));
wpg.data.get("Thursday").set(i, new Switch(DailyOverview.type4[i], true, DailyOverview.day4[i]));
wpg.data.get("Friday").set(i, new Switch(DailyOverview.type5[i], true, DailyOverview.day5[i]));
wpg.data.get("Saturday").set(i, new Switch(DailyOverview.type6[i], true, DailyOverview.day6[i]));
wpg.data.get("Sunday").set(i, new Switch(DailyOverview.type7[i], true, DailyOverview.day7[i]));

}

//
boolean duplicates = wpg.duplicates(wpg.data.get("Monday"));
System.out.println("Duplicates found "+duplicates);

//Upload the updated program
HeatingSystem.setWeekProgram(wpg);

} catch (Exception e) {
System.err.print("Errorrrrrrr");
}
}
};
s.start();
}
});

backB.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(view.getContext(),ThermostatActivity.class);
startActivity(intent);

}
52 app/src/main/java/nl/tue/demothermostat/serverTemp.java
View file
@@ -197,6 +197,58 @@ public void run() {
for (int i = 0; i < 10; i++) {
switch1 = wpg.data.get(days).get(i);
switches[i] = switch1.getTime();

}

} catch (Exception e) {
System.err.println("Error from getdata " + e);
}
}
};
t.start();
t.join();
return switches;
}

public int[] GetNumber(String day) throws InterruptedException {
final int[] switches = new int[10];
final String days = day;


Thread t = new Thread() {

public void run() {
try {
WeekProgram wpg = HeatingSystem.getWeekProgram();
for (int i = 0; i < 10; i++) {
switch1 = wpg.data.get(days).get(i);
switches[i] = switch1.getTime_Int();

}

} catch (Exception e) {
System.err.println("Error from getdata " + e);
}
}
};
t.start();
t.join();
return switches;
}
public String[] GetDayNight(String day) throws InterruptedException {
final String[] switches = new String[10];
final String days = day;


Thread t = new Thread() {

public void run() {
try {
WeekProgram wpg = HeatingSystem.getWeekProgram();
for (int i = 0; i < 10; i++) {
switch1 = wpg.data.get(days).get(i);
switches[i] = switch1.getType();

}

} catch (Exception e) {
57 app/src/main/res/layout/activity_adding_schedule.xml
View file
@@ -8,77 +8,42 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="nl.tue.demothermostat.AddingSchedule"
android:background="@color/accent_material_dark">

<Spinner
android:id="@+id/planets_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
android:background="@color/dim_foreground_material_dark">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="switch start"
android:text="SWITCH START"
android:id="@+id/textView"
android:layout_below="@+id/planets_spinner"
android:textColor="@color/abc_input_method_navigation_guard"
android:layout_above="@+id/timeT"
android:layout_centerHorizontal="true"
android:layout_marginTop="47dp" />
android:layout_marginBottom="100dp" />

<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="time"
android:ems="10"
android:id="@+id/timeT"
android:layout_below="@+id/textView"
android:layout_centerHorizontal="true" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="switch type"
android:id="@+id/textView2"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />

<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/switchT"
android:layout_below="@+id/textView2"
android:layout_alignStart="@+id/timeT"
android:layout_alignEnd="@+id/timeT" />
android:layout_centerHorizontal="true"
android:background="@color/ripple_material_dark" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ADD SWITCH"
android:id="@+id/addedB"
android:layout_alignParentBottom="true"
android:layout_toStartOf="@+id/textView3" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="switch nr"
android:id="@+id/textView3"
android:layout_below="@+id/switchT"
android:layout_centerHorizontal="true" />

<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/numberT"
android:layout_below="@+id/textView3"
android:layout_centerHorizontal="true" />
android:layout_alignParentBottom="true" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="SET SCHEDULE"
android:text="BACK"
android:id="@+id/setB"
android:layout_alignParentBottom="true"
android:layout_toEndOf="@+id/textView3" />
android:layout_alignTop="@+id/addedB"
android:layout_alignParentEnd="true" />


</RelativeLayout>
20 app/src/main/res/layout/week_overview.xml
View file
@@ -12,16 +12,7 @@
android:layout_height="wrap_content"
android:text="Add Schedule"
android:id="@+id/addB"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Edit Schedule"
android:id="@+id/editB"
android:layout_above="@+id/addB"
android:layout_above="@+id/backB"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true" />

@@ -88,5 +79,14 @@
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="BACK"
android:id="@+id/backB"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true" />


</RelativeLayout>