合并

app/build.gradle

@@ -1,23 +1,39 @@
 apply plugin: 'com.android.application'
 
+/*
+  修订说明：
+  - 增加 repositories（包含 google/mavenCentral + flatDir 指向 libs）
+  - 合并 fileTree 引入（同时包含 .jar 和 .aar）
+  - 保留 uniapp 必需配置和 packagingOptions
+  - 请确保 app/libs 下只有一份 share-weixin-release.aar，且没有重复同名 AAR
+*/
+
+repositories {
+    google()
+    mavenCentral()
+    // 把 app/libs 当作本地仓库（部分环境需要）
+    flatDir {
+        dirs 'libs'
+    }
+}
+
 android {
     compileSdk 35
 
     namespace 'com.android.hldy'
+
     defaultConfig {
         applicationId "com.android.hldy"
         minSdkVersion 21
-        targetSdkVersion 33 //建议此属性值设为21 io.dcloud.PandoraEntry 作为apk入口时   必须设置 targetSDKVersion>=21 沉浸式才生效
-
-        versionCode 10004
-        versionName "1.0.004"
+        targetSdkVersion 33
+        versionCode 10010
+        versionName "1.0.010"
         multiDexEnabled true
+
         ndk {
-            ndk {
-                //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
-                abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86","x86_64"
-            }
+            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
         }
+
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -49,48 +65,46 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    //使用uniapp时，需复制下面代码
-    /*代码开始*/
+
+    /* uniapp 必需配置 */
     aaptOptions {
         additionalParameters '--auto-add-overlay'
-        //noCompress 'foo', 'bar'
         ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
     }
+
     lint {
         baseline = file("lint-baseline.xml")
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     packagingOptions {
-        // 选择第一个匹配的文件（推荐）
         pickFirst 'lib/arm64-v8a/libc++_shared.so'
-        // 如果其他 ABI 也存在冲突，添加对应路径
         pickFirst 'lib/armeabi-v7a/libc++_shared.so'
         pickFirst 'lib/x86/libc++_shared.so'
         jniLibs {
             useLegacyPackaging true
         }
     }
-    /*代码结束*/
+
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
         }
     }
 }
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation fileTree(dir: 'libs', include: ['*.aar'])
 
-    /*uniapp所需库-----------------------开始*/
+dependencies {
+    // 一行同时包含 .jar 和 .aar，避免重复引用问题
+    implementation fileTree(dir: 'libs', include: ['*.jar','*.aar'])
+
+    /* uniapp 所需基础库 */
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.facebook.fresco:fresco:1.13.0'
     implementation "com.facebook.fresco:animated-gif:1.13.0"
-    /*uniapp所需库-----------------------结束*/
-    // 基座需要，必须添加
     implementation 'com.github.bumptech.glide:glide:4.9.0'
     implementation 'com.alibaba:fastjson:1.2.83'
     implementation 'androidx.webkit:webkit:1.3.0'
@@ -98,17 +112,24 @@ dependencies {
     implementation 'androidx.core:core:1.1.0'
     implementation "androidx.fragment:fragment:1.1.0"
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    implementation project(':mylibrary')
-    // uts依赖
-    implementation "com.squareup.okhttp3:okhttp:3.12.12"
-    implementation "androidx.core:core-ktx:1.6.0"
+    /* Kotlin & 协程 */
     implementation "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8"
-    implementation "com.github.getActivity:XXPermissions:18.0"
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
+    /* 网络 & 权限库 */
+    implementation "com.squareup.okhttp3:okhttp:3.12.12"
+    implementation "com.github.getActivity:XXPermissions:18.0"
+
+    /* 项目模块 */
+    implementation project(':mylibrary')
+
+    /* 微信 SDK（无 MTA 版本） - 通过 Maven 引入 */
+    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0'
+
+    // 注意：不要在这里再写 implementation(name:'share-weixin-release', ext:'aar')，fileTree 已经包含 .aar
 }

app/src/main/AndroidManifest.xml

@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.android.hldy">
 
+    <!-- 支持屏幕配置 -->
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
         android:normalScreens="true"
         android:resizeable="true"
-        android:smallScreens="true" /> <!-- Barcode(二维码)  begin -->
+        android:smallScreens="true" />
+
+    <!-- 权限 -->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
 
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <!-- Application -->
     <application
         android:name="io.dcloud.application.DCloudApplication"
         android:allowClearUserData="true"
@@ -24,10 +29,13 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:supportsRtl="true">
+
+        <!-- MainActivity -->
         <activity
             android:name=".MainActivity"
             android:exported="false" />
-        <!-- 应用入口 -->
+
+        <!-- PandoraEntry -->
         <activity
             android:name="io.dcloud.PandoraEntry"
             android:configChanges="orientation|keyboardHidden|screenSize|mcc|mnc|fontScale"
@@ -38,30 +46,26 @@
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <data android:scheme="hbuilder" />
-
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
             <intent-filter>
                 <data android:mimeType="image/*" />
-
                 <action android:name="android.intent.action.SEND" />
-
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="dcloud_uninview_background"
-            android:value="true" />
+        <!-- DCloud 配置 -->
+        <meta-data android:name="dcloud_uninview_background" android:value="true" />
+        <meta-data android:name="dcloud_appkey" android:value="fbd228b3f9895352bf3dc42ab2f3e2b8" />
 
+        <!-- PandoraEntryActivity -->
         <activity
             android:name="io.dcloud.PandoraEntryActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|mcc|mnc|fontScale|keyboard|smallestScreenSize|screenLayout|screenSize|uiMode"
@@ -75,16 +79,45 @@
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <action android:name="android.intent.action.VIEW" />
-
-                <data android:scheme=" " />
+                <data android:scheme="hbuilder" />
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="dcloud_appkey"
-        android:value="fbd228b3f9895352bf3dc42ab2f3e2b8" />
-    </application>
+        <!-- 你已有的微信分享（SDK自带的activity 保留） -->
+        <activity
+            android:name="com.tencent.mm.opensdk.openapi.WXApiImplActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wxda748470da82886e" />
+            </intent-filter>
+        </activity>
 
-</manifest>
+        <!-- ↓ 新增：InitProvider（用于启动时自动初始化微信，不用改 Application） -->
+        <provider
+            android:name="com.android.hldy.init.InitProvider"
+            android:authorities="${applicationId}.initprovider"
+            android:exported="false"
+            android:enabled="true" />
+
+        <!-- ↓ 新增：你的微信回调 Activity（必须在 com.android.hldy.wxapi 包下） -->
+        <activity
+            android:name="com.android.hldy.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- 请确保这里的 scheme 与你的微信 AppID 一致（含 wx 前缀） -->
+                <data android:scheme="wxda748470da82886e" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>

app/src/main/assets/apps/__UNI__FB2D473/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.004","code":10004},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.009","code":10009},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}

app/src/main/assets/apps/__UNI__FB2D473/www/pages/assess/index.css

@@ -1 +1 @@
-.calendar[data-v-0bf11501]{padding:16px}.header[data-v-0bf11501]{display:flex;flex-direction:column}.header-title[data-v-0bf11501]{display:flex;justify-content:space-between;align-items:center}.year-month[data-v-0bf11501]{font-size:18px;font-weight:700;margin-bottom:8px}.botton-father[data-v-0bf11501]{display:flex;margin-top:-.625rem}.click-button[data-v-0bf11501]{padding:.3125rem;width:3.75rem;font-size:.78125rem;height:1.25rem;margin-right:.3125rem;display:flex;justify-content:center;align-items:center;color:#fff;background-color:#888;border-radius:.3125rem}.weekdays[data-v-0bf11501]{display:flex;background-color:#e9e7fc;border-radius:.9375rem;padding:.3125rem}.weekday[data-v-0bf11501]{flex:1;text-align:center}.days[data-v-0bf11501]{display:flex;flex-wrap:wrap;padding:.3125rem}.day-cell[data-v-0bf11501]{width:2.29688rem;height:2.51563rem;text-align:center;padding-top:.25rem;padding-bottom:.25rem;box-sizing:border-box}.day-cell.prev-month .gregorian[data-v-0bf11501],.day-cell.next-month .gregorian[data-v-0bf11501]{color:#ccc}.day-cell.selected[data-v-0bf11501]{background-color:#0b98dc;border-radius:.3125rem}.day-cell.selected .gregorian[data-v-0bf11501],.day-cell.selected .lunar[data-v-0bf11501]{color:#fff}.gregorian[data-v-0bf11501]{font-size:14px}.lunar[data-v-0bf11501]{font-size:10px;color:#888}.backgroundContainer[data-v-65a124ce]{position:relative;width:100%;height:100vh;background-image:url(../../static/index/lightbgcnew.png);background-size:cover;background-position:center center;overflow:hidden}.assess-title[data-v-65a124ce]{margin-top:1.875rem;width:100%;height:1.875rem;display:flex;align-items:center;justify-content:space-between}.assess-title .right-icons[data-v-65a124ce]{display:flex;align-items:center;float:right;height:2.1875rem;margin-right:1.25rem}.assess-title .right-icons .right-icons-font[data-v-65a124ce]{margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-font-dark[data-v-65a124ce]{color:#fff;margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-img[data-v-65a124ce]{width:2.5rem;height:2.5rem;margin-left:.3125rem;margin-right:.3125rem;margin-top:-.625rem}.assess-title .right-icons .right-icons-img-icon[data-v-65a124ce]{width:1.875rem;height:2.5rem;margin-left:.25rem}.assess-title .left-icons[data-v-65a124ce]{display:flex;margin-left:1.25rem}.assess-title .left-icons .left-icons-img[data-v-65a124ce]{width:2.1875rem;height:2.1875rem}.assess-title .left-icons .right-icons-font[data-v-65a124ce]{font-weight:700;font-size:1.09375rem;margin-left:.3125rem;margin-top:.3125rem}.assess-title .left-icons .right-icons-text[data-v-65a124ce]{font-size:1.09375rem;margin-top:.3125rem}.assess-another[data-v-65a124ce]{width:100%;height:calc(100vh - 3.75rem);margin-top:.3125rem;display:flex;margin-left:1.5625rem}.assess-another .left-contain[data-v-65a124ce]{height:100%;width:18.75rem}.assess-another .left-contain .calendar[data-v-65a124ce]{width:100%;height:20.3125rem;background:linear-gradient(to top,#f4f3ff,#fff,#ecefff);border-radius:.78125rem}
+.calendar[data-v-02393a84]{padding:16px;background:#fff;border-radius:.9375rem;box-shadow:0 2px 6px rgba(0,0,0,.1);margin:0 auto}.header[data-v-02393a84]{width:100%;display:flex;flex-direction:column}.header-title[data-v-02393a84]{width:100%;display:flex;justify-content:space-between;align-items:center;margin-bottom:.3125rem}.year-month[data-v-02393a84]{font-size:18px;font-weight:700}.weekdays[data-v-02393a84]{display:flex;background-color:#f8f8fa;border-radius:.5625rem;padding:.25rem;margin-top:.25rem}.weekday[data-v-02393a84]{flex:1;text-align:center;font-size:12px}.days[data-v-02393a84]{display:flex;flex-wrap:wrap;padding:.25rem 0}.day-cell[data-v-02393a84]{width:calc(100% / 7);height:2.4375rem;text-align:center;padding-top:.25rem;box-sizing:border-box;position:relative}.day-cell.prev-month .gregorian[data-v-02393a84],.day-cell.next-month .gregorian[data-v-02393a84]{color:#ccc}.day-cell.in-range[data-v-02393a84]{background-color:#e6f7ff}.day-cell.start[data-v-02393a84],.day-cell.end[data-v-02393a84]{background-color:#0b98dc;border-radius:.25rem}.day-cell.start .gregorian[data-v-02393a84],.day-cell.end .gregorian[data-v-02393a84],.day-cell.start .lunar[data-v-02393a84],.day-cell.end .lunar[data-v-02393a84]{color:#fff}.gregorian[data-v-02393a84]{font-size:14px}.lunar[data-v-02393a84]{font-size:10px;color:#888}.head-left[data-v-02393a84]{width:3.125rem;display:flex;justify-content:space-between}.head-left .head-img[data-v-02393a84]{width:1.25rem;height:1.25rem}.backgroundContainer[data-v-65a124ce]{position:relative;width:100%;height:100vh;background-image:url(../../static/index/lightbgcnew.png);background-size:cover;background-position:center center;overflow:hidden}.assess-title[data-v-65a124ce]{margin-top:1.875rem;width:100%;height:1.875rem;display:flex;align-items:center;justify-content:space-between}.assess-title .right-icons[data-v-65a124ce]{display:flex;align-items:center;float:right;height:2.1875rem;margin-right:1.25rem}.assess-title .right-icons .right-icons-font[data-v-65a124ce]{margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-font-dark[data-v-65a124ce]{color:#fff;margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-img[data-v-65a124ce]{width:2.5rem;height:2.5rem;margin-left:.3125rem;margin-right:.3125rem;margin-top:-.625rem}.assess-title .right-icons .right-icons-img-icon[data-v-65a124ce]{width:1.875rem;height:2.5rem;margin-left:.25rem}.assess-title .left-icons[data-v-65a124ce]{display:flex;margin-left:1.25rem}.assess-title .left-icons .left-icons-img[data-v-65a124ce]{width:2.1875rem;height:2.1875rem}.assess-title .left-icons .right-icons-font[data-v-65a124ce]{font-weight:700;font-size:1.09375rem;margin-left:.3125rem;margin-top:.3125rem}.assess-title .left-icons .right-icons-text[data-v-65a124ce]{font-size:1.09375rem;margin-top:.3125rem}.assess-another[data-v-65a124ce]{width:100%;height:calc(100vh - 3.75rem);margin-top:.3125rem;display:flex;margin-left:1.5625rem}.assess-another .left-contain[data-v-65a124ce]{height:100%;width:18.75rem}.assess-another .left-contain .calendar[data-v-65a124ce]{width:100%;height:20.3125rem;background:linear-gradient(to top,#f4f3ff,#fff,#ecefff);border-radius:.78125rem}