Merge pull request #454 from origami-team/v2.0.0_web

V2.0.0 web
origami-team · Apr 18, 2023 · 415959b · 415959b
2 parents 794e145 + 081dba3
commit 415959b
Show file tree

Hide file tree

Showing 139 changed files with 7,896 additions and 1,868 deletions.
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -9,6 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-community-barcode-scanner')
     implementation project(':capacitor-keep-screen-on')
     implementation project(':capacitor-voice-recorder')
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ifgi.geogami">
+    package="com.ifgi.geogami" xmlns:tools="http://schemas.android.com/tools"
+>
 
     <application
+        android:hardwareAccelerated="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -47,7 +49,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Camera, Photos, input file -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- Geolocation API -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -60,5 +62,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <!-- Audio -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <!-- needed for running barcode scanner -->
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 </manifest>
diff --git a/android/app/src/main/java/com/ifgi/geogami/MainActivity.java b/android/app/src/main/java/com/ifgi/geogami/MainActivity.java
@@ -6,6 +6,7 @@
 import com.getcapacitor.Plugin;
 
 import java.util.ArrayList;
+import com.dutchconcepts.capacitor.barcodescanner.BarcodeScanner;
 
 public class MainActivity extends BridgeActivity {
   @Override
@@ -16,6 +17,7 @@ public void onCreate(Bundle savedInstanceState) {
     this.init(savedInstanceState, new ArrayList<Class<? extends Plugin>>() {{
       // Additional plugins you've installed go here
       // Ex: add(TotallyAwesomePlugin.class);
+      add(BarcodeScanner.class);
     }});
   }
 }
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -2,6 +2,9 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
+include ':capacitor-community-barcode-scanner'
+project(':capacitor-community-barcode-scanner').projectDir = new File('../node_modules/@capacitor-community/barcode-scanner/android')
+
 include ':capacitor-keep-screen-on'
 project(':capacitor-keep-screen-on').projectDir = new File('../node_modules/capacitor-keep-screen-on/android')
 

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -368,11 +368,14 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 2.0.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ifgi.geogami;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -392,10 +395,13 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 2.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.ifgi.geogami;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -39,7 +39,7 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>GeoGami benötigt Zugriff auf deine Kamera um Aufgaben mit Bildern zu versehen.</string>
+	<string>GeoGami benötigt Zugriff auf deine Kamera.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Deine Position wird für das Spiel selbst sowie für die Auswertung deiner Spielperformance genutzt.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -10,6 +10,7 @@ def capacitor_pods
   # Automatic Capacitor Pod dependencies, do not delete
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorCommunityBarcodeScanner', :path => '../../node_modules/@capacitor-community/barcode-scanner'
   pod 'CapacitorKeepScreenOn', :path => '../../node_modules/capacitor-keep-screen-on'
   pod 'CapacitorVoiceRecorder', :path => '../../node_modules/capacitor-voice-recorder'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'

diff --git a/package.json b/package.json
@@ -33,6 +33,8 @@
     "@ionic-native/core": "^5.24.0",
     "@ionic-native/device-orientation": "^5.26.0",
     "@ionic-native/network": "^5.36.0",
+    "@ionic-native/splash-screen": "^5.36.0",
+    "@ionic-native/status-bar": "^5.36.0",
     "@ionic/angular": "^6.3.4",
     "@ionic/cli": "^6.0.0",
     "@ionic/pwa-elements": "^3.0.1",
@@ -51,7 +53,7 @@
     "@types/dom-mediacapture-record": "^1.0.7",
     "angular-pipes": "^10.0.0",
     "capacitor-keep-screen-on": "^0.0.4",
