-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
EDGECLOUD-2855 EDGECLOUD-2974 EDGECLOUD-3064 HA and more (#210)
* EDGECLOUD-2855 EDGECLOUD-2974 EDGECLOUD-3064 HA and more * Latest lib versions * Added Auto Failover preference, and fixed a few bugs
- Loading branch information
1 parent
94d0f58
commit d8e75f6
Showing
27 changed files
with
1,122 additions
and
209 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,20 @@ | ||
| [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":55,"versionName":"1.1.6","enabled":true,"outputFile":"MobiledgeXSDKDemo-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"MobiledgeXSDKDemo-release.apk","properties":{}}] | ||
| { | ||
| "version": 1, | ||
| "artifactType": { | ||
| "type": "APK", | ||
| "kind": "Directory" | ||
| }, | ||
| "applicationId": "com.mobiledgex.sdkdemo", | ||
| "variantName": "release", | ||
| "elements": [ | ||
| { | ||
| "type": "SINGLE", | ||
| "filters": [], | ||
| "properties": [], | ||
| "versionCode": 56, | ||
| "versionName": "56", | ||
| "enabled": true, | ||
| "outputFile": "MobiledgeXSDKDemo-release.apk" | ||
| } | ||
| ] | ||
| } |
24 changes: 16 additions & 8 deletions
24
android/MobiledgeXSDKDemo/app/src/main/assets/about_dialog.html
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 |
|---|---|---|
| @@ -1,23 +1,31 @@ | ||
| <p>Version: ${appVersion}</p> | ||
| <p>Version: ${androidAppVersion}</p> | ||
| <p>This app uses the MobiledgeX Matching Engine SDK to find and display on a map all of the | ||
| Cloudlets running the backend app that provides the speed test and computer vision services | ||
| needed by this app. It uses the following information for the SDK API calls:</p> | ||
| Cloudlets running the backend app that provides the speed test and computer vision services | ||
| needed by this app. It uses the following information for the SDK API calls:</p> | ||
| <table border="2"> | ||
| <tbody> | ||
| <tr> | ||
| <td><strong>appName</strong></td> | ||
| <td>MobiledgeX SDK Demo</td> | ||
| <td>${appName}</td> | ||
| </tr> | ||
| <tr> | ||
| <td><strong>devName</strong></td> | ||
| <td>MobiledgeX</td> | ||
| <td><strong>orgName</strong></td> | ||
| <td>${orgName}</td> | ||
| </tr> | ||
| <tr> | ||
| <td><strong>appVer</strong></td> | ||
| <td>2.0</td> | ||
| <td>${appVersion}</td> | ||
| </tr> | ||
| <tr> | ||
| <td><strong>Operator</strong></td> | ||
| <td>${operator}</td> | ||
| </tr> | ||
| <tr> | ||
| <td><strong>Region</strong></td> | ||
| <td>${region}</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| <p>The Operator name and Region selection values can be changed in the General Settings of the app.</p> | ||
| <p>These values can be changed in the General Settings of the app.</p> | ||
| <p>To learn more about the MobiledgeX SDK, see <a href="https://developers.mobiledgex.com/">developers.mobiledgex.com</a> for documentation and a Getting Started guide.</p> | ||
| <p>Source code for this app is available on <a href="https://github.com/mobiledgex/edge-cloud-sampleapps/tree/master/android/MobiledgeXSDKDemo">Github</a>.</p> |
278 changes: 202 additions & 76 deletions
278
android/MobiledgeXSDKDemo/app/src/main/java/com/mobiledgex/sdkdemo/MainActivity.java
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
40 changes: 40 additions & 0 deletions
40
...biledgeXSDKDemo/computervision/src/main/java/com/mobiledgex/computervision/EventItem.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,40 @@ | ||
| package com.mobiledgex.computervision; | ||
|
|
||
| import android.text.format.DateFormat; | ||
|
|
||
| import java.util.Calendar; | ||
| import java.util.TimeZone; | ||
|
|
||
| /** | ||
| * An Activity item. | ||
| */ | ||
| public class EventItem { | ||
| public final long timestamp; | ||
| public final String timestampText; | ||
| public final String id; | ||
| public final String content; | ||
| public enum EventType { | ||
| DEBUG, | ||
| INFO, | ||
| WARN, | ||
| ERROR | ||
| } | ||
| public EventType eventType; | ||
|
|
||
| public EventItem(EventType type, String content) { | ||
| eventType = type; | ||
| timestamp = System.currentTimeMillis(); | ||
| Calendar cal = Calendar.getInstance(TimeZone.getDefault()); | ||
| cal.setTimeInMillis(timestamp); | ||
| // TODO: Update to use device's configured date and time format. | ||
| // this.timestampText = DateFormat.format("MM-dd-yyyy HH:mm:ss", cal).toString(); | ||
| timestampText = DateFormat.format("HH:mm:ss", cal).toString(); | ||
| id = ""+timestamp; | ||
| this.content = content; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return timestamp + " " + content; | ||
| } | ||
| } |
Oops, something went wrong.