Your commit message

android/.gitignore

@@ -0,0 +1,101 @@
+# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
+
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+# Android Profiling
+*.hprof
+
+# Cordova plugins for Capacitor
+capacitor-cordova-android-plugins
+
+# Copied web assets
+app/src/main/assets/public
+
+# Generated Config files
+app/src/main/assets/capacitor.config.json
+app/src/main/assets/capacitor.plugins.json
+app/src/main/res/xml/config.xml

android/app/.gitignore

@@ -0,0 +1,2 @@
+/build/*
+!/build/.npmkeep

android/app/build.gradle

@@ -0,0 +1,54 @@
+apply plugin: 'com.android.application'
+
+android {
+    namespace "io.ionic.starter"
+    compileSdk rootProject.ext.compileSdkVersion
+    defaultConfig {
+        applicationId "io.ionic.starter"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        aaptOptions {
+             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
+             // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
+            ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+repositories {
+    flatDir{
+        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
+    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
+    implementation project(':capacitor-android')
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation project(':capacitor-cordova-android-plugins')
+}
+
+apply from: 'capacitor.build.gradle'
+
+try {
+    def servicesJSON = file('google-services.json')
+    if (servicesJSON.text) {
+        apply plugin: 'com.google.gms.google-services'
+    }
+} catch(Exception e) {
+    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+}

android/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.getcapacitor.myapp;
+
+import static org.junit.Assert.*;
+
+import android.content.Context;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.getcapacitor.app", appContext.getPackageName());
+    }
+}

android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:name=".MainActivity"
+            android:label="@string/title_activity_main"
+            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:launchMode="singleTask"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"></meta-data>
+        </provider>
+    </application>
+
+    <!-- Permissions -->
+
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

android/app/src/main/java/io/ionic/starter/MainActivity.java

@@ -0,0 +1,5 @@
+package io.ionic.starter;
+
+import com.getcapacitor.BridgeActivity;
+
+public class MainActivity extends BridgeActivity {}

android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>

android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>

android/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="app_name">myapp</string>
+    <string name="title_activity_main">myapp</string>
+    <string name="package_name">io.ionic.starter</string>
+    <string name="custom_url_scheme">io.ionic.starter</string>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:background">@null</item>
+    </style>
+
+
+    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
+        <item name="android:background">@drawable/splash</item>
+    </style>
+</resources>

android/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="my_images" path="." />
+    <cache-path name="my_cache_images" path="." />
+</paths>

android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java

@@ -0,0 +1,18 @@
+package com.getcapacitor.myapp;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

android/build.gradle

@@ -0,0 +1,29 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.google.gms:google-services:4.4.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+apply from: "variables.gradle"
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

android/gradle.properties

@@ -0,0 +1,22 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# 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
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/gradlew

@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/settings.gradle

@@ -0,0 +1,5 @@
+include ':app'
+include ':capacitor-cordova-android-plugins'
+project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
+
+apply from: 'capacitor.settings.gradle'

android/variables.gradle

@@ -0,0 +1,16 @@
+ext {
+    minSdkVersion = 22
+    compileSdkVersion = 34
+    targetSdkVersion = 34
+    androidxActivityVersion = '1.8.0'
+    androidxAppCompatVersion = '1.6.1'
+    androidxCoordinatorLayoutVersion = '1.2.0'
+    androidxCoreVersion = '1.12.0'
+    androidxFragmentVersion = '1.6.2'
+    coreSplashScreenVersion = '1.0.1'
+    androidxWebkitVersion = '1.9.0'
+    junitVersion = '4.13.2'
+    androidxJunitVersion = '1.1.5'
+    androidxEspressoCoreVersion = '3.5.1'
+    cordovaAndroidVersion = '10.1.1'
+}

angular.json

@@ -39,13 +39,13 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "700kb",
+                  "maximumError": "1000kb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumWarning": "6kb",
+                  "maximumError": "8kb"
                 }
               ],
               "fileReplacements": [

package.json

@@ -21,12 +21,18 @@
     "@angular/platform-browser": "^18.0.0",
     "@angular/platform-browser-dynamic": "^18.0.0",
     "@angular/router": "^18.0.0",
+    "@capacitor/android": "6.2.0",
     "@capacitor/app": "6.0.2",
-    "@capacitor/core": "6.2.0",
+    "@capacitor/clipboard": "^6.0.2",
+    "@capacitor/core": "^6.2.0",
+    "@capacitor/filesystem": "^6.0.2",
     "@capacitor/haptics": "6.0.2",
     "@capacitor/keyboard": "6.0.3",
+    "@capacitor/share": "^6.0.3",
+    "@capacitor/splash-screen": "^6.0.3",
     "@capacitor/status-bar": "6.0.2",
     "@ionic/angular": "^8.4.1",
+    "@ionic/storage-angular": "^4.0.0",
     "ionicons": "^7.0.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
@@ -45,6 +51,7 @@
     "@capacitor/cli": "6.2.0",
     "@ionic/angular-toolkit": "^11.0.1",
     "@types/jasmine": "~5.1.0",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.57.0",

src/app/services/user.service.ts

@@ -1,10 +1,13 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable, of } from 'rxjs';
+import { BehaviorSubject, Observable, of, throwError } from 'rxjs';
 import { tap, catchError } from 'rxjs/operators';
 import { HealthReport } from '../health-record/health-record.page';
+import { environment } from 'src/environments/environment';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 
 // 定义用户信息接口
 export interface UserInfo {
+  id?: number; // 修改为 id 字段
   username: string;
   email?: string;
   phone?: string;
@@ -16,14 +19,20 @@ export interface UserInfo {
   medicalHistory?: string; // 添加 medicalHistory 字段 // 添加 reports 字段
 }
 
+export interface User {
+  username: string;
+  password: string;
+  // 可以根据需要添加更多的用户属性
+}
+
 @Injectable({
   providedIn: 'root'
 })
 export class UserService {
-         userInfoSubject = new BehaviorSubject<UserInfo | null>(null);
+  userInfoSubject = new BehaviorSubject<UserInfo | null>(null);
   public userInfo$ = this.userInfoSubject.asObservable();
 
-  constructor() {
+  constructor(private http: HttpClient) {
     this.loadUserInfo(); // 应用启动时加载本地存储的用户信息
   }
 
@@ -31,6 +40,7 @@ export class UserService {
     try {
       const currentUserInfo = this.userInfoSubject.value || {}; // 如果为空则提供一个空对象
       const updatedUserInfo: UserInfo = {
+        id: userInfo.id ?? (currentUserInfo as UserInfo).id,
         username: userInfo.username ?? (currentUserInfo as UserInfo).username ?? '', // 确保 username 不会是 undefined
         email: userInfo.email ?? (currentUserInfo as UserInfo).email,
         phone: userInfo.phone ?? (currentUserInfo as UserInfo).phone,
@@ -73,16 +83,17 @@ export class UserService {
       throw error;
     }
   }
-  
+
   private async loadUserInfo(): Promise<void> {
     try {
       const storedUserInfo = localStorage.getItem('userInfo');
       if (storedUserInfo) {
         const parsedUserInfo: UserInfo = JSON.parse(storedUserInfo);
-  
-        // 确保所有字段都有默认值
+        
+
         this.userInfoSubject.next({
           ...parsedUserInfo,
+          id: parsedUserInfo.id, // 确保 id 被正确传递
           username: parsedUserInfo.username || '',
           userAvatar: parsedUserInfo.userAvatar || '../../assets/images/user-avatar.png',
           userType: parsedUserInfo.userType || '普通用户',
@@ -90,28 +101,58 @@ export class UserService {
           phone: parsedUserInfo.phone || '',
           birthday: parsedUserInfo.birthday ?? null,
           email: parsedUserInfo.email || '',
-          reports: parsedUserInfo.reports || [] // 确保 reports 字段存在
-        });
-      } else {
-        // 设置默认用户信息，确保所有字段都有值
-        this.userInfoSubject.next({
-          username: '张三',
-          userAvatar: '../../assets/images/user-avatar.png',
-          userType: '普通用户',
-          gender: 'male',
-          phone: '123456789',
-          birthday: '2003-03-06',
-          email: '33333@333',
-          medicalHistory: '高血压',
-          reports: [ // 默认报告
-            { title: '年度体检', date: new Date(), details: '血压正常，血糖略高', type: 'annual' },
-            { title: '眼科检查', date: new Date('2024-01-01'), details: '视力良好，无异常', type: 'eye' }
-          ]
+          reports: parsedUserInfo.reports || [],
+          medicalHistory: parsedUserInfo.medicalHistory || ''
         });
       }
+      // else {
+      //   // 如果没有本地用户信息，尝试从服务器获取（假设有一个获取用户信息的API）
+      //   const userInfoResponse = await this.http.get<UserInfo>(`${environment.apiUrl}/getUserInfo`).toPromise();
+      //   this.saveUserInfoToLocalStorage(userInfoResponse);
+      //   this.userInfoSubject.next(userInfoResponse);
+      // }
     } catch (error) {
       console.error('Failed to parse userInfo from localStorage:', error);
       this.userInfoSubject.next(null);
     }
   }
+
+  loginUser(username: string, password: string): Observable<any> {
+    const loginUrl = `${environment.apiUrl}/api/login`;
+    return this.http.post(loginUrl, { username, password }, {
+      withCredentials: true,
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json'
+      })
+    }).pipe(
+      tap(async (response: any) => {
+        await this.saveUserInfoToLocalStorage(response);
+        this.userInfoSubject.next(response);
+      }),
+      catchError(error => {
+        let errorMessage = '登录失败';
+        if (error.error instanceof ErrorEvent) {
+          errorMessage = `Error: ${error.error.message}`;
+        } else {
+          errorMessage = `Service returned code: ${error.status}, body was: ${error.message || error.statusText}`;
+        }
+        console.error('登录请求出错:', errorMessage);
+        return throwError(() => new Error(errorMessage));
+      })
+    );
+  }
+
+  registerNewUser(user: User): Observable<any> {
+    const registerUrl = `${environment.apiUrl}/api/register`;
+    return this.http.post(registerUrl, user).pipe(
+      tap(async (response: any) => {
+        await this.saveUserInfoToLocalStorage(response);
+        this.userInfoSubject.next(response);
+      }),
+      catchError(error => {
+        console.error('Registration failed:', error);
+        return throwError(() => new Error('Registration failed'));
+      })
+    );
+  }
 }

src/app/tab1/tab1.page.html

@@ -119,10 +119,6 @@
       </div>
     </ng-container>
   </div>
-  <!-- <div class="controls">
-    <button (click)="prevSlide()">上一张</button>
-    <button (click)="nextSlide()">下一张</button>
-  </div> -->
 </div>
 
 
@@ -149,14 +145,4 @@
   </div>
 
 </div>
-
-<!-- 浮动操作按钮 -->
-<!-- <div class="floating-action-button" (click)="handleClick()">
-  <ion-icon name="add"></ion-icon>
-  <div class="label">发布</div>
-</div>
-<input type="file" id="fileInput" class="hidden-input" accept="image/*,.pdf" change="publishHealthInfo(this.files)">
-<script src="https://unpkg.com/ionicons@5.5.2/dist/ionicons.js"></script> -->
-  
-  <!-- 其他页面内容 -->
 </ion-content>

src/app/tab1/tab1.page.scss

@@ -332,40 +332,6 @@ ion-toolbar {
   }
 }
 
-
-// .floating-action-button {
-//   position: fixed;
-//   bottom: 16px;
-//   right: 16px;
-//   display: flex; // 使用 Flexbox 布局
-//   flex-direction: column; // 子元素垂直排列
-//   align-items: center; // 水平居中
-//   justify-content: center; // 垂直居中
-//   width: 60px;
-//   height: 60px;
-//   background: #007bff;
-//   border-radius: 50%;
-//   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-//   cursor: pointer;
-//   z-index: 1000;
-
-//   ion-icon {
-//     font-size: 24px;
-//     color: white;
-//   }
-
-//   .label {
-//     font-size: 12px;
-//     color: white;
-//     margin-top: 4px;
-//   }
-// }
-
-// .hidden-input {
-//   position: absolute;
-//   left: -9999px;
-// }
-
 // 响应式设计
 @media (max-width: 768px) {
   .function-row {

src/app/tab1/tab1.page.ts

@@ -2,12 +2,13 @@ import { Component, AfterViewInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { ModalController, NavController, ToastController } from '@ionic/angular';
 import { Observable } from 'rxjs';
-import { map, catchError } from 'rxjs/operators';
+import { map, catchError,tap } from 'rxjs/operators';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { throwError } from 'rxjs';
 import { Subscription } from 'rxjs';
 import { UserService } from '../services/user.service';
 import {ElementRef, OnInit, Renderer2 } from '@angular/core';
+import { environment } from 'src/environments/environment';
 
 interface User {
   username: string;
@@ -244,47 +245,6 @@ export class Tab1Page implements AfterViewInit {
     this.router.navigate([route]);
   }
 
-  // // 发布求医信息
-  // handleClick() {
-  //   const fileInput = document.getElementById('fileInput');
-  //   if (fileInput) {
-  //     fileInput.click();
-  //   } else {
-  //     console.error('File input element not found');
-  //   }
-  // }
-
-  // publishHealthInfo(files: FileList) {
-  //   if (files && files.length > 0) {
-  //     const file = files[0];
-  //     const allowedTypes = ['application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 
-  //                           'image/jpeg', 'image/png', 'image/gif'];
-
-  //     if (allowedTypes.includes(file.type)) {
-  //       console.log('Selected file:', file.name);
-  //       // 在这里可以添加上传文件的逻辑
-  //       this.fileToUpload = file;
-  //       // 在这里添加上传文件的逻辑
-  //       this.uploadFile().then(() => this.navCtrl.navigateForward('/tabs/tab2'));
-  //     } else {
-  //       this.presentToast('仅支持 .doc, .docx, .jpg, .jpeg, .png, .gif 文件类型');
-  //     }
-  //   } else {
-  //     console.log('No file selected');
-  //   }
-  // }
-
-
-
-  // private async uploadFile(): Promise<void> {
-  //   if (this.fileToUpload) {
-  //     // 这里是模拟文件上传的过程，您可以替换为实际的上传逻辑。
-  //     // 比如调用API进行文件上传，并处理响应。
-  //     // 简单示例：
-  //     // await this.http.post('your-upload-endpoint', this.fileToUpload).toPromise();
-  //     return new Promise((resolve) => setTimeout(resolve, 1000)); // 模拟异步操作
-  //   }
-  // }
 
   openLoginModal() {
     this.isLoginModalOpen = true;
@@ -315,7 +275,7 @@ export class Tab1Page implements AfterViewInit {
       return;
     }
 
-    this.loginUser(formValue.username, formValue.password)
+    this.userService.loginUser(formValue.username, formValue.password)
       .subscribe(
         async (response) => {
           console.log('登录成功:', response);
@@ -347,9 +307,7 @@ export class Tab1Page implements AfterViewInit {
       return;
     }
 
-    console.log('注册用户:', JSON.stringify(this.user, null, 2));
-
-    this.registerNewUser(this.user)
+    this.userService.registerNewUser(this.user)
       .subscribe(
         async (response) => {
           console.log('注册成功:', response);
@@ -361,39 +319,12 @@ export class Tab1Page implements AfterViewInit {
           if (error.error && error.error.message.includes('cannot be null')) {
             await this.presentToast('密码不能为空，请输入密码', 'danger');
           } else {
-            await this.presentToast('注册失败，请稍后再试', 'danger');
+            await this.presentToast('用户名已存在，请稍后再试', 'danger');
           }
         }
       );
   }
-
-  private loginUser(username: string, password: string): Observable<any> {
-    const loginUrl = 'http://localhost:8080/api/login'; // 替换为你的登录 API 端点
-    return this.http.post(loginUrl, { username, password }, {
-      withCredentials: true,
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json'
-      })
-    }).pipe(
-      map(response => response),
-      catchError(error => {
-        console.error('登录请求出错:', error);
-        return throwError(() => new Error('登录失败'));
-      })
-    );
-  }
-
-  private registerNewUser(user: User): Observable<any> {
-    const registerUrl = 'http://localhost:8080/api/register'; // 替换为你的注册 API 端点
-    return this.http.post(registerUrl, user)
-      .pipe(
-        map(response => response),
-        catchError(error => {
-          throw error;
-        })
-      );
-  }
-
+  
   onLearnMore() {
     this.navCtrl.navigateForward('/details');
   }

src/app/tab2/tab2.page.html

@@ -1,4 +1,3 @@
-<!-- src/app/tab2/tab2.page.html -->
 <ion-header>
   <ion-toolbar color="primary">
     <ion-title class="center-title">AI 问诊</ion-title>
@@ -26,12 +25,6 @@
       </div>
     </ion-item>
   </ion-list>
-  
-  <!-- 显示连接状态 -->
-  <div *ngIf="!isSocketOpen" class="connection-status">
-    <ion-spinner name="crescent"></ion-spinner>
-    正在尝试连接...
-  </div>
 </ion-content>
 
 <ion-footer>

src/app/tab2/tab2.page.ts

@@ -1,27 +1,7 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { environment } from '../../environments/environment';
-import { v4 as uuidv4 } from 'uuid';
-
-export interface IServerMessage {
-  header?: {
-    code?: number;
-    message?: string;
-    sid?: string;
-    status?: number;
-    type?: 'heartbeat_ack' | 'normal'; // 在header中定义类型字段
-  };
-  payload?: {
-    type?: 'heartbeat_ack' | 'normal'; // 在payload中也定义类型字段
-    choices?: {
-      text?: Array<{
-        content: string;
-        role: 'user' | 'assistant';
-        index?: number;
-      }>;
-    };
-  };
-}
+import { UserService } from '../services/user.service';
 
 @Component({
   selector: 'app-tab2',
@@ -32,39 +12,35 @@ export class Tab2Page implements OnInit, OnDestroy {
   messages: any[] = [];
   userInput: string = '';
   isLoading: boolean = false;
-  private socket: WebSocket | null = null;
-  private messageBuffers: Map<string, { content: string[], status: number }> = new Map();
-  private activeSessions: Set<string> = new Set();
-  private heartbeatInterval: number = 30000; // 每30秒发送一次心跳
-  private heartbeatTimer: any;
-  private serverAcknowledgeTimeout: any;
+  isSocketOpen: boolean;
+  userId: number | null = null;
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, private userService: UserService) {
+    this.isSocketOpen = false;
+  }
 
   ngOnInit() {
     this.sendMessageFromAI(this.getRandomWelcomeMessage());
-    this.initWebSocket();
+    this.userService.getUserInfo().subscribe(
+      userInfo => {
+        console.log('User Info:', userInfo);
+        if (userInfo && userInfo.id !== undefined) {
+          console.log('User ID:', userInfo.id);
+          this.userId = userInfo.id;
+        } else {
+          console.warn('No valid user info received');
+          this.sendMessageFromAI('无法获取有效的用户ID，请稍后再试');
+        }
+      },
+      error => {
+        console.error('Failed to get user info:', error);
+        this.sendMessageFromAI('系统遇到错误，请稍后再试');
+      }
+    );
   }
 
   ngOnDestroy() {
-    // 不要在这里手动关闭连接
-    // if (this.socket) {
-    //   if (this.activeSessions.size > 0) {
-    //     console.warn('There are active sessions, attempting graceful shutdown...');
-    //     setTimeout(() => {
-    //       if (this.socket) {
-    //         this.socket.close();
-    //       }
-    //     }, 5000); // 假设5秒足够让服务器处理完所有请求
-    //   } else {
-    //     console.log('No active sessions, closing WebSocket immediately.');
-    //     this.socket.close();
-    //   }
-    // }
-  }
-
-  get isSocketOpen(): boolean {
-    return Boolean(this.socket && this.socket.readyState === WebSocket.OPEN);
+    // 如果有其他资源需要清理，这里可以添加相应的代码
   }
 
   getRandomWelcomeMessage(): string {
@@ -78,221 +54,10 @@ export class Tab2Page implements OnInit, OnDestroy {
     return welcomeMessages[Math.floor(Math.random() * welcomeMessages.length)];
   }
 
-  async initWebSocket() {
-    try {
-      const response = await this.http.get(environment.apiUrl + '/api/v1/getWebSocketUrl', { responseType: 'text' }).toPromise();
-      const wsUrl = response as string;
-
-      if (!wsUrl || wsUrl.trim().length === 0) {
-        throw new Error('Received an empty or undefined WebSocket URL');
-      }
-
-      console.log('Fetched WebSocket URL:', wsUrl);
-
-      this.socket = new WebSocket(wsUrl);
-
-      this.socket.onopen = () => {
-        console.log('WebSocket connection opened');
-        this.startHeartbeat();
-      };
-
-      this.socket.onmessage = (event) => {
-        try {
-          const message: IServerMessage = JSON.parse(event.data);
-          console.log('Parsed message:', message);
-
-          if (message.header?.code === 0) {
-            // 检查心跳确认消息
-            if (message.header?.type === 'heartbeat_ack' || message.payload?.type === 'heartbeat_ack') {
-              this.resetHeartbeat();
-              return; // 如果是心跳确认消息，不再继续处理其他逻辑
-            }
-
-            // 继续处理正常消息...
-            if (
-              message.payload &&
-              message.payload.choices &&
-              Array.isArray(message.payload.choices.text)
-            ) {
-              const sid = message.header?.sid || ''; // 提供默认值
-              const status = message.header?.status || 0; // 提供默认值
-
-              // 初始化或获取当前对话的缓冲区
-              let buffer = this.messageBuffers.get(sid) || { content: [], status: 0 };
-              buffer.status = status;
-
-              // 累积所有非空文本内容，并去除前后空白字符
-              buffer.content.push(
-                ...message.payload.choices.text
-                  .filter(item => typeof item.content === 'string' && item.content.trim() !== '')
-                  .map(item => item.content.trim())
-              );
-
-              // 如果是最后一条消息，则合并并显示
-              if (buffer.status === 2) {
-                const combinedContent = buffer.content.join(' ');
-                const cleanedContent = combinedContent.replace(/\s+/g, ' ').trim();
-
-                this.sendMessageFromAI(cleanedContent); // 一次性发送合并后的内容
-                this.messageBuffers.delete(sid); // 清除已完成会话的缓冲区
-                this.activeSessions.delete(sid); // 从活跃会话中移除
-
-                // 检查是否还有活跃会话
-                if (this.activeSessions.size === 0) {
-                  this.isLoading = false;
-                }
-              } else {
-                // 更新缓冲区
-                this.messageBuffers.set(sid, buffer);
-              }
-            } else {
-              console.error('Invalid or unexpected message format:', message);
-              this.sendMessageFromAI('收到的消息格式无效，请检查服务器配置。');
-              this.isLoading = false;
-            }
-          } 
-        } catch (error) {
-          console.error('Error parsing message:', error);
-          this.sendMessageFromAI('抱歉，系统出现错误，请稍后再试。');
-          this.isLoading = false;
-        }
-      };
-
-      this.socket.onerror = (event) => {
-        console.error('WebSocket error observed:', event);
-        this.sendMessageFromAI('抱歉，系统出现错误，请稍后再试。');
-        this.isLoading = false;
-      };
-
-      this.socket.onclose = (event) => {
-        console.log('WebSocket connection closed:', event);
-        this.reconnectWebSocket(); // 尝试重新连接
-        this.isLoading = false;
-      };
-    } catch (error) {
-      console.error('Failed to fetch WebSocket URL:', error);
-      this.sendMessageFromAI('无法获取WebSocket连接信息，请检查网络设置。');
-    }
-  }
-
-  private startHeartbeat() {
-    this.stopHeartbeat(); // 确保只有一个心跳计时器运行
-
-    this.heartbeatTimer = setInterval(() => {
-      if (this.isSocketOpen) {
-        this.sendHeartbeat();
-      } else {
-        this.stopHeartbeat();
-      }
-    }, this.heartbeatInterval);
-
-    this.serverAcknowledgeTimeout = setTimeout(() => {
-      console.warn('No heartbeat acknowledgment received from the server.');
-      this.reconnectWebSocket(); // 尝试重新连接
-    }, this.heartbeatInterval * 2); // 设置两倍的心跳间隔作为等待服务器回应的时间
-  }
-
-  private sendHeartbeat() {
-    const heartbeatMessage = {
-      header: {
-        type: 'heartbeat'
-      },
-      payload: {}
-    };
-    console.log('Sending heartbeat...');
-    this.socket!.send(JSON.stringify(heartbeatMessage));
-  }
-
-  private resetHeartbeat() {
-    clearTimeout(this.serverAcknowledgeTimeout);
-    this.serverAcknowledgeTimeout = setTimeout(() => {
-      console.warn('No heartbeat acknowledgment received from the server.');
-      this.reconnectWebSocket(); // 尝试重新连接
-    }, this.heartbeatInterval * 2); // 再次设置两倍的心跳间隔作为等待服务器回应的时间
-  }
-
-  private stopHeartbeat() {
-    if (this.heartbeatTimer) {
-      clearInterval(this.heartbeatTimer);
-      this.heartbeatTimer = undefined;
-    }
-    if (this.serverAcknowledgeTimeout) {
-      clearTimeout(this.serverAcknowledgeTimeout);
-      this.serverAcknowledgeTimeout = undefined;
-    }
-  }
-
-  private reconnectWebSocket() {
-    console.log('Attempting to reconnect WebSocket...');
-    this.stopHeartbeat();
-    if (this.socket) {
-      this.socket.close();
-    }
-    this.initWebSocket();
-  }
-
-  private handleIncomingMessage(event: MessageEvent<string>) {
-    try {
-      const message: IServerMessage = JSON.parse(event.data);
-      console.log('Parsed message:', message);
-
-      if (
-        message.header &&
-        message.header.code === 0 &&
-        message.payload &&
-        message.payload.choices &&
-        Array.isArray(message.payload.choices.text)
-      ) {
-        const sid = message.header.sid || ''; // 提供默认值
-        const status = message.header.status || 0; // 提供默认值
-
-        // 初始化或获取当前对话的缓冲区
-        let buffer = this.messageBuffers.get(sid) || { content: [], status: 0 };
-        buffer.status = status;
-
-        // 累积所有非空文本内容，并去除前后空白字符
-        buffer.content.push(
-          ...message.payload.choices.text
-            .filter(item => typeof item.content === 'string' && item.content.trim() !== '')
-            .map(item => item.content.trim())
-        );
-
-        // 如果是最后一条消息，则合并并显示
-        if (buffer.status === 2) {
-          // 使用单个空格作为分隔符连接文本片段，或者根据需要选择其他分隔符
-          const combinedContent = buffer.content.join(' ');
-
-          // 去除最终结果中的多余空白字符
-          const cleanedContent = combinedContent.replace(/\s+/g, ' ').trim();
-
-          this.sendMessageFromAI(cleanedContent); // 一次性发送合并后的内容
-          this.messageBuffers.delete(sid); // 清除已完成会话的缓冲区
-          this.activeSessions.delete(sid); // 从活跃会话中移除
-
-          // 检查是否还有活跃会话
-          if (this.activeSessions.size === 0) {
-            this.isLoading = false;
-          }
-        } else {
-          // 更新缓冲区
-          this.messageBuffers.set(sid, buffer);
-        }
-      } else {
-        console.error('Invalid or unexpected message format:', message);
-        this.sendMessageFromAI('收到的消息格式无效，请检查服务器配置。');
-        this.isLoading = false;
-      }
-    } catch (error) {
-      console.error('Error parsing message:', error);
-      this.sendMessageFromAI('抱歉，系统出现错误，请稍后再试。');
-      this.isLoading = false;
-    }
-  }
-
-  sendMessage() {
+  async sendMessage() {
     const trimmedInput = this.userInput.trim();
     if (!trimmedInput) {
-      alert('请输入您的问题或消息'); 
+      alert('请输入您的问题或消息');
       return;
     }
 
@@ -300,36 +65,35 @@ export class Tab2Page implements OnInit, OnDestroy {
     this.isLoading = true;
     this.userInput = '';
 
-    if (this.isSocketOpen) {
-      const uid = localStorage.getItem('user_id') || uuidv4();
-      localStorage.setItem('user_id', uid);
+    try {
+      if (!this.userId) {
+        throw new Error('无法获取有效的用户ID');
+      }
 
-      const sendMessage = {
-        header: {
-          app_id: "c907b21b",
-          uid,
-        },
-        parameter: {
-          chat: {
-            domain: "generalv3.5",
-            temperature: 0.5,
-            max_tokens: 4096,
-          }
-        },
-        payload: {
-          message: {
-            text: [{
-              content: trimmedInput,
-              role: 'user'
-            }]
-          }
-        }
-      };
+      // 添加提示词
+      const promptPrefix = "你是个医生，回答病人的请求：";
+      const fullQuestion = `${promptPrefix}${trimmedInput}`;
+
+      // 使用 try-catch 包装 HTTP 请求
+      try {
+        const response = await this.http.get<string>(`${environment.apiUrl}/test/sendQuestion`, {
+          params: { id: this.userId.toString(), question: fullQuestion },
+          responseType: 'text' as 'json' // 指定响应类型为文本
+        }).toPromise();
 
-      this.socket!.send(JSON.stringify(sendMessage));
-      this.activeSessions.add(uid);
-    } else {
-      this.sendMessageFromAI('WebSocket 连接已断开，请稍后再试。');
+        if (response) {
+          this.sendMessageFromAI(response);
+        } else {
+          this.sendMessageFromAI('收到空回复，请尝试重新提问');
+        }
+      } catch (httpError) {
+        console.error('HTTP请求失败:', httpError);
+        this.sendMessageFromAI('网络请求失败，请检查网络连接或稍后再试');
+      }
+    } catch (error) {
+      console.error('发送消息时发生错误:', error);
+      this.sendMessageFromAI('系统遇到错误，请稍后再试');
+    } finally {
       this.isLoading = false;
     }
   }

src/deploy.ps1

@@ -0,0 +1,18 @@
+# 打包项目，携带应用前缀（index.html中相对路径将自动修复为/dev/jxnu/<学号>前缀）
+# /dev/ 项目测试版上传路径
+# /dev/jxnu/<学号> nova-crm项目预留路径
+set NODE_OPTIONS=–max_old_space_size=16000
+node ./node_modules/@angular/cli/bin/ng build --base-href="/dev/jxnu/202226701052/"
+
+# 清空旧文件目录
+obsutil rm obs://nova-cloud/dev/jxnu/202226701052 -r -f -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com"
+
+# 同步文件目录
+obsutil sync ./www obs://nova-cloud/dev/jxnu/202226701052  -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com" -acl=public-read
+
+
+# 授权公开可读
+obsutil chattri obs://nova-cloud/dev/jxnu/202226701052 -r -f -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com" -acl=public-read
+
+# 列举对象
+obsutil ls obs://nova-cloud/dev/jxnu/202226701052  -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com"

src/environments/environment.prod.ts

@@ -1,4 +1,4 @@
-export const environment = {
-  production: true,
-  apiUrl: 'https://your-production-api-url.com', // 生产环境下的API基础URL
-};
+// export const environment = {
+//   production: true,
+//   apiUrl: 'https://your-production-api-url.com', // 生产环境下的API基础URL
+// };

src/environments/environment.ts

@@ -1,17 +1,7 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
+
 
 export const environment = {
   production: false,
-  apiUrl: 'http://localhost:8080' // 开发环境下的API基础URL
+  apiUrl: 'http://113.44.251.16:8080'
 };
 
-/*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
- */
-// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.