-    "capacitor-voice-recorder": "^0.1.4",
+    "capacitor-voice-recorder": "git+https://github.com/origami-team/capacitor-voice-recorder.git",
     "cordova-android": "^11.0.0",
     "cordova-browser": "6.0.0",
     "cordova-ios": "^6.2.0",

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -16,7 +16,7 @@ const routes: Routes = [
       ),
   },
   {
-    path: 'play-game/play-game-list/:worldType',
+    path: 'play-game/play-game-list',
     loadChildren: () =>
       import('./pages/play-game/play-game-list/play-game-list.module').then(
         (m) => m.PlayGameListPageModule
@@ -37,7 +37,7 @@ const routes: Routes = [
       ),
   },
   {
-    path: 'create-game',
+    path: 'create-game/:bundle',
     loadChildren: () =>
       import('./pages/create-game/create-game/create-game.module').then(
         (m) => m.CreateGamePageModule
@@ -53,7 +53,7 @@ const routes: Routes = [
     canActivate: [AuthGuard],
   },
   {
-    path: 'create-game/create-game-list',
+    path: 'create-game-list/:bundle',
     loadChildren: () =>
       import(
         './pages/create-game/create-game-list/create-game-list.module'
@@ -69,18 +69,18 @@ const routes: Routes = [
     canActivate: [AuthGuard],
   },
   {
-    path: 'edit-game-list/:worldType',
+    path: 'edit-game-list',
     loadChildren: () =>
       import('./pages/edit-game/edit-game-list/edit-game-list.module').then(
         (m) => m.EditGameListPageModule
       ),
     canActivate: [AuthGuard],
   },
   {
-    path: 'edit-game/:id',
+    path: 'edit-game-tasks/:bundle',
     loadChildren: () =>
-      import('./pages/edit-game/edit-game-tasks/edit-game-list.module').then(
-        (m) => m.EditGameListPageModule
+      import('./pages/edit-game/edit-game-tasks/edit-game-tasks.module').then(
+        (m) => m.EditGameTasksPageModule
       ),
     canActivate: [AuthGuard],
   },
@@ -184,13 +184,21 @@ const routes: Routes = [
       m => m.PlayGameMenuPageModule)
   },
   {
-    path: 'create-game-virtual-menu',
+    path: 'create-game-virtual-menu/:bundle',
     loadChildren: () => import('./pages/create-game/create-game-virtual-menu/create-game-virtual-menu.module').then( m => m.CreateGameVirtualMenuPageModule)
   },
   {
     path: 'user/user-management',
     loadChildren: () => import('./pages/user/user-management/user-management.module').then( m => m.UserManagementPageModule)
   },
+  {
+    path: 'game-type-menu/:worldType',
+    loadChildren: () => import('./pages/multiplayer/game-type-menu/game-type-menu.module').then( m => m.GameTypeMenuPageModule)
+  },
+  {
+    path: 'barcode-scanner',
+    loadChildren: () => import('./pages/barcode-scanner/barcode-scanner.module').then( m => m.BarcodeScannerPageModule)
+  },
 ];
 @NgModule({
   imports: [

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -18,7 +18,6 @@ import { FormsModule } from '@angular/forms';
 
 // Modals
 import { CreateTaskModalPage } from './pages/create-game/create-task-modal/create-task-modal.page';
-import { CreateFreeTaskModalComponent } from './pages/create-game/create-free-task-modal/create-free-task-modal.component';
 import { CreateModuleModalPage } from './pages/create-game/create-module-modal/create-module-modal.page';
 import { MapFeaturesModalPage } from './pages/create-game/map-features-modal/map-features-modal.page';
 import { CreateInfoModalComponent } from './pages/create-game/create-info-modal/create-info-modal.component';
@@ -50,6 +49,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 // import { Network } from '@awesome-cordova-plugins/network/ngx';
 import { Network } from '@ionic-native/network/ngx';
 
+// import { NgxQRCodeModule } from '@techiediaries/ngx-qrcode';
+
 // AoT requires an exported function for factories
 export function createTranslateLoader(http: HttpClient) {
   return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -59,15 +60,14 @@ export function createTranslateLoader(http: HttpClient) {
 * Using sockit.IO for receiving data from VR App
 */
 import { SocketIoModule, SocketIoConfig } from 'ngx-socket-io';
-// import { PopupComponent } from './components/popup/popup.component';
-const config: SocketIoConfig = { url: 'https://geogami-ve-singlemode.azurewebsites.net/', options: {} }; // multi single users at once
+const config: SocketIoConfig = { url: 'https://goegami-ve.azurewebsites.net/', options: {} }; // azure server - branch (multiplayer - realworld - V1)
+
 
 @NgModule({
   declarations: [
     AppComponent,
     PopoverComponent,
     CreateTaskModalPage,
-    CreateFreeTaskModalComponent,
     MapFeaturesModalPage,
     CreateModuleModalPage,
     CreateInfoModalComponent,
@@ -86,7 +86,6 @@ const config: SocketIoConfig = { url: 'https://geogami-ve-singlemode.azurewebsit
   entryComponents: [
     PopoverComponent,
     CreateTaskModalPage,
-    CreateFreeTaskModalComponent,
     MapFeaturesModalPage,
     CreateModuleModalPage,
     CreateInfoModalComponent,
@@ -117,6 +116,7 @@ const config: SocketIoConfig = { url: 'https://geogami-ve-singlemode.azurewebsit
     }),
     MarkdownModule.forRoot(),
     BrowserAnimationsModule,
+    // NgxQRCodeModule
     // FormControl
   ],
   providers: [

diff --git a/src/app/interfaces/iUser.ts b/src/app/interfaces/iUser.ts
@@ -7,6 +7,7 @@ export interface IUser { //--- ToDo
     type: string;
     value: string;
   };
+  // ToDo: update it to be list
   role: {
     type: string;
     value: string;

diff --git a/src/app/mapControllers/track-control.ts b/src/app/mapControllers/track-control.ts
@@ -108,21 +108,25 @@ export class TrackControl {
 
     // keep track permanent impl.
     addPermanentTrack(taskId, path = this.path){
-        // // console.log("(track) P index:", taskId,"path: ",path)
-        this.map.addSource(`permanentTrack${taskId}`, { type: 'geojson', data: path });
-        this.map.addLayer({
-            id: `permanentTrack${taskId}`,
-            type: 'line',
-            source: `permanentTrack${taskId}`,
-            paint: {
-                'line-color': "#fbff00", // warning color (yellow)
-                'line-opacity': 0.5,
-                'line-width': 5
-            },
-            layout: {
-                'line-cap': 'round'
-            }
-        });
+        // console.log("(track) P index:", taskId,"path: ",path)
+
+        //* to avoid error caused when swaping between tasks
+        if(this.map.getLayer(`permanentTrack${taskId}`)){
+            this.map.addSource(`permanentTrack${taskId}`, { type: 'geojson', data: path });
+            this.map.addLayer({
+                id: `permanentTrack${taskId}`,
+                type: 'line',
+                source: `permanentTrack${taskId}`,
+                paint: {
+                    'line-color': "#fbff00", // warning color (yellow)
+                    'line-opacity': 0.5,
+                    'line-width': 5
+                },
+                layout: {
+                    'line-cap': 'round'
+                }
+            });
+        }
     }
 
     // keep track temporary impl.

diff --git a/src/app/mapControllers/view-direction-control.ts b/src/app/mapControllers/view-direction-control.ts
@@ -26,14 +26,17 @@ export class ViewDirectionControl {
     // VR world
     isVirtualWorld: boolean = false;
     initialAvatarLoc: any;
+    initialAvatarDir: number;
     private avatarPositionSubscription: Subscription;
     private avatarOrientationSubscription: Subscription;
 
     constructor(map: MapboxMap, private geolocationService: OrigamiGeolocationService, private orientationService: OrigamiOrientationService,
-        isVirtualWorld: boolean, initialAvatarLoc: any) {
+        isVirtualWorld: boolean, initialAvatarLoc: any, initialAvatarDir: number) {
         this.map = map;
         this.isVirtualWorld = isVirtualWorld;
         this.initialAvatarLoc = initialAvatarLoc;
+        this.initialAvatarDir = initialAvatarDir;
+        console.log("🚀 ~ ViewDirectionControl ~ initialAvatarLoc:", initialAvatarLoc)
 
         if (!isVirtualWorld) {
             this.positionSubscription = this.geolocationService.geolocationSubscription.subscribe(
@@ -69,22 +72,25 @@ export class ViewDirectionControl {
                     }
                 });
 
-                this.avatarOrientationSubscription = this.orientationService.avatarOrientationSubscription.subscribe(avatarHeading => {
-                    if (this.map.getLayer('viewDirection')) {
-                        this.map.setLayoutProperty(
-                            'viewDirection',
-                            'icon-rotate',
-                            avatarHeading - this.map.getBearing()
-                        );
-                    }
-                });
+            this.avatarOrientationSubscription = this.orientationService.avatarOrientationSubscription.subscribe(avatarHeading => {
+                if (this.map.getLayer('viewDirection')) {
+                    this.map.setLayoutProperty(
+                        'viewDirection',
+                        'icon-rotate',
+                        avatarHeading - this.map.getBearing()
+                    );
+                }
+            });
         }
 
         this.map.loadImage(
             '/assets/icons/directionv2.png',
             (error, image) => {
                 if (error) throw error;
 
+                //* if image already exist remove it
+                // if (this.map.hasImage('view-direction')) this.map.removeImage('view-direction');
+
                 this.map.addImage('view-direction', image);
 
                 this.map.addSource('viewDirection', {
@@ -101,7 +107,8 @@ export class ViewDirectionControl {
                     layout: {
                         'icon-image': 'view-direction',
                         'icon-size': 0.65,
-                        'icon-offset': [0, -8]
+                        'icon-offset': [0, -8],
+                        'icon-rotate': (this.isVirtualWorld ? this.initialAvatarDir : 0),           //* V.E.: to control initial avatar rotation 
                     }
                 });
                 this.map.setLayoutProperty('viewDirection', 'visibility', 'none');

diff --git a/src/app/models/game.ts b/src/app/models/game.ts
@@ -8,10 +8,13 @@ export class Game {
     public tracking: boolean,
     public tasks: Task[],
     public bbox: any,
+    public isMultiplayerGame: boolean,
+    public numPlayers: number,
     public mapSectionVisible: boolean,
     public geofence: boolean,
     public isVRWorld: boolean,
     public isVRMirrored: boolean,
+    public virEnvType: string,
     public isVisible: boolean,
     public isCuratedGame: boolean
   ) { }