Skip to content

GitLab

Commit 83dad761 authored by Thomas Krex's avatar Thomas Krex
Browse files

surfaceview: 

1. Versuch: SSurfaceView über imageview legen
	+Annotations und search results bleiben bei message update erhalten
	- sv bleibt nich transparent
	
2. Bitmap in surfaceView zeichnen , dann annotations drüber:
	+kein Flimmern
	-skalierung als problem: ganzer bildschirm wird ausgefüllt =>
		Seitenverhältnis geht verloren
	-wechsel zwischen fullscreen/extended nicht möglich, alter sf bleibt
	bestehen
	
	=> Direkt auf bitmap malen
		+ korrekte Skalierung
		+bei normalen Message aufkommen kein flimmern erkennbar
		+vllt kann man flimmern noch abstellen
		
-außerdem setTime methode korriegiert, framebufferupdates werden jetzt
berücksichtigt
=> enormer performance gewinn beim spulen und bein initialisieren der
Indizes
parent 3bc7b455
Hide whitespace changes
Inline Side-by-side
TTTCLient/src/tttclient/activities/PlayerActivity.java
View file @ 83dad761
......@@ -17,6 +17,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.SurfaceView;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;
......@@ -25,7 +26,6 @@ import android.widget.MediaController.MediaPlayerControl;
import android.widget.ScrollView;
import android.widget.SearchView;
import android.widget.SearchView.OnQueryTextListener;
import android.widget.SeekBar;
import android.widget.ViewSwitcher;
import com.example.test.R;
......@@ -40,7 +40,7 @@ public class PlayerActivity extends Activity implements MediaPlayerControl {
private Recording recording;
private MediaPlayer audioPlayer;
private MediaController audioController;
private SeekBar seekbar;
private SurfaceView surfaceView;
private int imgVHeight;
private int imgVWidth;
private SearchView searchView;
......@@ -51,11 +51,12 @@ public class PlayerActivity extends Activity implements MediaPlayerControl {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_player_main);
scrollView = (ScrollView) findViewById(R.id.indexScrollView);
// surfaceView = (SurfaceView) findViewById(R.id.playerView_fullscreen);
switcher = (ViewSwitcher) findViewById(R.id.viewSwitcher);
// desfault fullscreen
// default fullscreen
imgV = (ImageView) findViewById(R.id.playerView_fullscreen);
// switchLayout(0);
fileName = getIntent().getStringExtra(DownloadService.FILE_NAME);
setTitle(fileName);
......@@ -72,9 +73,6 @@ public class PlayerActivity extends Activity implements MediaPlayerControl {
final int screenHeight = display.getHeight(); // deprecated
audioController = new MediaController(this);
final int topContainerId1 = getResources().getIdentifier(
"mediacontroller_progress", "id", "android");
seekbar = (SeekBar) audioController.findViewById(topContainerId1);
audioController.setMediaPlayer(this);
audioController.setHorizontalScrollBarEnabled(false);
......@@ -83,60 +81,50 @@ public class PlayerActivity extends Activity implements MediaPlayerControl {
// dialog.setMessage("Reading File");
// dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
// TODO ProgressDialog anzeigen lassen
Thread t = new Thread(new Runnable() {
@Override
public void run() {
// dialog.show();
try {
recording = new Recording(getApplicationContext(), tttFile,
audioPlayer, imgV, scrollView, screenWidth,
screenHeight);
OnClickListener prevListener = new OnClickListener() {
// dialog.show();
try {
recording = new Recording(getApplicationContext(), tttFile,
audioPlayer, imgV, surfaceView, scrollView, screenWidth,
screenHeight);
@Override
public void onClick(View v) {
recording.previous();
OnClickListener prevListener = new OnClickListener() {
}
};
OnClickListener nextListener = new OnClickListener() {
@Override
public void onClick(View v) {
recording.previous();
@Override
public void onClick(View v) {
recording.next();
}
};
audioController.setPrevNextListeners(nextListener,
prevListener);
}
};
OnClickListener nextListener = new OnClickListener() {
audioController.setAnchorView(imgV);
@Override
public void onClick(View v) {
recording.next();
// dialog.dismiss();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
};
audioController.setPrevNextListeners(nextListener, prevListener);
}
});
t.start();
audioController.setAnchorView(imgV);
// dialog.dismiss();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// android.os.Message message = recording.graphicsContext().sizeHandler
// .obtainMessage(0, imgVArray);
// message.sendToTarget();
}
public void search(String word) {
if (recording.getIndex() != null)
recording.getIndex().search(word);
recording.highlightSearchResults(recording.graphicsContext()
.getCanvas());
// update display if recording is not playing
// if (!recording.isPlaying())
recording.graphicsContext().updateCanvas();
if (!recording.isPlaying())
recording.graphicsContext().updateCanvas();
}
......@@ -258,11 +246,13 @@ public class PlayerActivity extends Activity implements MediaPlayerControl {
case R.id.extend:
if (!isExtendend) {
switchLayout(1);
// switchSurface(1);
item.setIcon(getResources().getDrawable(
android.R.drawable.ic_input_delete));
isExtendend = true;
} else if (isExtendend) {
switchLayout(0);
// switchSurface(0);
item.setIcon(getResources().getDrawable(
android.R.drawable.ic_input_add));
isExtendend = false;
......@@ -281,14 +271,15 @@ public class PlayerActivity extends Activity implements MediaPlayerControl {
if (index == 0) {
imgV = (ImageView) findViewById(R.id.playerView_fullscreen);
recording.graphicsContext().setImageView(imgV);
recording.focusCurrentIndexEntry(recording.getLastIndexFired() - 1);
// recording.focusCurrentIndexEntry(recording.getLastIndexFired() -
// 1);
switcher.setDisplayedChild(0);
}
// extended View
if (index == 1) {
imgV = (ImageView) findViewById(R.id.playerView_extended);
recording.graphicsContext().setImageView(imgV);
recording.graphicsContext().setImageView(imgV);
recording.graphicsContext().refresh();
switcher.setDisplayedChild(1);
......@@ -297,4 +288,21 @@ public class PlayerActivity extends Activity implements MediaPlayerControl {
}
void switchSurface(int index) {
if (index == 0) {
surfaceView.setVisibility(View.INVISIBLE);
surfaceView = (SurfaceView) findViewById(R.id.playerView_fullscreen);
recording.graphicsContext().setSurfaceView(surfaceView);
// recording.focusCurrentIndexEntry(recording.getLastIndexFired() -
// 1);
switcher.setDisplayedChild(0);
}
if (index == 1) {
surfaceView.setVisibility(View.INVISIBLE);
surfaceView = (SurfaceView) findViewById(R.id.playerView_extended);
recording.graphicsContext().setSurfaceView(surfaceView);
recording.graphicsContext().updateOverlay();
}
}
}
TTTCLient/src/tttclient/messages/Message.java
View file @ 83dad761
......@@ -229,9 +229,9 @@ public abstract class Message {
// break;
default:
System.out.println("skipping unsupported message: Encoding = "
+ Constants.encodingToString(encoding) + "\t" + size
+ " bytes");
// System.out.println("skipping unsupported message: Encoding = "
// + Constants.encodingToString(encoding) + "\t" + size
// + " bytes");
do {
size -= in.skipBytes(size);
} while (size > 0);
......
TTTCLient/src/tttclient/messages/Messages.java
View file @ 83dad761
......@@ -34,6 +34,7 @@ import tttclient.messages.annotations.Annotation;
import tttclient.messages.annotations.DeleteAllAnnotation;
import tttclient.ttt.Constants;
import tttclient.ttt.Recording;
import android.graphics.Rect;
import android.util.Log;
public class Messages {
......@@ -287,49 +288,52 @@ public class Messages {
}
// message is part of keyframe, because it covers unset pixels
// if (message instanceof FramebufferUpdateMessage) {
// if (coveredCounter < full) {
// update covered area
// TODO convert to android
// Rect rectangle = ((FramebufferUpdateMessage) message)
// .getBounds();
// if (message instanceof WhiteboardMessage)
// rectangle = new Rect(0, 0,
// recording.prefs.framebufferWidth,
// recording.prefs.framebufferHeight);
//
// // graphicsContext.memGraphics.setColor(Color.CYAN);
// //
// graphicsContext.memGraphics.fillRect(rectangle.x,rectangle.y,rectangle.width,rectangle.height);
//
// boolean add = false;
//
// // set covered pixels
// for (int y = 0; y < rectangle.height(); y++)
// for (int x = 0; x < rectangle.width(); x++)
// try {
// if (!covered[rectangle.left + x][rectangle.top
// + y]) {
// // add only once (outside loop)
// add = true;
//
// // mark pixel
// coveredCounter++;
// covered[rectangle.left + x][rectangle.top
// + y] = true;
// }
// } catch (ArrayIndexOutOfBoundsException e) {
// // possibly caused by changing the screen
// // resolution (which is not supported by the
// // TTT)
// }
// // add at beginning
// if (add)
// collected.add(0, message);
// }
// }
if (message instanceof FramebufferUpdateMessage) {
if (coveredCounter < full) {
// update covered area
// TODO convert to android
Rect rectangle = ((FramebufferUpdateMessage) message)
.getBounds();
if (message instanceof WhiteboardMessage)
rectangle = new Rect(
0,
0,
recording.getProtocolPreferences().framebufferWidth,
recording.getProtocolPreferences().framebufferHeight);
// graphicsContext.memGraphics.setColor(Color.CYAN);
//
// graphicsContext.memGraphics.fillRect(rectangle.left,
// rectangle.y, rectangle.width, rectangle.height);
boolean add = false;
// set covered pixels
for (int y = 0; y < rectangle.height(); y++)
for (int x = 0; x < rectangle.width(); x++)
try {
if (!covered[rectangle.left + x][rectangle.top
+ y]) {
// add only once (outside loop)
add = true;
// mark pixel
coveredCounter++;
covered[rectangle.left + x][rectangle.top
+ y] = true;
}
} catch (ArrayIndexOutOfBoundsException e) {
// possibly caused by changing the screen
// resolution (which is not supported by the
// TTT)
}
// add at beginning
if (add)
collected.add(0, message);
}
}
// all annotation since last deleteAll
else if (message instanceof Annotation) {
......@@ -379,7 +383,6 @@ public class Messages {
Log.d("Messages", "setting recording next message to " + newNext);
}
}
/*******************************************************************************************************************
......
TTTCLient/src/tttclient/services/ParseService.java
View file @ 83dad761
......@@ -27,6 +27,8 @@ public class ParseService extends IntentService {
static final String DESCRIPTION = "description";
static final String LINK = "link";
static final String TITLE = "title";
static final String ENCLOSURE = "enclosure";
static final String LENGTH = "length";
private URL feedUrl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment