-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fixed stream performance, now it will load only visible cameras.
* Fixed bug #4 * Fixed bug #9 * Fixed bug #6 * Fixed bug #5 Signed-off-by: Developer From Jokela <developerfromjokela@gmail.com>
- Loading branch information
1 parent
0da8714
commit 26bd22a
Showing
142 changed files
with
18,289 additions
and
380 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
app/src/main/java/com/developerfromjokela/motioneyeclient/classes/CameraImageError.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package com.developerfromjokela.motioneyeclient.classes; | ||
|
||
public class CameraImageError { | ||
private String errorCode; | ||
private String errorCause; | ||
private boolean displayRetry = true; | ||
|
||
public CameraImageError(String errorCode, String errorCause, boolean displayRetry) { | ||
this.errorCode = errorCode; | ||
this.errorCause = errorCause; | ||
this.displayRetry = displayRetry; | ||
} | ||
|
||
public String getErrorCode() { | ||
return errorCode; | ||
} | ||
|
||
public void setErrorCode(String errorCode) { | ||
this.errorCode = errorCode; | ||
} | ||
|
||
public String getErrorCause() { | ||
return errorCause; | ||
} | ||
|
||
public void setErrorCause(String errorCause) { | ||
this.errorCause = errorCause; | ||
} | ||
|
||
public boolean isDisplayRetry() { | ||
return displayRetry; | ||
} | ||
|
||
public void setDisplayRetry(boolean displayRetry) { | ||
this.displayRetry = displayRetry; | ||
} | ||
} |
81 changes: 81 additions & 0 deletions
81
app/src/main/java/com/developerfromjokela/motioneyeclient/classes/CameraImageFrame.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
package com.developerfromjokela.motioneyeclient.classes; | ||
|
||
import android.graphics.Bitmap; | ||
|
||
import java.sql.Time; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
|
||
/** | ||
* This class is for video frame transmitting to the RecyclerView | ||
*/ | ||
public class CameraImageFrame { | ||
private Camera camera; | ||
private Device device; | ||
private Bitmap bitmap; | ||
private boolean initialLoadDone = false; | ||
private String frameRateText = ""; | ||
private CameraImageError error = null; | ||
private List<Long> times = new ArrayList<>(); | ||
|
||
|
||
public CameraImageFrame(Camera camera, Device device, Bitmap bitmap, boolean initialLoadDone) { | ||
this.camera = camera; | ||
this.device = device; | ||
this.bitmap = bitmap; | ||
this.initialLoadDone = initialLoadDone; | ||
} | ||
|
||
public List<Long> getTimes() { | ||
return times; | ||
} | ||
|
||
public CameraImageError getError() { | ||
return error; | ||
} | ||
|
||
public void setError(CameraImageError error) { | ||
this.error = error; | ||
} | ||
|
||
public String getFrameRateText() { | ||
return frameRateText; | ||
} | ||
|
||
public void setFrameRateText(String frameRateText) { | ||
this.frameRateText = frameRateText; | ||
} | ||
|
||
public Camera getCamera() { | ||
return camera; | ||
} | ||
|
||
public void setCamera(Camera camera) { | ||
this.camera = camera; | ||
} | ||
|
||
public Device getDevice() { | ||
return device; | ||
} | ||
|
||
public void setDevice(Device device) { | ||
this.device = device; | ||
} | ||
|
||
public Bitmap getBitmap() { | ||
return bitmap; | ||
} | ||
|
||
public void setBitmap(Bitmap bitmap) { | ||
this.bitmap = bitmap; | ||
} | ||
|
||
public boolean isInitialLoadDone() { | ||
return initialLoadDone; | ||
} | ||
|
||
public void setInitialLoadDone(boolean initialLoadDone) { | ||
this.initialLoadDone = initialLoadDone; | ||
} | ||
} |
31 changes: 31 additions & 0 deletions
31
app/src/main/java/com/developerfromjokela/motioneyeclient/classes/ErrorResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package com.developerfromjokela.motioneyeclient.classes; | ||
|
||
import com.google.gson.annotations.SerializedName; | ||
|
||
public class ErrorResponse { | ||
@SerializedName("prompt") | ||
private boolean prompt; | ||
@SerializedName("error") | ||
private String error; | ||
|
||
public ErrorResponse(boolean prompt, String error) { | ||
this.prompt = prompt; | ||
this.error = error; | ||
} | ||
|
||
public boolean isPrompt() { | ||
return prompt; | ||
} | ||
|
||
public void setPrompt(boolean prompt) { | ||
this.prompt = prompt; | ||
} | ||
|
||
public String getError() { | ||
return error; | ||
} | ||
|
||
public void setError(String error) { | ||
this.error = error; | ||
} | ||
} |
Oops, something went wrong.