ziver/ue-control
1
0
Fork 0
Code Pull requests Releases Activity

Reset button is now resetting graph and throughput texts

Browse source
This commit is contained in:
Ziver Koc 2014-08-11 13:56:32 +02:00
parent 77fe316f14
commit 97798ababa
4 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.idea/libraries/GraphView_3_1_2.xml generated
View file

@ -4,6 +4,8 @@
<root url="jar://$PROJECT_DIR$/app/libs/GraphView-3.1.2.jar!/" /> <root url="jar://$PROJECT_DIR$/app/libs/GraphView-3.1.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES>
<root url="jar://$PROJECT_DIR$/app/libs/GraphView-master.zip!/GraphView-master/src/main/java" />
</SOURCES>
</library> </library>
</component> </component>

10
app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSpeechCall.java
View file

@ -44,12 +44,13 @@ public class UeBehaviourSpeechCall extends UeBehaviour{
TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
// Start Call // Start Call
log.debug("Calling phone"); log.debug("Starting Call");
CallUtil.startCall(phoneNumber); CallUtil.startCall(phoneNumber);
Thread.sleep(1000);
// Wait for call to start // Wait for call to start
log.debug("Waiting for an answer"); log.debug("Waiting for an answer");
while(tm.getCallState() != TelephonyManager.CALL_STATE_OFFHOOK){ while(tm.getCallState() == TelephonyManager.CALL_STATE_RINGING){
if(super.stopExecution()) if(super.stopExecution())
return; return;
super.setProgress(0.1f); super.setProgress(0.1f);
@ -58,10 +59,11 @@ public class UeBehaviourSpeechCall extends UeBehaviour{
log.debug("Starting call timer"); log.debug("Starting call timer");
int elapsedTime = 0; int elapsedTime = 0;
while(elapsedTime < length){ int lengthMillisec = length*1000;
while(elapsedTime < lengthMillisec){
if(super.stopExecution()) if(super.stopExecution())
return; return;
super.setProgress((float)elapsedTime/length); super.setProgress((float)elapsedTime/lengthMillisec);
Thread.sleep(SLEEP_PERIOD); Thread.sleep(SLEEP_PERIOD);
elapsedTime += SLEEP_PERIOD; elapsedTime += SLEEP_PERIOD;
} }

5
app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
View file

@ -168,7 +168,10 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference
return true; return true;
} }
else if (id == R.id.action_reset) { else if (id == R.id.action_reset) {
currentExecutor.reset(); if(currentExecutor != null)
currentExecutor.reset();
if(statusFragment != null)
statusFragment.reset();
updateExecutionState(); updateExecutionState();
} }
else if (id == R.id.action_edit) { else if (id == R.id.action_edit) {

21
app/src/main/java/com/ericsson/uecontrol/gui/fragments/StatusFragment.java
View file

@ -62,11 +62,12 @@ public class StatusFragment extends Fragment {
rat_type = (TextView) view.findViewById(R.id.rat_type); rat_type = (TextView) view.findViewById(R.id.rat_type);
// Init the graph // Init the graph
GraphViewData[] zeroPoint = new GraphViewData[]{new GraphViewData(0, 0)};
if(downGraph == null) if(downGraph == null)
downGraph = new GraphViewSeries("Download Throughput", new GraphViewSeriesStyle(Color.GREEN, 3), zeroPoint); downGraph = new GraphViewSeries("Download Throughput", new GraphViewSeriesStyle(Color.GREEN, 3),
new GraphViewData[]{new GraphViewData(0, 0)});
if(upGraph == null) if(upGraph == null)
upGraph = new GraphViewSeries("Upload Throughput", new GraphViewSeriesStyle(Color.RED, 3), zeroPoint); upGraph = new GraphViewSeries("Upload Throughput", new GraphViewSeriesStyle(Color.RED, 3),
new GraphViewData[]{new GraphViewData(0, 0)});
LineGraphView graphView = new LineGraphView(this.getActivity(), "GraphViewDemo"); LineGraphView graphView = new LineGraphView(this.getActivity(), "GraphViewDemo");
graphView.addSeries(downGraph); graphView.addSeries(downGraph);
@ -130,6 +131,20 @@ public class StatusFragment extends Fragment {
} }
} }
public void reset(){
if(downGraph != null)
downGraph.resetData(new GraphViewData[]{new GraphViewData(0, 0)});
if(upGraph != null)
upGraph.resetData(new GraphViewData[]{new GraphViewData(0, 0)});
x = 0;
down_speed.post(new Runnable() {
@Override
public void run() {
down_speed.setText(ThroughputCalculator.getBitThroughputString(0));
up_speed.setText(ThroughputCalculator.getBitThroughputString(0));
}
});
}
} }