From 979824e2cb9de503c23df7ab78641832913feec3 Mon Sep 17 00:00:00 2001 From: yb Date: Tue, 11 May 2021 12:52:42 +0200 Subject: [PATCH] added working api Client --- .idea/compiler.xml | 4 +- .idea/gradle.xml | 2 - app/build.gradle | 17 +- app/libs/amqp-client-5.12.0.jar | Bin 0 -> 655388 bytes app/libs/slf4j-android-1.7.10.jar | Bin 0 -> 7492 bytes app/src/main/AndroidManifest.xml | 12 ++ .../personalapp/services/ServiceManager.java | 71 +++++++- .../services/UploadFileServiceIntent.java | 22 +-- .../personalapp/services/mqtt/Constants.java | 29 ++++ .../personalapp/services/mqtt/MqttClient.java | 51 ++++++ .../notifications/NotificationService.java | 67 ++++++++ .../persistence/PersonalAppDatabase.java | 12 +- .../services/persistence/dao/EventDao.java | 4 +- .../entity/{Event.java => EventEntity.java} | 3 +- .../persistence/entity/LeaseEntity.java | 21 +++ .../services/rest/RetrofitApiClient.java | 8 + .../rest/RetrofitApiClientFactory.java | 2 +- .../services/rest/UploadFileService.java | 16 ++ .../services/rest/data/APILease.java | 16 ++ .../rest/data/GenerateAccessCodeResponse.java | 16 ++ .../services/storage/LocalStorageClient.java | 3 + .../storage/LocalStorageClientImpl.java | 35 +++- .../services/storage/StorageFactory.java | 12 ++ .../csc/personalapp/ui/main/MainActivity.java | 5 +- .../ui/main/dboard/DashboardFragment.java | 34 ++++ .../ui/reportEvent/ReportEventFragment.java | 11 ++ .../main/res/layout/fragment_dashboard.xml | 30 ++++ .../main/res/xml/network_security_config.xml | 6 + gradle.properties | 3 +- module/EventReportModule/.gitignore | 1 - module/EventReportModule/build.gradle | 48 ------ module/EventReportModule/consumer-rules.pro | 0 module/EventReportModule/proguard-rules.pro | 21 --- .../ExampleInstrumentedTest.java | 26 --- .../src/debug/res/values/google_maps_api.xml | 24 --- .../src/main/AndroidManifest.xml | 52 ------ .../ui/EventReportModule.java | 41 ----- .../ui/EventReportStart.java | 66 -------- .../ChoosedEventDetailActivity.java | 88 ---------- .../ChoosedEventDetailFragment.java | 73 --------- .../chooseEvent/ChoosedEventListActivity.java | 152 ------------------ .../chooseEvent/dummy/DummyContent.java | 72 --------- .../ui/repairshopmap/ChooseRepairShop.java | 43 ----- .../ChooseRepairShopActivity.java | 26 --- .../ChooseRepairShopViewModel.java | 7 - .../ui/repairshopmap/FirstFragment.java | 35 ---- .../ui/repairshopmap/MapsFragment.java | 59 ------- .../ui/repairshopmap/SecondFragment.java | 35 ---- .../MyTreatmentTimeRecyclerViewAdapter.java | 64 -------- .../ui/treatment/TreatmentTimeFragment.java | 72 --------- .../ui/treatment/dummy/DummyContent.java | 72 --------- .../ui/ui/dashboard/DashboardFragment.java | 35 ---- .../ui/ui/dashboard/DashboardViewModel.java | 19 --- .../ui/ui/home/HomeFragment.java | 35 ---- .../ui/ui/home/HomeViewModel.java | 19 --- .../ui/ui/main/EventReportStartFragment.java | 41 ----- .../ui/ui/main/EventReportStartViewModel.java | 7 - .../notifications/NotificationsFragment.java | 34 ---- .../notifications/NotificationsViewModel.java | 19 --- .../res/drawable/ic_dashboard_black_24dp.xml | 9 -- .../main/res/drawable/ic_home_black_24dp.xml | 9 -- .../drawable/ic_notifications_black_24dp.xml | 9 -- .../res/layout-w900dp/choosedevent_list.xml | 37 ----- .../layout/activity_choose_repair_shop.xml | 25 --- .../layout/activity_choosedevent_detail.xml | 54 ------- .../res/layout/activity_choosedevent_list.xml | 70 -------- .../layout/activity_event_report_module.xml | 33 ---- .../src/main/res/layout/activity_main.xml | 34 ---- .../layout/choose_repair_shop_fragment.xml | 18 --- .../main/res/layout/choosedevent_detail.xml | 10 -- .../src/main/res/layout/choosedevent_list.xml | 13 -- .../res/layout/choosedevent_list_content.xml | 20 --- .../res/layout/content_choose_repair_shop.xml | 55 ------- .../src/main/res/layout/content_main.xml | 8 - .../res/layout/event_report_main_fragment.xml | 47 ------ .../layout/event_report_start_activity.xml | 7 - .../main/res/layout/fragment_dashboard.xml | 22 --- .../src/main/res/layout/fragment_first.xml | 28 ---- .../src/main/res/layout/fragment_first2.xml | 31 ---- .../src/main/res/layout/fragment_home.xml | 22 --- .../src/main/res/layout/fragment_maps.xml | 8 - .../res/layout/fragment_notifications.xml | 22 --- .../src/main/res/layout/fragment_second.xml | 27 ---- .../src/main/res/layout/fragment_second2.xml | 30 ---- .../src/main/res/layout/spinner_layout.xml | 17 -- .../main/res/layout/treatment_time_item.xml | 20 --- .../res/layout/treatment_time_item_list.xml | 13 -- .../src/main/res/menu/bottom_nav_menu.xml | 19 --- .../main/res/navigation/mobile_navigation.xml | 25 --- .../src/main/res/navigation/nav_graph.xml | 48 ------ .../src/main/res/values/dimens.xml | 9 -- .../src/main/res/values/strings.xml | 18 --- .../src/main/res/values/themes.xml | 13 -- .../release/res/values/google_maps_api.xml | 20 --- .../eventreportmodule/ExampleUnitTest.java | 17 -- settings.gradle | 2 +- 96 files changed, 478 insertions(+), 2189 deletions(-) create mode 100644 app/libs/amqp-client-5.12.0.jar create mode 100644 app/libs/slf4j-android-1.7.10.jar rename module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/MyIntentService.java => app/src/main/java/eu/csc/personalapp/services/UploadFileServiceIntent.java (77%) create mode 100644 app/src/main/java/eu/csc/personalapp/services/mqtt/Constants.java create mode 100644 app/src/main/java/eu/csc/personalapp/services/mqtt/MqttClient.java create mode 100644 app/src/main/java/eu/csc/personalapp/services/notifications/NotificationService.java rename app/src/main/java/eu/csc/personalapp/services/persistence/entity/{Event.java => EventEntity.java} (95%) create mode 100644 app/src/main/java/eu/csc/personalapp/services/persistence/entity/LeaseEntity.java create mode 100644 app/src/main/java/eu/csc/personalapp/services/rest/UploadFileService.java create mode 100644 app/src/main/java/eu/csc/personalapp/services/rest/data/APILease.java create mode 100644 app/src/main/java/eu/csc/personalapp/services/rest/data/GenerateAccessCodeResponse.java create mode 100644 app/src/main/res/xml/network_security_config.xml delete mode 100644 module/EventReportModule/.gitignore delete mode 100644 module/EventReportModule/build.gradle delete mode 100644 module/EventReportModule/consumer-rules.pro delete mode 100644 module/EventReportModule/proguard-rules.pro delete mode 100644 module/EventReportModule/src/androidTest/java/eu/csc/ssv/eventreportmodule/ExampleInstrumentedTest.java delete mode 100644 module/EventReportModule/src/debug/res/values/google_maps_api.xml delete mode 100644 module/EventReportModule/src/main/AndroidManifest.xml delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/EventReportModule.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/EventReportStart.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/activity/chooseEvent/ChoosedEventDetailActivity.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/activity/chooseEvent/ChoosedEventDetailFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/activity/chooseEvent/ChoosedEventListActivity.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/activity/chooseEvent/dummy/DummyContent.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/repairshopmap/ChooseRepairShop.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/repairshopmap/ChooseRepairShopActivity.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/repairshopmap/ChooseRepairShopViewModel.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/repairshopmap/FirstFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/repairshopmap/MapsFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/repairshopmap/SecondFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/treatment/MyTreatmentTimeRecyclerViewAdapter.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/treatment/TreatmentTimeFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/treatment/dummy/DummyContent.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/dashboard/DashboardFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/dashboard/DashboardViewModel.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/home/HomeFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/home/HomeViewModel.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/main/EventReportStartFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/main/EventReportStartViewModel.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/notifications/NotificationsFragment.java delete mode 100644 module/EventReportModule/src/main/java/eu/csc/ssv/eventreportmodule/ui/ui/notifications/NotificationsViewModel.java delete mode 100644 module/EventReportModule/src/main/res/drawable/ic_dashboard_black_24dp.xml delete mode 100644 module/EventReportModule/src/main/res/drawable/ic_home_black_24dp.xml delete mode 100644 module/EventReportModule/src/main/res/drawable/ic_notifications_black_24dp.xml delete mode 100644 module/EventReportModule/src/main/res/layout-w900dp/choosedevent_list.xml delete mode 100644 module/EventReportModule/src/main/res/layout/activity_choose_repair_shop.xml delete mode 100644 module/EventReportModule/src/main/res/layout/activity_choosedevent_detail.xml delete mode 100644 module/EventReportModule/src/main/res/layout/activity_choosedevent_list.xml delete mode 100644 module/EventReportModule/src/main/res/layout/activity_event_report_module.xml delete mode 100644 module/EventReportModule/src/main/res/layout/activity_main.xml delete mode 100644 module/EventReportModule/src/main/res/layout/choose_repair_shop_fragment.xml delete mode 100644 module/EventReportModule/src/main/res/layout/choosedevent_detail.xml delete mode 100644 module/EventReportModule/src/main/res/layout/choosedevent_list.xml delete mode 100644 module/EventReportModule/src/main/res/layout/choosedevent_list_content.xml delete mode 100644 module/EventReportModule/src/main/res/layout/content_choose_repair_shop.xml delete mode 100644 module/EventReportModule/src/main/res/layout/content_main.xml delete mode 100644 module/EventReportModule/src/main/res/layout/event_report_main_fragment.xml delete mode 100644 module/EventReportModule/src/main/res/layout/event_report_start_activity.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_dashboard.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_first.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_first2.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_home.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_maps.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_notifications.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_second.xml delete mode 100644 module/EventReportModule/src/main/res/layout/fragment_second2.xml delete mode 100644 module/EventReportModule/src/main/res/layout/spinner_layout.xml delete mode 100644 module/EventReportModule/src/main/res/layout/treatment_time_item.xml delete mode 100644 module/EventReportModule/src/main/res/layout/treatment_time_item_list.xml delete mode 100644 module/EventReportModule/src/main/res/menu/bottom_nav_menu.xml delete mode 100644 module/EventReportModule/src/main/res/navigation/mobile_navigation.xml delete mode 100644 module/EventReportModule/src/main/res/navigation/nav_graph.xml delete mode 100644 module/EventReportModule/src/main/res/values/dimens.xml delete mode 100644 module/EventReportModule/src/main/res/values/strings.xml delete mode 100644 module/EventReportModule/src/main/res/values/themes.xml delete mode 100644 module/EventReportModule/src/release/res/values/google_maps_api.xml delete mode 100644 module/EventReportModule/src/test/java/eu/csc/ssv/eventreportmodule/ExampleUnitTest.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1c5ab05..3dbc7f4 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,8 @@ - + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2221c56..0f2ec94 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,8 +13,6 @@