Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
otgc-android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OTGC
otgc-android
Commits
f86c4f56
Commit
f86c4f56
authored
Mar 12, 2019
by
Javier Guerra Melgares
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OTGC Android v1.3.0
parent
1253c816
Pipeline
#47
failed with stages
in 13 seconds
Changes
126
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
126 changed files
with
2853 additions
and
514 deletions
+2853
-514
.gitignore
.gitignore
+1
-0
build.gradle
build.gradle
+1
-1
gradle.properties
gradle.properties
+4
-0
otgc/build.gradle
otgc/build.gradle
+46
-44
otgc/src/androidTest/java/org/openconnectivity/otgc/accesscontrol/data/repository/AmsRepositoryTest.java
...otgc/accesscontrol/data/repository/AmsRepositoryTest.java
+1
-1
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/persistence/UserDaoTest.java
...onnectivity/otgc/common/data/persistence/UserDaoTest.java
+4
-4
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/repository/IORepositoryTest.java
...ctivity/otgc/common/data/repository/IORepositoryTest.java
+2
-2
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/repository/PlatformRepositoryTest.java
...y/otgc/common/data/repository/PlatformRepositoryTest.java
+2
-2
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/repository/ProvisioningRepositoryTest.java
...gc/common/data/repository/ProvisioningRepositoryTest.java
+2
-2
otgc/src/main/AndroidManifest.xml
otgc/src/main/AndroidManifest.xml
+5
-0
otgc/src/main/java/org/openconnectivity/otgc/about/presentation/view/AboutActivity.java
...nectivity/otgc/about/presentation/view/AboutActivity.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/domain/usecase/RetrieveVerticalResourcesUseCase.java
...trol/domain/usecase/RetrieveVerticalResourcesUseCase.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/view/AccessControlActivity.java
...ccesscontrol/presentation/view/AccessControlActivity.java
+9
-9
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/view/AccessControlAdapter.java
...accesscontrol/presentation/view/AccessControlAdapter.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/view/AceActivity.java
...ity/otgc/accesscontrol/presentation/view/AceActivity.java
+6
-6
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/viewmodel/AccessControlViewModel.java
...ontrol/presentation/viewmodel/AccessControlViewModel.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/viewmodel/AceViewModel.java
...gc/accesscontrol/presentation/viewmodel/AceViewModel.java
+3
-5
otgc/src/main/java/org/openconnectivity/otgc/client/data/repository/ResourceRepository.java
...ivity/otgc/client/data/repository/ResourceRepository.java
+24
-0
otgc/src/main/java/org/openconnectivity/otgc/client/domain/model/SerializableResource.java
...tivity/otgc/client/domain/model/SerializableResource.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/client/domain/usecase/UiFromSwaggerUseCase.java
...vity/otgc/client/domain/usecase/UiFromSwaggerUseCase.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/DeviceInfoAdapter.java
...vity/otgc/client/presentation/view/DeviceInfoAdapter.java
+2
-2
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/GenericClientActivity.java
.../otgc/client/presentation/view/GenericClientActivity.java
+12
-12
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/IntrospectedFragment.java
...y/otgc/client/presentation/view/IntrospectedFragment.java
+5
-5
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/ResourceFragment.java
...ivity/otgc/client/presentation/view/ResourceFragment.java
+192
-22
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/viewmodel/GenericClientViewModel.java
...client/presentation/viewmodel/GenericClientViewModel.java
+2
-2
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/viewmodel/ResourceViewModel.java
...otgc/client/presentation/viewmodel/ResourceViewModel.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/common/constant/OcfResourceType.java
...penconnectivity/otgc/common/constant/OcfResourceType.java
+41
-0
otgc/src/main/java/org/openconnectivity/otgc/common/data/entity/DeviceEntity.java
...penconnectivity/otgc/common/data/entity/DeviceEntity.java
+4
-4
otgc/src/main/java/org/openconnectivity/otgc/common/data/entity/UserEntity.java
.../openconnectivity/otgc/common/data/entity/UserEntity.java
+5
-5
otgc/src/main/java/org/openconnectivity/otgc/common/data/persistence/dao/DeviceDao.java
...nectivity/otgc/common/data/persistence/dao/DeviceDao.java
+5
-5
otgc/src/main/java/org/openconnectivity/otgc/common/data/persistence/dao/UserDao.java
...onnectivity/otgc/common/data/persistence/dao/UserDao.java
+4
-4
otgc/src/main/java/org/openconnectivity/otgc/common/data/persistence/database/Converters.java
...ity/otgc/common/data/persistence/database/Converters.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/common/data/persistence/database/OtgcDb.java
...ctivity/otgc/common/data/persistence/database/OtgcDb.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/common/data/repository/IotivityRepository.java
...ivity/otgc/common/data/repository/IotivityRepository.java
+101
-61
otgc/src/main/java/org/openconnectivity/otgc/common/data/repository/PermissionRepository.java
...ity/otgc/common/data/repository/PermissionRepository.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/common/data/repository/WlanRepository.java
...nectivity/otgc/common/data/repository/WlanRepository.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/common/domain/usecase/InitializeIotivityUseCase.java
...otgc/common/domain/usecase/InitializeIotivityUseCase.java
+8
-5
otgc/src/main/java/org/openconnectivity/otgc/common/logger/FileLoggingTree.java
.../openconnectivity/otgc/common/logger/FileLoggingTree.java
+52
-1
otgc/src/main/java/org/openconnectivity/otgc/common/presentation/view/EmptyRecyclerView.java
...vity/otgc/common/presentation/view/EmptyRecyclerView.java
+2
-2
otgc/src/main/java/org/openconnectivity/otgc/common/presentation/view/RecyclerWithSwipeFragment.java
...c/common/presentation/view/RecyclerWithSwipeFragment.java
+8
-7
otgc/src/main/java/org/openconnectivity/otgc/common/presentation/viewmodel/BaseViewModel.java
...ity/otgc/common/presentation/viewmodel/BaseViewModel.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/common/presentation/viewmodel/Response.java
...ectivity/otgc/common/presentation/viewmodel/Response.java
+2
-2
otgc/src/main/java/org/openconnectivity/otgc/common/presentation/viewmodel/ViewModelError.java
...ty/otgc/common/presentation/viewmodel/ViewModelError.java
+2
-2
otgc/src/main/java/org/openconnectivity/otgc/common/presentation/viewmodel/ViewModelFactory.java
.../otgc/common/presentation/viewmodel/ViewModelFactory.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/credential/presentation/view/CredActivity.java
...ivity/otgc/credential/presentation/view/CredActivity.java
+6
-6
otgc/src/main/java/org/openconnectivity/otgc/credential/presentation/view/CredentialAdapter.java
.../otgc/credential/presentation/view/CredentialAdapter.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/credential/presentation/view/CredentialsActivity.java
...tgc/credential/presentation/view/CredentialsActivity.java
+9
-9
otgc/src/main/java/org/openconnectivity/otgc/credential/presentation/viewmodel/CredViewModel.java
...otgc/credential/presentation/viewmodel/CredViewModel.java
+2
-2
otgc/src/main/java/org/openconnectivity/otgc/credential/presentation/viewmodel/CredentialsViewModel.java
...edential/presentation/viewmodel/CredentialsViewModel.java
+2
-2
otgc/src/main/java/org/openconnectivity/otgc/devicelist/data/repository/DoxsRepository.java
...ivity/otgc/devicelist/data/repository/DoxsRepository.java
+50
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/data/repository/EasySetupRepository.java
.../otgc/devicelist/data/repository/EasySetupRepository.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/model/Device.java
...openconnectivity/otgc/devicelist/domain/model/Device.java
+10
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/model/Role.java
...g/openconnectivity/otgc/devicelist/domain/model/Role.java
+29
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/usecase/GetDeviceRoleUseCase.java
.../otgc/devicelist/domain/usecase/GetDeviceRoleUseCase.java
+66
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/usecase/OffboardUseCase.java
...ivity/otgc/devicelist/domain/usecase/OffboardUseCase.java
+5
-13
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/usecase/OnboardUseCase.java
...tivity/otgc/devicelist/domain/usecase/OnboardUseCase.java
+7
-13
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/usecase/PairwiseDevicesUseCase.java
...tgc/devicelist/domain/usecase/PairwiseDevicesUseCase.java
+60
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/usecase/ScanDevicesUseCase.java
...ty/otgc/devicelist/domain/usecase/ScanDevicesUseCase.java
+3
-27
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/usecase/SetRfotmModeUseCase.java
...y/otgc/devicelist/domain/usecase/SetRfotmModeUseCase.java
+4
-2
otgc/src/main/java/org/openconnectivity/otgc/devicelist/domain/usecase/UnlinkDevicesUseCase.java
.../otgc/devicelist/domain/usecase/UnlinkDevicesUseCase.java
+52
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/ActionModeController.java
...gc/devicelist/presentation/view/ActionModeController.java
+125
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/DeviceListActivity.java
...otgc/devicelist/presentation/view/DeviceListActivity.java
+7
-5
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/DoxsFragment.java
...ivity/otgc/devicelist/presentation/view/DoxsFragment.java
+125
-17
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/DoxsListAdapter.java
...ty/otgc/devicelist/presentation/view/DoxsListAdapter.java
+45
-15
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/MyItemDetail.java
...ivity/otgc/devicelist/presentation/view/MyItemDetail.java
+49
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/MyItemKeyProvider.java
.../otgc/devicelist/presentation/view/MyItemKeyProvider.java
+50
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/MyItemLookup.java
...ivity/otgc/devicelist/presentation/view/MyItemLookup.java
+53
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/view/ViewHolderWithDetails.java
...c/devicelist/presentation/view/ViewHolderWithDetails.java
+29
-0
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/viewmodel/DeviceListViewModel.java
...evicelist/presentation/viewmodel/DeviceListViewModel.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/viewmodel/DoxsViewModel.java
...otgc/devicelist/presentation/viewmodel/DoxsViewModel.java
+53
-5
otgc/src/main/java/org/openconnectivity/otgc/devicelist/presentation/viewmodel/SharedViewModel.java
...gc/devicelist/presentation/viewmodel/SharedViewModel.java
+4
-4
otgc/src/main/java/org/openconnectivity/otgc/di/AppInjector.java
...c/main/java/org/openconnectivity/otgc/di/AppInjector.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/di/AppModule.java
...src/main/java/org/openconnectivity/otgc/di/AppModule.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/di/BuildersModule.java
...ain/java/org/openconnectivity/otgc/di/BuildersModule.java
+4
-0
otgc/src/main/java/org/openconnectivity/otgc/di/ViewModelKey.java
.../main/java/org/openconnectivity/otgc/di/ViewModelKey.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/di/ViewModelModule.java
...in/java/org/openconnectivity/otgc/di/ViewModelModule.java
+8
-2
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/domain/usecase/LinkRolesForClientUseCase.java
...linkedroles/domain/usecase/LinkRolesForClientUseCase.java
+47
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/domain/usecase/LinkRolesForServerUseCase.java
...linkedroles/domain/usecase/LinkRolesForServerUseCase.java
+67
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/domain/usecase/RetrieveLinkedRolesForClientUseCase.java
...s/domain/usecase/RetrieveLinkedRolesForClientUseCase.java
+62
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/domain/usecase/RetrieveLinkedRolesForServerUseCase.java
...s/domain/usecase/RetrieveLinkedRolesForServerUseCase.java
+62
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/domain/usecase/UnlinkRoleForClientUseCase.java
...inkedroles/domain/usecase/UnlinkRoleForClientUseCase.java
+62
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/domain/usecase/UnlinkRoleForServerUseCase.java
...inkedroles/domain/usecase/UnlinkRoleForServerUseCase.java
+63
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/presentation/view/LinkedRolesActivity.java
...gc/linkedroles/presentation/view/LinkedRolesActivity.java
+199
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/presentation/view/LinkedRolesAdapter.java
...tgc/linkedroles/presentation/view/LinkedRolesAdapter.java
+157
-0
otgc/src/main/java/org/openconnectivity/otgc/linkedroles/presentation/viewmodel/LinkedRolesViewModel.java
...kedroles/presentation/viewmodel/LinkedRolesViewModel.java
+172
-0
otgc/src/main/java/org/openconnectivity/otgc/login/presentation/view/LoginActivity.java
...nectivity/otgc/login/presentation/view/LoginActivity.java
+6
-6
otgc/src/main/java/org/openconnectivity/otgc/login/presentation/viewmodel/LoginViewModel.java
...ity/otgc/login/presentation/viewmodel/LoginViewModel.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/logviewer/presentation/view/LogViewerActivity.java
...y/otgc/logviewer/presentation/view/LogViewerActivity.java
+28
-4
otgc/src/main/java/org/openconnectivity/otgc/settings/presentation/view/AppCompatPreferenceActivity.java
...ttings/presentation/view/AppCompatPreferenceActivity.java
+6
-6
otgc/src/main/java/org/openconnectivity/otgc/settings/presentation/view/SettingsActivity.java
...ity/otgc/settings/presentation/view/SettingsActivity.java
+1
-1
otgc/src/main/java/org/openconnectivity/otgc/splash/presentation/view/SplashActivity.java
...ctivity/otgc/splash/presentation/view/SplashActivity.java
+8
-8
otgc/src/main/java/org/openconnectivity/otgc/splash/presentation/viewmodel/SplashViewModel.java
...y/otgc/splash/presentation/viewmodel/SplashViewModel.java
+4
-4
otgc/src/main/java/org/openconnectivity/otgc/wlanscan/domain/usecase/ConnectToWiFiUseCase.java
...ty/otgc/wlanscan/domain/usecase/ConnectToWiFiUseCase.java
+1
-7
otgc/src/main/java/org/openconnectivity/otgc/wlanscan/presentation/view/WlanScanActivity.java
...ity/otgc/wlanscan/presentation/view/WlanScanActivity.java
+10
-10
otgc/src/main/java/org/openconnectivity/otgc/wlanscan/presentation/view/WlanScanAdapter.java
...vity/otgc/wlanscan/presentation/view/WlanScanAdapter.java
+3
-3
otgc/src/main/java/org/openconnectivity/otgc/wlanscan/presentation/viewmodel/WlanScanViewModel.java
...gc/wlanscan/presentation/viewmodel/WlanScanViewModel.java
+3
-3
otgc/src/main/res/color/device_background.xml
otgc/src/main/res/color/device_background.xml
+27
-0
otgc/src/main/res/drawable-v23/ic_ocf_logo_white.xml
otgc/src/main/res/drawable-v23/ic_ocf_logo_white.xml
+44
-0
otgc/src/main/res/drawable-v23/splash.xml
otgc/src/main/res/drawable-v23/splash.xml
+30
-0
otgc/src/main/res/drawable/splash.xml
otgc/src/main/res/drawable/splash.xml
+6
-4
otgc/src/main/res/layout/activity_access_control.xml
otgc/src/main/res/layout/activity_access_control.xml
+5
-5
otgc/src/main/res/layout/activity_ace.xml
otgc/src/main/res/layout/activity_ace.xml
+14
-14
otgc/src/main/res/layout/activity_cred.xml
otgc/src/main/res/layout/activity_cred.xml
+11
-11
otgc/src/main/res/layout/activity_credentials.xml
otgc/src/main/res/layout/activity_credentials.xml
+5
-5
otgc/src/main/res/layout/activity_devices.xml
otgc/src/main/res/layout/activity_devices.xml
+5
-5
otgc/src/main/res/layout/activity_generic_client.xml
otgc/src/main/res/layout/activity_generic_client.xml
+3
-3
otgc/src/main/res/layout/activity_linked_roles.xml
otgc/src/main/res/layout/activity_linked_roles.xml
+59
-0
otgc/src/main/res/layout/activity_login.xml
otgc/src/main/res/layout/activity_login.xml
+6
-6
otgc/src/main/res/layout/activity_logviewer.xml
otgc/src/main/res/layout/activity_logviewer.xml
+42
-0
otgc/src/main/res/layout/activity_wlan.xml
otgc/src/main/res/layout/activity_wlan.xml
+8
-8
otgc/src/main/res/layout/dialog_wlan_input_password.xml
otgc/src/main/res/layout/dialog_wlan_input_password.xml
+3
-3
otgc/src/main/res/layout/dialog_wlan_scan.xml
otgc/src/main/res/layout/dialog_wlan_scan.xml
+3
-3
otgc/src/main/res/layout/fragment_recycler_with_swipe.xml
otgc/src/main/res/layout/fragment_recycler_with_swipe.xml
+2
-2
otgc/src/main/res/layout/item_ace.xml
otgc/src/main/res/layout/item_ace.xml
+2
-2
otgc/src/main/res/layout/item_cred.xml
otgc/src/main/res/layout/item_cred.xml
+2
-2
otgc/src/main/res/layout/item_device.xml
otgc/src/main/res/layout/item_device.xml
+9
-3
otgc/src/main/res/layout/item_info.xml
otgc/src/main/res/layout/item_info.xml
+2
-2
otgc/src/main/res/layout/item_role.xml
otgc/src/main/res/layout/item_role.xml
+66
-0
otgc/src/main/res/layout/item_wlan.xml
otgc/src/main/res/layout/item_wlan.xml
+2
-2
otgc/src/main/res/layout/toolbar.xml
otgc/src/main/res/layout/toolbar.xml
+1
-1
otgc/src/main/res/menu/menu_devices_selection.xml
otgc/src/main/res/menu/menu_devices_selection.xml
+37
-0
otgc/src/main/res/menu/menu_owned_devices.xml
otgc/src/main/res/menu/menu_owned_devices.xml
+4
-0
otgc/src/main/res/values-es/strings.xml
otgc/src/main/res/values-es/strings.xml
+14
-0
otgc/src/main/res/values/strings.xml
otgc/src/main/res/values/strings.xml
+17
-1
otgc/src/main/res/values/styles.xml
otgc/src/main/res/values/styles.xml
+8
-0
otgc/src/test/java/org/openconnectivity/otgc/common/data/repository/UserRepositoryTest.java
...ivity/otgc/common/data/repository/UserRepositoryTest.java
+1
-1
No files found.
.gitignore
View file @
f86c4f56
...
...
@@ -6,3 +6,4 @@
/build
/captures
.externalNativeBuild
/iotivity-base-release/*.aar
build.gradle
View file @
f86c4f56
...
...
@@ -7,7 +7,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.2.
0
'
classpath
'com.android.tools.build:gradle:3.2.
1
'
// NOTE: Do not place your application dependencies here; they belong
...
...
gradle.properties
View file @
f86c4f56
...
...
@@ -15,3 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# Android X: https://developer.android.com/topic/libraries/support-library/androidx-rn
android.enableJetifier
=
true
android.useAndroidX
=
true
otgc/build.gradle
View file @
f86c4f56
...
...
@@ -2,29 +2,36 @@ apply plugin: 'com.android.application'
apply
plugin:
'jacoco'
project
.
ext
{
supportLibraryVersion
=
"27.1.1"
daggerVersion
=
"2.15"
butterKnifeVersion
=
"8.8.1"
appCompatVersion
=
"1.0.2"
supportLibraryVersion
=
"1.0.0"
constraintLayoutVersion
=
"1.1.3"
materialVersion
=
"1.1.0-alpha01"
lifecycleVersion
=
"2.0.0"
roomVersion
=
"2.0.0"
daggerVersion
=
"2.17"
butterKnifeVersion
=
"9.0.0-rc2"
rxJavaVersion
=
"2.1.0"
rxAndroidVersion
=
"2.0.1"
lifecycleVersion
=
"1.1.1"
timberVersion
=
"4.7.0"
roomVersion
=
"1.1.1"
swaggerParserVersion
=
"1.0.38"
gsonVersion
=
"2.8.0"
cborVersion
=
"3.3.0"
spongyCastleVersion
=
"1.58.0.0"
junitVersion
=
"4.12"
mockitoVersion
=
"1.10.19"
testRunnerVersion
=
"1.1.1-alpha01"
espressoVersion
=
"3.1.1-alpha01"
}
android
{
compileSdkVersion
2
7
compileSdkVersion
2
8
defaultConfig
{
applicationId
"org.openconnectivity.otgc"
minSdkVersion
21
targetSdkVersion
2
7
targetSdkVersion
2
8
versionCode
13
versionName
"1.
2
.0"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
versionName
"1.
3
.0"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
compileOptions
{
sourceCompatibility
JavaVersion
.
VERSION_1_8
...
...
@@ -45,61 +52,56 @@ android {
}
dependencies
{
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
"com.android.support:appcompat-v7:$project.supportLibraryVersion"
implementation
"com.android.support:design:$project.supportLibraryVersion"
implementation
"com.android.support:cardview-v7:$project.supportLibraryVersion"
implementation
"com.android.support:support-v4:$project.supportLibraryVersion"
// Dagger core
// local modules
implementation
project
(
':iotivity-base-release'
)
implementation
project
(
':easy-setup-core'
)
// AndroidX: Support Library
implementation
"androidx.appcompat:appcompat:$project.appCompatVersion"
implementation
"androidx.recyclerview:recyclerview:$project.supportLibraryVersion"
implementation
"androidx.recyclerview:recyclerview-selection:$project.supportLibraryVersion"
implementation
"androidx.cardview:cardview:$project.supportLibraryVersion"
implementation
"androidx.legacy:legacy-support-v4:$project.supportLibraryVersion"
// AndroidX: ConstraintLayout
implementation
"androidx.constraintlayout:constraintlayout:$project.constraintLayoutVersion"
// Material Components
implementation
"com.google.android.material:material:$project.materialVersion"
// AndroidX: Lifecycle
implementation
"androidx.lifecycle:lifecycle-runtime:$project.lifecycleVersion"
implementation
"androidx.lifecycle:lifecycle-extensions:$project.lifecycleVersion"
annotationProcessor
"androidx.lifecycle:lifecycle-compiler:$project.lifecycleVersion"
// AndroidX: Room
implementation
"androidx.room:room-runtime:$project.roomVersion"
implementation
"androidx.room:room-rxjava2:$project.roomVersion"
annotationProcessor
"androidx.room:room-compiler:$project.roomVersion"
// Dagger
implementation
"com.google.dagger:dagger:$project.daggerVersion"
annotationProcessor
"com.google.dagger:dagger-compiler:$project.daggerVersion"
// Dagger Android
implementation
"com.google.dagger:dagger-android:$project.daggerVersion"
implementation
"com.google.dagger:dagger-android-support:$project.daggerVersion"
annotationProcessor
"com.google.dagger:dagger-android-processor:$project.daggerVersion"
// ButterKnife
implementation
"com.jakewharton:butterknife:$project.butterKnifeVersion"
annotationProcessor
"com.jakewharton:butterknife-compiler:$project.butterKnifeVersion"
// ReactiveX
implementation
"io.reactivex.rxjava2:rxjava:$project.rxJavaVersion"
implementation
"io.reactivex.rxjava2:rxandroid:$project.rxAndroidVersion"
// Timber
implementation
"com.jakewharton.timber:timber:$project.timberVersion"
// Lifecycle
implementation
"android.arch.lifecycle:runtime:$project.lifecycleVersion"
implementation
"android.arch.lifecycle:extensions:$project.lifecycleVersion"
annotationProcessor
"android.arch.lifecycle:compiler:$project.lifecycleVersion"
// Swagger
implementation
"io.swagger:swagger-parser:$project.swaggerParserVersion"
// Room
implementation
"android.arch.persistence.room:runtime:$project.roomVersion"
implementation
"android.arch.persistence.room:rxjava2:$project.roomVersion"
annotationProcessor
"android.arch.persistence.room:compiler:$project.roomVersion"
// Gson
implementation
"com.google.code.gson:gson:$project.gsonVersion"
// CBOR
implementation
"com.upokecenter:cbor:$project.cborVersion"
// Bouncy Castle Provider
// Spongy Castle
implementation
"com.madgag.spongycastle:core:$project.spongyCastleVersion"
implementation
"com.madgag.spongycastle:prov:$project.spongyCastleVersion"
implementation
"com.madgag.spongycastle:bcpkix-jdk15on:$project.spongyCastleVersion"
implementation
'com.android.support.constraint:constraint-layout:1.1.2'
testImplementation
'junit:junit:4.12'
testImplementation
'org.mockito:mockito-core:1.10.19'
androidTestImplementation
'com.android.support.test:runner:1.0.2'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.2'
implementation
project
(
':iotivity-base-release'
)
implementation
project
(
':easy-setup-core'
)
// JUnit
testImplementation
"junit:junit:$project.junitVersion"
// Mockito
testImplementation
"org.mockito:mockito-core:$project.mockitoVersion"
// AndroidX: Test
androidTestImplementation
"androidx.test:runner:$project.testRunnerVersion"
androidTestImplementation
"androidx.test.espresso:espresso-core:$project.espressoVersion"
}
otgc/src/androidTest/java/org/openconnectivity/otgc/accesscontrol/data/repository/AmsRepositoryTest.java
View file @
f86c4f56
...
...
@@ -22,7 +22,7 @@
package
org.openconnectivity.otgc.accesscontrol.data.repository
;
import
android
.support
.test.InstrumentationRegistry
;
import
android
x
.test.InstrumentationRegistry
;
import
org.iotivity.base.AceSubjectType
;
import
org.iotivity.base.OcException
;
...
...
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/persistence/UserDaoTest.java
View file @
f86c4f56
...
...
@@ -22,10 +22,10 @@
package
org.openconnectivity.otgc.common.data.persistence
;
import
android
.arch.persistence
.room.EmptyResultSetException
;
import
android
.arch.persistence
.room.Room
;
import
android
.support
.test.InstrumentationRegistry
;
import
android
.support
.test.runner.AndroidJUnit4
;
import
android
x
.room.EmptyResultSetException
;
import
android
x
.room.Room
;
import
android
x
.test.InstrumentationRegistry
;
import
android
x
.test.runner.AndroidJUnit4
;
import
org.junit.After
;
import
org.junit.Before
;
...
...
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/repository/IORepositoryTest.java
View file @
f86c4f56
...
...
@@ -22,8 +22,8 @@
package
org.openconnectivity.otgc.common.data.repository
;
import
android
.support
.test.InstrumentationRegistry
;
import
android
.support
.test.runner.AndroidJUnit4
;
import
android
x
.test.InstrumentationRegistry
;
import
android
x
.test.runner.AndroidJUnit4
;
import
org.junit.Before
;
import
org.junit.Test
;
...
...
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/repository/PlatformRepositoryTest.java
View file @
f86c4f56
...
...
@@ -22,8 +22,8 @@
package
org.openconnectivity.otgc.common.data.repository
;
import
android
.support
.test.InstrumentationRegistry
;
import
android
.support
.test.runner.AndroidJUnit4
;
import
android
x
.test.InstrumentationRegistry
;
import
android
x
.test.runner.AndroidJUnit4
;
import
org.iotivity.base.OcException
;
import
org.junit.Before
;
...
...
otgc/src/androidTest/java/org/openconnectivity/otgc/common/data/repository/ProvisioningRepositoryTest.java
View file @
f86c4f56
...
...
@@ -22,8 +22,8 @@
package
org.openconnectivity.otgc.common.data.repository
;
import
android
.support
.test.InstrumentationRegistry
;
import
android
.support
.test.runner.AndroidJUnit4
;
import
android
x
.test.InstrumentationRegistry
;
import
android
x
.test.runner.AndroidJUnit4
;
import
org.junit.After
;
import
org.junit.Before
;
...
...
otgc/src/main/AndroidManifest.xml
View file @
f86c4f56
...
...
@@ -69,6 +69,11 @@
android:name=
".client.presentation.view.GenericClientActivity"
android:configChanges=
"orientation|screenSize"
android:parentActivityName=
".devicelist.presentation.view.DeviceListActivity"
/>
<activity
android:name=
".linkedroles.presentation.view.LinkedRolesActivity"
android:label=
"@string/linked_roles_title"
android:configChanges=
"orientation|screenSize"
android:parentActivityName=
".devicelist.presentation.view.DeviceListActivity"
/>
<activity
android:name=
".logviewer.presentation.view.LogViewerActivity"
android:configChanges=
"orientation|screenSize"
...
...
otgc/src/main/java/org/openconnectivity/otgc/about/presentation/view/AboutActivity.java
View file @
f86c4f56
...
...
@@ -23,7 +23,7 @@
package
org.openconnectivity.otgc.about.presentation.view
;
import
android.os.Bundle
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android.widget.TextView
;
import
org.openconnectivity.otgc.BuildConfig
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/domain/usecase/RetrieveVerticalResourcesUseCase.java
View file @
f86c4f56
...
...
@@ -40,7 +40,7 @@ public class RetrieveVerticalResourcesUseCase {
public
Single
<
List
<
String
>>
execute
(
String
deviceId
)
{
return
iotivityRepository
.
getDeviceCoapIpv6Host
(
deviceId
)
.
flatMap
(
iotivityRepository:
:
findResource
)
.
flatMap
(
iotivityRepository:
:
findResource
s
)
.
map
(
ocResources
->
{
List
<
String
>
verticalResources
=
new
ArrayList
<>();
for
(
OcResource
ocResource
:
ocResources
)
{
...
...
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/view/AccessControlActivity.java
View file @
f86c4f56
...
...
@@ -22,17 +22,17 @@
package
org.openconnectivity.otgc.accesscontrol.presentation.view
;
import
android
.arch
.lifecycle.ViewModelProvider
;
import
android
.arch
.lifecycle.ViewModelProviders
;
import
android
x
.lifecycle.ViewModelProvider
;
import
android
x
.lifecycle.ViewModelProviders
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android.support.design.widget
.FloatingActionButton
;
import
android
.support.v7
.app.ActionBar
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
.support.v7
.widget.LinearLayoutManager
;
import
android
.support.v7
.widget.RecyclerView
;
import
android
.support.v7
.widget.Toolbar
;
import
android
x
.annotation.NonNull
;
import
com.google.android.material.floatingactionbutton
.FloatingActionButton
;
import
android
x.appcompat
.app.ActionBar
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android
x.recyclerview
.widget.LinearLayoutManager
;
import
android
x.recyclerview
.widget.RecyclerView
;
import
android
x.appcompat
.widget.Toolbar
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.widget.ProgressBar
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/view/AccessControlAdapter.java
View file @
f86c4f56
...
...
@@ -23,9 +23,9 @@
package
org.openconnectivity.otgc.accesscontrol.presentation.view
;
import
android.content.Context
;
import
android
.support
.annotation.NonNull
;
import
android
.support.v7.util
.SortedList
;
import
android
.support.v7
.widget.RecyclerView
;
import
android
x
.annotation.NonNull
;
import
android
x.recyclerview.widget
.SortedList
;
import
android
x.recyclerview
.widget.RecyclerView
;
import
android.util.TypedValue
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/view/AceActivity.java
View file @
f86c4f56
...
...
@@ -22,14 +22,14 @@
package
org.openconnectivity.otgc.accesscontrol.presentation.view
;
import
android
.arch
.lifecycle.ViewModelProvider
;
import
android
.arch
.lifecycle.ViewModelProviders
;
import
android
x
.lifecycle.ViewModelProvider
;
import
android
x
.lifecycle.ViewModelProviders
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android
.support.v7
.app.ActionBar
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
.support.v7
.widget.Toolbar
;
import
android
x
.annotation.NonNull
;
import
android
x.appcompat
.app.ActionBar
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android
x.appcompat
.widget.Toolbar
;
import
android.util.SparseBooleanArray
;
import
android.view.MenuItem
;
import
android.view.View
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/viewmodel/AccessControlViewModel.java
View file @
f86c4f56
...
...
@@ -22,9 +22,9 @@
package
org.openconnectivity.otgc.accesscontrol.presentation.viewmodel
;
import
android
.arch
.lifecycle.LiveData
;
import
android
.arch
.lifecycle.MutableLiveData
;
import
android
.arch
.lifecycle.ViewModel
;
import
android
x
.lifecycle.LiveData
;
import
android
x
.lifecycle.MutableLiveData
;
import
android
x
.lifecycle.ViewModel
;
import
org.iotivity.base.OicSecAce
;
import
org.openconnectivity.otgc.accesscontrol.domain.usecase.DeleteAclUseCase
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/accesscontrol/presentation/viewmodel/AceViewModel.java
View file @
f86c4f56
...
...
@@ -22,15 +22,13 @@
package
org.openconnectivity.otgc.accesscontrol.presentation.viewmodel
;
import
android
.arch
.lifecycle.LiveData
;
import
android
.arch
.lifecycle.MutableLiveData
;
import
android
.arch
.lifecycle.ViewModel
;
import
android
x
.lifecycle.LiveData
;
import
android
x
.lifecycle.MutableLiveData
;
import
android
x
.lifecycle.ViewModel
;
import
org.openconnectivity.otgc.accesscontrol.domain.usecase.CreateAclUseCase
;
import
org.openconnectivity.otgc.accesscontrol.domain.usecase.RetrieveVerticalResourcesUseCase
;
import
org.openconnectivity.otgc.accesscontrol.domain.usecase.UpdateAclUseCase
;
import
org.openconnectivity.otgc.client.domain.model.SerializableResource
;
import
org.openconnectivity.otgc.client.domain.usecase.GetResourcesUseCase
;
import
org.openconnectivity.otgc.common.presentation.viewmodel.ViewModelError
;
import
org.openconnectivity.otgc.common.presentation.viewmodel.ViewModelErrorType
;
import
org.openconnectivity.otgc.common.domain.rx.SchedulersFacade
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/client/data/repository/ResourceRepository.java
View file @
f86c4f56
...
...
@@ -32,10 +32,14 @@ import org.iotivity.base.OcException;
import
org.iotivity.base.OcHeaderOption
;
import
org.iotivity.base.OcRepresentation
;
import
org.iotivity.base.OcResource
;
import
org.iotivity.base.OicSecResr
;
import
org.iotivity.base.QualityOfService
;
import
org.openconnectivity.otgc.common.constant.OcfResourceType
;
import
javax.inject.Inject
;
import
javax.inject.Singleton
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -103,6 +107,26 @@ public class ResourceRepository {
emitter
.
onComplete
();
});
}
public
List
<
OicSecResr
>
getVerticalResources
(
List
<
OcResource
>
ocResources
)
{
List
<
OicSecResr
>
resources
=
new
ArrayList
<>();
for
(
OcResource
resource
:
ocResources
)
{
for
(
String
resourceType
:
resource
.
getResourceTypes
())
{
if
(
OcfResourceType
.
isVerticalResourceType
(
resourceType
))
{
OicSecResr
res
=
new
OicSecResr
();
res
.
setHref
(
resource
.
getUri
());
List
<
String
>
types
=
resource
.
getResourceTypes
();
res
.
setTypes
(
types
);
res
.
setTypeLen
(
types
.
size
());
List
<
String
>
interfaces
=
resource
.
getResourceInterfaces
();
res
.
setInterfaces
(
interfaces
);
res
.
setInterfaceLen
(
interfaces
.
size
());
resources
.
add
(
res
);
}
}
}
return
resources
;
}
}
otgc/src/main/java/org/openconnectivity/otgc/client/domain/model/SerializableResource.java
View file @
f86c4f56
...
...
@@ -22,7 +22,7 @@
package
org.openconnectivity.otgc.client.domain.model
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
org.iotivity.base.OcResource
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/client/domain/usecase/UiFromSwaggerUseCase.java
View file @
f86c4f56
...
...
@@ -23,7 +23,7 @@
package
org.openconnectivity.otgc.client.domain.usecase
;
import
android.os.Build
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
import
org.json.JSONArray
;
import
org.json.JSONException
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/DeviceInfoAdapter.java
View file @
f86c4f56
...
...
@@ -23,8 +23,8 @@
package
org.openconnectivity.otgc.client.presentation.view
;
import
android.content.Context
;
import
android
.support
.annotation.NonNull
;
import
android
.support.v7
.widget.RecyclerView
;
import
android
x
.annotation.NonNull
;
import
android
x.recyclerview
.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/GenericClientActivity.java
View file @
f86c4f56
...
...
@@ -21,20 +21,20 @@
*/
package
org.openconnectivity.otgc.client.presentation.view
;
import
android
.arch
.lifecycle.ViewModelProvider
;
import
android
.arch
.lifecycle.ViewModelProviders
;
import
android
x
.lifecycle.ViewModelProvider
;
import
android
x
.lifecycle.ViewModelProviders
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android
.support.v4
.app.Fragment
;
import
android
.support.v4
.app.FragmentTransaction
;
import
android
.support.v4
.widget.DrawerLayout
;
import
android
.support.v7
.app.ActionBar
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
.support.v7
.widget.DividerItemDecoration
;
import
android
.support.v7
.widget.LinearLayoutManager
;
import
android
.support.v7
.widget.RecyclerView
;
import
android
.support.v7
.widget.Toolbar
;
import
android
x
.annotation.NonNull
;
import
android
x.fragment
.app.Fragment
;
import
android
x.fragment
.app.FragmentTransaction
;
import
android
x.drawerlayout
.widget.DrawerLayout
;
import
android
x.appcompat
.app.ActionBar
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android
x.recyclerview
.widget.DividerItemDecoration
;
import
android
x.recyclerview
.widget.LinearLayoutManager
;
import
android
x.recyclerview
.widget.RecyclerView
;
import
android
x.appcompat
.widget.Toolbar
;
import
android.view.Gravity
;
import
android.view.Menu
;
import
android.view.MenuItem
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/IntrospectedFragment.java
View file @
f86c4f56
...
...
@@ -22,12 +22,12 @@
package
org.openconnectivity.otgc.client.presentation.view
;
import
android
.arch
.lifecycle.ViewModelProvider
;
import
android
.arch
.lifecycle.ViewModelProviders
;
import
android
x
.lifecycle.ViewModelProvider
;
import
android
x
.lifecycle.ViewModelProviders
;
import
android.os.Bundle
;
import
android
.support
.annotation.NonNull
;
import
android
.support.v4
.app.Fragment
;
import
android
.support.v4
.content.ContextCompat
;
import
android
x
.annotation.NonNull
;
import
android
x.fragment
.app.Fragment
;
import
android
x.core
.content.ContextCompat
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
otgc/src/main/java/org/openconnectivity/otgc/client/presentation/view/ResourceFragment.java
View file @
f86c4f56
...
...
@@ -22,22 +22,23 @@
package
org.openconnectivity.otgc.client.presentation.view
;
import
android.arch.lifecycle.ViewModelProvider
;
import
android.arch.lifecycle.ViewModelProviders
;
import
androidx.lifecycle.ViewModelProvider
;
import
androidx.lifecycle.ViewModelProviders
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.content.ContextCompat
;
import
android.text.Editable
;
import
androidx.annotation.NonNull
;
import
androidx.fragment.app.Fragment
;
import
androidx.core.content.ContextCompat
;
import
android.text.InputType
;
import
android.text.TextWatcher
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.ArrayAdapter
;
import
android.widget.EditText
;
import
android.widget.GridLayout
;
import
android.widget.ImageButton
;
import
android.widget.LinearLayout
;
import
android.widget.Spinner
;
import
android.widget.Switch
;
import
android.widget.TextView
;
import
android.widget.Toast
;
...
...
@@ -53,6 +54,7 @@ import org.openconnectivity.otgc.di.Injectable;
import
java.text.DecimalFormat
;
import
java.text.NumberFormat
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -211,6 +213,41 @@ public class ResourceFragment extends Fragment implements Injectable {
}
else
{
((
TextView
)
mViews
.
get
(
entry
.
getKey
())).
setText
(
numberFormat
.
format
(
entry
.
getValue
()));
}
}
else
if
(
entry
.
getValue
()
instanceof
String
)
{
if
(
isViewEnabled
(
response
.
getResourceInterfaces
()))
{
((
EditText
)
mViews
.
get
(
entry
.
getKey
())).
setText
(
entry
.
getValue
().
toString
());
}
else
{
((
TextView
)
mViews
.
get
(
entry
.
getKey
())).
setText
(
entry
.
getValue
().
toString
());
}
}
else
if
(
entry
.
getValue
()
instanceof
String
[])
{
List
<
String
>
list
=
Arrays
.
asList
((
String
[])
entry
.
getValue
());
ArrayAdapter
<
String
>
dataAdapter
=
new
ArrayAdapter
<>(
getContext
(),
android
.
R
.
layout
.
simple_spinner_item
,
list
);
dataAdapter
.
setDropDownViewResource
(
android
.
R
.
layout
.
simple_spinner_dropdown_item
);
((
Spinner
)
mViews
.
get
(
entry
.
getKey
())).
setAdapter
(
dataAdapter
);
}
else
if
(
entry
.
getValue
()
instanceof
int
[])
{
LinearLayout
layout
=
((
LinearLayout
)
mViews
.
get
(
entry
.
getKey
()));
NumberFormat
numberFormat
=
NumberFormat
.
getInstance
();
int
i
=
0
;
for
(
int
value
:
(
int
[])
entry
.
getValue
())
{
if
(
isViewEnabled
(
response
.
getResourceInterfaces
()))
{
((
EditText
)
layout
.
getChildAt
(
i
)).
setText
(
numberFormat
.
format
(
value
));
}
else
{
((
TextView
)
layout
.
getChildAt
(
i
)).
setText
(
numberFormat
.
format
(
value
));
}
i
++;
}
}
else
if
(
entry
.
getValue
()
instanceof
double
[])
{
LinearLayout
layout
=
((
LinearLayout
)
mViews
.
get
(
entry
.
getKey
()));
NumberFormat
numberFormat
=
new
DecimalFormat
(
"0.0"
);
int
i
=
0
;
for
(
double
value
:
(
double
[])
entry
.
getValue
())
{
if
(
isViewEnabled
(
response
.
getResourceInterfaces
()))
{
((
EditText
)
layout
.
getChildAt
(
i
)).
setText
(
numberFormat
.
format
(
value
));
}
else
{
((
TextView
)
layout
.
getChildAt
(
i
)).
setText
(
numberFormat
.
format
(
value
));
}
i
++;
}