Compare commits
No commits in common. "main" and "ming" have entirely different histories.
11
.env.example
11
.env.example
@ -1,11 +0,0 @@
|
||||
# 环境变量模板:复制为 .env.development.local 并填写真实值(该文件不提交 git)
|
||||
#
|
||||
# 生效范围:仅 NODE_ENV=development 的构建(npm run dev:h5 / dev:app-plus)
|
||||
# 发布构建(npm run build:h5 / build:app-plus)固定使用 src/env.js 中的
|
||||
# PROD_API_BASE,不会读取本文件的地址,详见 src/env.js 顶部说明。
|
||||
#
|
||||
# ⚠️ 不要用 .env.local:它在 production 模式同样会被加载,并会被构建工具注入到
|
||||
# 客户端代码里,导致内网地址出现在正式包中(scripts/check-build-env.cjs 会中止构建)。
|
||||
# ⚠️ 不要把 VUE_APP_API_BASE_OVERRIDE 写进 .env* 文件:它只允许由命令行显式注入。
|
||||
VUE_APP_API_BASE_URL=http://your-server-ip:6060
|
||||
VUE_APP_IMG_URL=https://ye4s.file.gzxunren.com
|
||||
@ -1,6 +0,0 @@
|
||||
node_modules/
|
||||
dist/
|
||||
unpackage/
|
||||
uni_modules/
|
||||
.hbuilderx/
|
||||
*.min.js
|
||||
@ -1,20 +0,0 @@
|
||||
module.exports = {
|
||||
root: true,
|
||||
env: {
|
||||
browser: true,
|
||||
node: true,
|
||||
es2021: true
|
||||
},
|
||||
parserOptions: {
|
||||
ecmaVersion: 'latest',
|
||||
sourceType: 'module'
|
||||
},
|
||||
ignorePatterns: [
|
||||
'node_modules/',
|
||||
'dist/',
|
||||
'unpackage/',
|
||||
'uni_modules/',
|
||||
'.hbuilderx/'
|
||||
],
|
||||
rules: {}
|
||||
};
|
||||
22
.gitignore
vendored
22
.gitignore
vendored
@ -21,9 +21,6 @@ yarn-error.log*
|
||||
.env.local
|
||||
.env.*.local
|
||||
|
||||
# dev:adb 记住的目标设备(本地状态)
|
||||
.dev-adb.local.json
|
||||
|
||||
# VSCode
|
||||
.vscode/
|
||||
|
||||
@ -41,23 +38,4 @@ yarn-error.log*
|
||||
# 静态资源缓存
|
||||
static/uview/
|
||||
|
||||
# ===== Android 离线打包(详见 android-offline/README.md) =====
|
||||
# 签名密钥与本地配置(含密码)不提交
|
||||
android-offline/keystore/
|
||||
config/android.json
|
||||
# 发布上传配置(含服务器地址与私钥路径,每台机器不同;模板见 config/deploy.example.json)
|
||||
config/deploy.json
|
||||
# DCloud 离线 SDK(体积大,按需下载解压,勿提交)
|
||||
android-offline/SDK/
|
||||
# 原生工程的本地产物(工程源码本身提交,保证发布基座一致)
|
||||
android-offline/HBuilder-Integrate-AS/local.properties
|
||||
android-offline/HBuilder-Integrate-AS/.gradle/
|
||||
android-offline/HBuilder-Integrate-AS/.idea/
|
||||
android-offline/HBuilder-Integrate-AS/**/build/
|
||||
android-offline/HBuilder-Integrate-AS/**/*.iml
|
||||
# 打包时拷入的 App 资源(由 dist/build/app-plus 生成)
|
||||
android-offline/HBuilder-Integrate-AS/simpleDemo/src/main/assets/apps/__UNI__0B3DAD3/
|
||||
# APK / exe 产物
|
||||
release/
|
||||
|
||||
# 其他可根据实际情况添加
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
{
|
||||
"version" : "1.0",
|
||||
"configurations" : [
|
||||
{
|
||||
"customPlaygroundType" : "local",
|
||||
"packageName" : "com.gztbyc.pda_wms",
|
||||
"playground" : "standard",
|
||||
"type" : "uni-app:app-android"
|
||||
},
|
||||
{
|
||||
"playground" : "standard",
|
||||
"type" : "uni-app:app-ios"
|
||||
}
|
||||
]
|
||||
}
|
||||
34
App.vue
Normal file
34
App.vue
Normal file
@ -0,0 +1,34 @@
|
||||
<script>
|
||||
|
||||
|
||||
export default {
|
||||
onLaunch() {
|
||||
|
||||
},
|
||||
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
|
||||
methods: {
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
/* 每个页面公共css */
|
||||
@import "@/uni_modules/uview-ui/index.scss";
|
||||
@import "common/demo.scss";
|
||||
|
||||
.status_bar {
|
||||
height: var(--status-bar-height);
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
.normar_container{
|
||||
height:100vh;
|
||||
display:flex;
|
||||
flex-direction: column;
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
</style>
|
||||
164
README.md
164
README.md
@ -1,163 +1 @@
|
||||
天豹云仓的WMS_PDA项目
|
||||
|
||||
## 文件说明
|
||||
|
||||
- `day.log`:日报记录文件,用于按天填写工作内容(今日完成、进行中、明日计划、问题与风险、备注)。
|
||||
|
||||
|
||||
## API接口文档
|
||||
|
||||
- `http://192.168.11.56:6060/api/docs/system/raw`
|
||||
|
||||
## 接口文档与登录接口关系
|
||||
|
||||
### 1)接口文档(后端)
|
||||
|
||||
- 接口文档定义了后端可调用的 method、参数和返回结构。
|
||||
- 前端并不直接写死所有 URL,而是通过本地接口映射表进行统一管理。
|
||||
|
||||
### 2)本地接口映射(前端“接口文档”)
|
||||
|
||||
- 文件:`core/request/apis.js`
|
||||
- 作用:把业务别名映射为请求配置(`path/url`、`method`、`auth`)
|
||||
|
||||
登录相关映射:
|
||||
|
||||
- `user.login`
|
||||
- `path: "user.login"`
|
||||
- 用于账号密码登录
|
||||
- `user.loginByUuid`
|
||||
- `url: "https://ye4s.wms.gztbyc.com/index/wms/wms/loginByUuid"`
|
||||
- 用于扫码/工牌 UUID 登录
|
||||
- `user.info`
|
||||
- `path: "user.info"`
|
||||
- 用于拿登录后的用户信息
|
||||
|
||||
### 3)请求封装与实际调用关系
|
||||
|
||||
#### 3.1 请求入口
|
||||
|
||||
- 文件:`core/request/index.js`
|
||||
- 统一入口:`http('user.login', data)` / `http('user.loginByUuid', data)`
|
||||
|
||||
#### 3.2 URL组装规则
|
||||
|
||||
- 文件:`core/request/request.js`
|
||||
- 若配置中有 `path`:实际请求变为 `API_URL?method={path}&v=1.0×tamp=...`
|
||||
- 若配置中有完整 `url`:直接请求该 URL(如 `loginByUuid`)
|
||||
|
||||
#### 3.3 公共请求头
|
||||
|
||||
- 文件:`core/request/request.js`
|
||||
- 默认头包含:
|
||||
- `platform: pda`
|
||||
- `project: warehouse`
|
||||
|
||||
> 注意:若后端提示 `project 不支持`,优先检查这里的 `project` 与业务参数中的 `project` 是否一致。
|
||||
|
||||
### 4)登录调用链(账号密码)
|
||||
|
||||
1. 页面发起:`pages/login/index.vue` -> `this.$store.dispatch('login', loginForm)`
|
||||
2. 状态层处理:`core/store/modules/user.js` -> `actions.login`
|
||||
3. 接口调用:`http('user.login', { username, password, device, project })`
|
||||
4. 返回处理:从响应拿 `token`,调用 `setToken(token)` 写入本地
|
||||
5. 页面跳转:登录页切换到 `/pages/index/index`
|
||||
|
||||
### 5)登录调用链(扫码/工牌)
|
||||
|
||||
1. 页面监听广播:`pages/login/index.vue`(`broadcast/setCallbacks` + `onResult`)
|
||||
2. 获取扫码结果:`result.data`(通常是 UUID 或包含 UUID 的编码串)
|
||||
3. 点击确认登录:调用 `loginByUuid(uuid)`
|
||||
4. 接口调用:`http('user.loginByUuid', { uuid })`
|
||||
5. 返回处理:提取 token 后 `setToken(token)`
|
||||
6. 页面跳转:切换到 `/pages/index/index`
|
||||
|
||||
### 6)常见错误与关系定位
|
||||
|
||||
- 报错:`project 不支持`
|
||||
- 关联:`core/request/request.js` 默认请求头 + `core/store/modules/user.js` 的 `state.app.project`
|
||||
- 报错:`登录成功但未返回token`
|
||||
- 关联:后端返回结构与前端 token 提取逻辑不一致
|
||||
- 报错:`用户信息加载失败`
|
||||
- 关联:`user.info` 接口失败、token 无效或参数不匹配
|
||||
|
||||
### 7)建议的排查顺序
|
||||
|
||||
1. 先看 `apis.js` 映射是否正确(`path/url`)
|
||||
2. 再看请求头和业务参数中的 `project/device` 是否与后端一致
|
||||
3. 再看接口返回结构是否包含 token
|
||||
4. 最后看登录后是否成功调用 `user.info`
|
||||
|
||||
## 构建与运行(uni-app Vue2 CLI 工程)
|
||||
|
||||
> 本项目已从 HBuilderX 工程迁移为 `@vue/cli` 脚手架工程(2026-10-02):
|
||||
> 业务源码全部位于 `src/`,H5 模板由 `public/index.html` 提供(即原根目录的 `template.h5.html`)。
|
||||
|
||||
### 命令
|
||||
|
||||
| 命令 | 作用 | 产物 |
|
||||
| --- | --- | --- |
|
||||
| `npm run dev:h5` | H5 开发服务器(默认 http://localhost:8080) | 内存编译 |
|
||||
| `npm run build:h5` | H5 生产构建 | `dist/build/h5` |
|
||||
| `npm run dev:app-plus` | App 资源监听编译 | `dist/dev/app-plus` |
|
||||
| `npm run build:app-plus` | App 生产构建 | `dist/build/app-plus` |
|
||||
| `npm run build:apk` | Android **发行包**(生产地址 + 产物地址校验) | `release/android/wms-pda_v*.apk` |
|
||||
| `npm run dev:adb` | Android **测试包**(注入开发地址)→ 装机 → 启动 | `release/android/dev/wms-pda_v*_dev.apk` |
|
||||
| `npm run android:pack:raw` | 仅打包(用现有 `dist/build/app-plus`,不重编前端) | 同上 |
|
||||
| `npm run check:env` | 手动校验产物接口地址 | - |
|
||||
| `npm run lint` | ESLint 自动修复 | - |
|
||||
|
||||
### App 端如何选择接口环境(测试模式)
|
||||
|
||||
| 场景 | 命令 | 接口地址来源 |
|
||||
| --- | --- | --- |
|
||||
| 发行包 | `npm run build:apk` | `src/env.js` 的 `PROD_API_BASE`(固定),构建后强制校验产物不含内网地址 |
|
||||
| 测试包 | `npm run dev:adb` | 默认 `.env.development.local` 的 `VUE_APP_API_BASE_URL` |
|
||||
| 测试包(指定后端) | `node scripts/dev-adb.cjs --api=http://x.x.x.x:6060` | 显式注入指定地址(优先级最高) |
|
||||
| 测试包(与发行一致) | `node scripts/dev-adb.cjs --prod-api` | 不注入,指向生产(用于排查线上问题) |
|
||||
|
||||
> ⚠️ 带参数时请直接用 `node scripts/dev-adb.cjs <参数>`:Windows + npm 10 下 `npm run dev:adb -- <参数>` 的 `--` 参数会被 npm 吞掉、不传给脚本(`--prod-api` 会因此失效并回落到开发地址)。不带参数的 `npm run dev:adb` 不受影响。
|
||||
|
||||
- 注入方式:编译期命令行环境变量 `VUE_APP_API_BASE_OVERRIDE`(**不写入任何 .env 文件、不落盘**),在 `src/env.js` 中优先级最高。与工作台项目的 `VITE_API_BASE_OVERRIDE` 是同一套思路。
|
||||
- 测试包产物单独放 `release/android/dev/` 且文件名带 `_dev`,**不会覆盖发行包**,也不会触发发布上传(自动加 `-Dev -NoUpload`)。
|
||||
- 设备选择:命令行 `--serial=` > 上次选择的设备(记在 `.dev-adb.local.json`,不提交)> 只有一台时自动选中 > 多台时交互选择。示例:`node scripts/dev-adb.cjs --prod-api --serial=4235737`。
|
||||
- 若在 cmd / 默认代码页(936)的窗口里运行看到中文乱码:先执行 `chcp 65001`(VS Code 内置终端、Windows Terminal 默认无需处理)。
|
||||
- 两道校验方向相反:发行包**反向**校验(产物中不得出现 `192.168.x.x`/`127.0.0.1`);测试包**正向**校验(产物中必须出现注入的地址,否则中止,避免装成生产包却以为在测开发环境)。
|
||||
- 真机 JS 日志:**离线 release 包默认不会把 `console.log` 输出到 logcat**(HBuilderX「运行到手机」靠的是 debug 基座)。测试包由 `src/core/utils/dev-log.js` 用 `plus.android` 桥接 `android.util.Log`,把 console 转发到 logcat 的 `jsLog` tag(`dev:adb` 会自动注入开关并实时跟随打印):
|
||||
```powershell
|
||||
& "$env:ANDROID_HOME\platform-tools\adb.exe" -s <序列号> logcat jsLog:V UniConsole:V UniViewConsole:V *:S
|
||||
```
|
||||
|
||||
### App 端调试与打包
|
||||
|
||||
- CLI 不提供「运行到手机」:`build:app-plus` 只产出 App 资源,用 HBuilderX 导入 `dist/build/app-plus` 运行(或使用自定义基座、离线打包)。
|
||||
- 正式云打包仍建议走 HBuilderX;`src/manifest.json` 中的 appid、模块、权限配置均保持原样。
|
||||
|
||||
### 注意事项
|
||||
|
||||
- **Node 版本**:当前在 Node 24 下构建,依赖两个脚本内开关——`--openssl-legacy-provider`(webpack 4 需要)与 `--require=./scripts/node-compat.cjs`(补回 Node 23+ 移除的 `util.isRegExp` 等历史 API)。若改用 Node 16/18,这两项会自动变成无害的空操作。
|
||||
- **`ROUTES` 常量**:由根目录 `vue.config.js`(`uni-read-pages` + DefinePlugin)注入,`uni-simple-router` 内部依赖它;缺失会在运行时抛 `ReferenceError: ROUTES is not defined`,请勿删除该配置。
|
||||
- **@dcloudio 版本必须整体一致**:当前锁定 `2.0.2-5020620260917001`(Vue2 线),升级时需全量同版本替换。
|
||||
- **依赖镜像**:`.npmrc` 指向 `registry.npmmirror.com`。
|
||||
- `src/pages/componentsA|B|C` 是 uView 官方示例页(含 67 个 `.nvue` 文件),未被 `pages.json` 注册、不参与编译,可按需删除。
|
||||
|
||||
### 接口地址与环境变量(防呆)
|
||||
|
||||
| 场景 | 地址来源 | 命令 |
|
||||
| --- | --- | --- |
|
||||
| 发布构建(H5 / App) | `src/env.js` 的 `PROD_API_BASE`(固定,不采用 .env 文件里的地址) | `npm run build:h5` / `build:app-plus` |
|
||||
| 本地开发 | `.env.development.local` 的 `VUE_APP_API_BASE_URL`(git 不跟踪) | `npm run dev:h5` / `dev:app-plus` |
|
||||
| 临时指向指定后端 | 命令行显式注入 `VUE_APP_API_BASE_OVERRIDE`(不落盘) | 见下 |
|
||||
|
||||
- 首次拉取代码后:复制 `.env.example` 为 `.env.development.local` 并填写内网地址。
|
||||
- 临时改后端(不写任何文件):`npx cross-env UNI_PLATFORM=h5 NODE_ENV=development VUE_APP_API_BASE_OVERRIDE=http://192.168.1.10:6060 vue-cli-service uni-serve`
|
||||
- **两道防线**:
|
||||
1. 生产构建只认 `PROD_API_BASE`,源码里也不再保留任何内网地址字面量;
|
||||
2. `npm run build:h5` / `build:app-plus` 结束后自动执行 `scripts/check-build-env.cjs`,产物中出现 `192.168.x.x` / `127.0.0.1`,或缺少生产域名 `qimen.wms.gztbyc.com`,即**构建失败**。手动校验:`npm run check:env`。
|
||||
- ⚠️ 开发地址**不要**写进 `.env.local`:该文件在 production 模式同样会被加载,并会被构建工具注入到客户端代码里(会被上面的校验拦下,但没必要绕这一圈)。
|
||||
- 现场排查设备连的是哪个后端:可用 `pages/settings/networkTest` 页面查看/测试接口地址。
|
||||
|
||||
### 回退方式
|
||||
|
||||
原 HBuilderX 工程完整备份在 `d:\WMS_PDA_bak_20261002-1936`(含 `node_modules`、`.hbuilderx`、`template.h5.html`、`vue.config.js`、`package.json`、`package-lock.json`)。需要回退时,把备份内容覆盖回项目根目录即可。
|
||||
|
||||
天豹云仓的WMS_PDA项目
|
||||
@ -1,28 +0,0 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
maven {url 'https://maven.aliyun.com/repository/google'}
|
||||
maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
|
||||
maven {url 'https://maven.aliyun.com/repository/public'}
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.7.3'
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
maven {url 'https://maven.aliyun.com/repository/google'}
|
||||
maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
|
||||
maven {url 'https://maven.aliyun.com/repository/public'}
|
||||
google()
|
||||
}
|
||||
}
|
||||
|
||||
task clean(type: Delete) {
|
||||
delete rootProject.buildDir
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
# 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
|
||||
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
Binary file not shown.
@ -1,6 +0,0 @@
|
||||
#Mon Dec 28 18:07:31 CST 2020
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.11.1-bin.zip
|
||||
172
android-offline/HBuilder-Integrate-AS/gradlew
vendored
172
android-offline/HBuilder-Integrate-AS/gradlew
vendored
@ -1,172 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# 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
|
||||
;;
|
||||
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"
|
||||
which java >/dev/null 2>&1 || 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
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((i+1))
|
||||
done
|
||||
case $i in
|
||||
(0) set -- ;;
|
||||
(1) set -- "$args0" ;;
|
||||
(2) set -- "$args0" "$args1" ;;
|
||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=$(save "$@")
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||
cd "$(dirname "$0")"
|
||||
fi
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
@ -1,84 +0,0 @@
|
||||
@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=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@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=
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
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 init
|
||||
|
||||
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
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
: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 %CMD_LINE_ARGS%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="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!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@ -1 +0,0 @@
|
||||
include ':simpleDemo'
|
||||
@ -1,97 +0,0 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
// ===== 统一配置:动态读取项目根 config/android.json 与 package.json(见 config/README.md)=====
|
||||
// 本文件不包含任何密码/包名等可变配置,可直接提交 git。
|
||||
def projectRoot = file('../../..')
|
||||
def cfgFile = new File(projectRoot, 'config/android.json')
|
||||
if (!cfgFile.exists()) {
|
||||
throw new GradleException('config/android.json not found. Copy config/android.example.json to config/android.json first. See config/README.md')
|
||||
}
|
||||
def cfg = new groovy.json.JsonSlurper().parseText(cfgFile.getText('UTF-8'))
|
||||
|
||||
def pkgFile = new File(projectRoot, 'package.json')
|
||||
def pkg = new groovy.json.JsonSlurper().parseText(pkgFile.getText('UTF-8'))
|
||||
def versionNameValue = pkg.version
|
||||
def versionParts = versionNameValue.tokenize('.')
|
||||
if (versionParts.size() < 3) {
|
||||
throw new GradleException("package.json version must be three-part X.Y.Z, got: ${versionNameValue}")
|
||||
}
|
||||
// versionCode = X*1000000 + Y*1000 + Z (each part 0-999)
|
||||
def versionCodeValue = versionParts[0].toInteger() * 1000000 + versionParts[1].toInteger() * 1000 + versionParts[2].toInteger()
|
||||
|
||||
android {
|
||||
compileSdkVersion 35
|
||||
buildToolsVersion '35.0.0'
|
||||
namespace cfg.packageName
|
||||
defaultConfig {
|
||||
applicationId cfg.packageName
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 33
|
||||
versionCode versionCodeValue
|
||||
versionName versionNameValue
|
||||
multiDexEnabled true
|
||||
resValue 'string', 'app_name', cfg.appName
|
||||
manifestPlaceholders = [
|
||||
'dcloud_appkey': cfg.appKey ?: ''
|
||||
]
|
||||
ndk {
|
||||
abiFilters = cfg.abis
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
}
|
||||
signingConfigs {
|
||||
config {
|
||||
keyAlias cfg.signing.keyAlias
|
||||
keyPassword cfg.signing.keyPassword
|
||||
storeFile file('../../../' + cfg.signing.keystore)
|
||||
storePassword cfg.signing.storePassword
|
||||
v1SigningEnabled true
|
||||
v2SigningEnabled true
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
debug {
|
||||
signingConfig signingConfigs.config
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
release {
|
||||
signingConfig signingConfigs.config
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
aaptOptions {
|
||||
additionalParameters '--auto-add-overlay'
|
||||
ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
|
||||
}
|
||||
}
|
||||
|
||||
// 每次构建前从 config 生成 dcloud_control.xml(appid)
|
||||
task generateDcloudControl {
|
||||
doLast {
|
||||
def controlFile = file('src/main/assets/data/dcloud_control.xml')
|
||||
controlFile.parentFile.mkdirs()
|
||||
controlFile.setText("<hbuilder>\n<apps>\n <app appid=\"${cfg.appId}\" appver=\"\"/>\n</apps>\n</hbuilder>\n", 'UTF-8')
|
||||
}
|
||||
}
|
||||
preBuild.dependsOn generateDcloudControl
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
|
||||
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
|
||||
implementation 'androidx.core:core:1.1.0'
|
||||
implementation "androidx.fragment:fragment:1.1.0"
|
||||
implementation 'androidx.recyclerview:recyclerview:1.1.0'
|
||||
implementation 'com.facebook.fresco:fresco:2.5.0'
|
||||
implementation "com.facebook.fresco:animated-gif:2.5.0"
|
||||
implementation 'com.github.bumptech.glide:glide:4.9.0'
|
||||
implementation 'com.alibaba:fastjson:1.2.83'
|
||||
implementation 'androidx.webkit:webkit:1.5.0'
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,21 +0,0 @@
|
||||
# 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
|
||||
@ -1,102 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
<!-- 应用内更新安装 APK:
|
||||
INSTALL_PACKAGES 为 5+ Runtime plus.runtime.install 静默安装路径所需声明(非系统应用实际仍走 UI 安装器);
|
||||
REQUEST_INSTALL_PACKAGES 为 Android 8+ 未知来源安装授权,7.x 及以下仅依赖全局未知来源开关 -->
|
||||
<uses-permission android:name="android.permission.INSTALL_PACKAGES" />
|
||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||
|
||||
<!-- ===== 以下权限集与 src/manifest.json 的 app-plus.distribute.android.permissions 保持一致 =====
|
||||
离线打包不会读取 manifest.json 的权限声明,必须在此处显式声明,
|
||||
增删权限时请同步两处,否则会出现「云打包能用、离线包缺权限」的差异。 -->
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.FLASHLIGHT" />
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||
<uses-permission android:name="android.permission.CALL_PHONE" />
|
||||
<uses-permission android:name="android.permission.READ_CONTACTS" />
|
||||
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
|
||||
<!-- 日志/文件:DCloud base 运行时与打印/图片上传相关 -->
|
||||
<uses-permission android:name="android.permission.READ_LOGS" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<!-- 蓝牙打印/扫码枪:Android 12(API31) 起需用 BLUETOOTH_SCAN/CONNECT 取代 BLUETOOTH/BLUETOOTH_ADMIN -->
|
||||
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
|
||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
|
||||
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
|
||||
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
|
||||
|
||||
<uses-feature android:name="android.hardware.camera" android:required="false" />
|
||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:allowClearUserData="true"
|
||||
android:icon="@drawable/icon"
|
||||
android:label="@string/app_name"
|
||||
android:largeHeap="true"
|
||||
android:extractNativeLibs="true"
|
||||
android:supportsRtl="true"
|
||||
android:usesCleartextTraffic="true">
|
||||
<activity
|
||||
android:name="io.dcloud.PandoraEntry"
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|navigation"
|
||||
android:label="@string/app_name"
|
||||
android:launchMode="singleTask"
|
||||
android:hardwareAccelerated="true"
|
||||
android:theme="@style/TranslucentTheme"
|
||||
android:screenOrientation="user"
|
||||
android:exported="true"
|
||||
android:windowSoftInputMode="adjustResize" >
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name="io.dcloud.PandoraEntryActivity"
|
||||
android:launchMode="singleTask"
|
||||
android:configChanges="orientation|keyboardHidden|screenSize|mcc|mnc|fontScale|keyboard|smallestScreenSize|screenLayout|screenSize|uiMode"
|
||||
android:hardwareAccelerated="true"
|
||||
android:permission="com.miui.securitycenter.permission.AppPermissionsEditor"
|
||||
android:screenOrientation="user"
|
||||
android:theme="@style/DCloudTheme"
|
||||
android:exported="true"
|
||||
android:windowSoftInputMode="adjustResize">
|
||||
<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=" " />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<meta-data
|
||||
android:name="dcloud_appkey"
|
||||
android:value="${dcloud_appkey}" />
|
||||
<!-- 开机自启:系统启动完成后自动拉起应用(见 BootReceiver.java) -->
|
||||
<receiver
|
||||
android:name=".BootReceiver"
|
||||
android:enabled="true"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@ -1,5 +0,0 @@
|
||||
<hbuilder>
|
||||
<apps>
|
||||
<app appid="__UNI__0B3DAD3" appver=""/>
|
||||
</apps>
|
||||
</hbuilder>
|
||||
@ -1,92 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
|
||||
<meta name="HandheldFriendly" content="true"/>
|
||||
<meta name="MobileOptimized" content="320"/>
|
||||
<title>Error</title>
|
||||
<script type="text/javascript">
|
||||
// H5 plus事件处理
|
||||
var ws=null;
|
||||
function plusReady(){
|
||||
// Android处理返回键
|
||||
plus.key.addEventListener('backbutton',function(){
|
||||
(history.length==1)&&ws.close();
|
||||
var c=setTimeout(function(){
|
||||
ws.close();
|
||||
},1000);
|
||||
window.onbeforeunload=function(){
|
||||
clearTimeout(c);
|
||||
}
|
||||
history.go(-2);
|
||||
},false);
|
||||
ws=plus.webview.currentWebview();
|
||||
}
|
||||
if(window.plus){
|
||||
plusReady();
|
||||
}else{
|
||||
document.addEventListener('plusready',plusReady,false);
|
||||
}
|
||||
document.addEventListener('touchstart',function(){
|
||||
return false;
|
||||
},true);
|
||||
// 禁止选择
|
||||
document.oncontextmenu=function(){
|
||||
return false;
|
||||
};
|
||||
// 获取错误信息
|
||||
document.addEventListener("error",function(e){
|
||||
info.innerText="请求的页面("+e.url+")无法打开";
|
||||
console.log("请求的页面无法打开:"+e.href);
|
||||
},false);
|
||||
</script>
|
||||
<style>
|
||||
*{
|
||||
-webkit-user-select: none;
|
||||
}
|
||||
html,body{
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
text-align: center;
|
||||
word-break: break-all;
|
||||
-webkit-touch-callout:none;
|
||||
-webkit-tap-highlight-color:rgba(0,0,0,0);
|
||||
}
|
||||
.button{
|
||||
width: 50%;
|
||||
font-size: 18px;
|
||||
font-weight: normal;
|
||||
text-decoration: none;
|
||||
text-align: center;
|
||||
padding: .5em 0em;
|
||||
margin: .5em auto;
|
||||
color: #333333;
|
||||
background-color: #EEEEEE;
|
||||
border: 1px solid #CCCCCC;
|
||||
-webkit-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.button:active{
|
||||
background-color: #CCCCCC;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div style="width:100%;height:20%;"></div>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 512 512" style="height:20%;width:30%">
|
||||
<g id="icomoon-ignore">
|
||||
<line stroke-width="1" x1="" y1="" x2="" y2="" stroke="#449FDB" opacity=""></line>
|
||||
</g>
|
||||
<path d="M256 0c-141.385 0-256 114.615-256 256s114.615 256 256 256 256-114.615 256-256-114.615-256-256-256zM352 128c17.673 0 32 14.327 32 32s-14.327 32-32 32-32-14.327-32-32 14.327-32 32-32zM160 128c17.673 0 32 14.327 32 32s-14.327 32-32 32-32-14.327-32-32 14.327-32 32-32zM352.049 390.37c-19.587-32.574-55.272-54.37-96.049-54.37s-76.462 21.796-96.049 54.37l-41.164-24.698c27.98-46.535 78.958-77.672 137.213-77.672s109.232 31.137 137.213 77.672l-41.164 24.698z" fill="#666666"></path>
|
||||
</svg>
|
||||
<p style="font-size:18px;font-weight:bolder;">We're sorry ...</p>
|
||||
<p id="info" style="font-size:12px;"></p>
|
||||
<!--<div class="button" onclick="history.back()">Retry</div>-->
|
||||
<div class="button" onclick="if(history.length == 1){ws.close();}else{ws.back();ws.back();}">Back</div>
|
||||
<div class="button" onclick="ws.close()">Close</div>
|
||||
<div class="button" onclick="plus.runtime.restart()">Restart</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,46 +0,0 @@
|
||||
<properties>
|
||||
<features>
|
||||
<feature name="Barcode" value="io.dcloud.feature.barcode2.BarcodeFeatureImpl"/>
|
||||
<feature name="Bluetooth" value="io.dcloud.feature.bluetooth.BluetoothFeature"/>
|
||||
<feature name="Maps" value="io.dcloud.js.map.amap.JsMapPluginImpl"/>
|
||||
<!--<feature name="Maps" value="io.dcloud.js.map.JsMapPluginImpl"/>-->
|
||||
<feature name="Contacts" value="io.dcloud.feature.contacts.ContactsFeatureImpl"/>
|
||||
<feature name="Messaging" value="io.dcloud.adapter.messaging.MessagingPluginImpl"/>
|
||||
<feature name="Camera" value="io.dcloud.js.camera.CameraFeatureImpl"/>
|
||||
<feature name="Console" value="io.dcloud.feature.pdr.LoggerFeatureImpl"/>
|
||||
<feature name="Device" value="io.dcloud.feature.device.DeviceFeatureImpl"/>
|
||||
<feature name="File" value="io.dcloud.js.file.FileFeatureImpl"/>
|
||||
<feature name="Proximity" value="io.dcloud.feature.sensor.ProximityFeatureImpl"/>
|
||||
<feature name="Storage" value="io.dcloud.feature.pdr.NStorageFeatureImpl"/>
|
||||
<feature name="Cache" value="io.dcloud.feature.pdr.CoreCacheFeatureImpl"/>
|
||||
<feature name="Invocation" value="io.dcloud.invocation.Invocation"/>
|
||||
<feature name="Navigator" value="io.dcloud.feature.ui.navigator.NavigatorUIFeatureImpl"/>
|
||||
<feature name="NativeUI" value="io.dcloud.feature.ui.nativeui.NativeUIFeatureImpl"/>
|
||||
<feature name="UI" value="io.dcloud.feature.ui.UIFeatureImpl">
|
||||
<module name="Navigator" value="io.dcloud.feature.ui.NavView"/>
|
||||
</feature>
|
||||
<feature name="Gallery" value="io.dcloud.js.gallery.GalleryFeatureImpl"/>
|
||||
<feature name="Downloader" value="io.dcloud.net.DownloaderFeatureImpl"/>
|
||||
<feature name="Uploader" value="io.dcloud.net.UploadFeature"/>
|
||||
<feature name="Zip" value="io.dcloud.feature.pdr.ZipFeature"/>
|
||||
<feature name="Audio" value="io.dcloud.feature.audio.AudioFeatureImpl"/>
|
||||
<feature name="Runtime" value="io.dcloud.feature.pdr.RuntimeFeatureImpl"/>
|
||||
<feature name="VideoPlayer" value="io.dcloud.media.MediaFeatureImpl"/>
|
||||
<feature name="LivePusher" value="io.dcloud.media.live.LiveMediaFeatureImpl"/>
|
||||
<feature name="XMLHttpRequest" value="io.dcloud.net.XMLHttpRequestFeature"/>
|
||||
<feature name="Statistic" value="io.dcloud.feature.statistics.StatisticsFeatureImpl"/>
|
||||
<feature name="Accelerometer" value="io.dcloud.feature.sensor.AccelerometerFeatureImpl"/>
|
||||
<feature name="Orientation" value="io.dcloud.feature.sensor.OrientationFeatureImpl"/>
|
||||
<feature name="NativeObj" value="io.dcloud.feature.nativeObj.FeatureImpl"/>
|
||||
<feature name="Geolocation" value="io.dcloud.js.geolocation.GeolocationFeatureImpl"/>
|
||||
<feature name="Stream" value="io.dcloud.appstream.js.StreamAppFeatureImpl"/>
|
||||
<feature name="plugintest" value="com.example.H5PlusPlugin.PGPlugintest"/>
|
||||
</features>
|
||||
|
||||
<services>
|
||||
<service name="push" value="io.dcloud.feature.aps.APSFeatureImpl"/>
|
||||
<service name="Statistic" value="io.dcloud.feature.statistics.StatisticsBootImpl"/>
|
||||
<service name="Downloader" value="io.dcloud.net.DownloaderBootImpl"/>
|
||||
<!--<service name="Maps" value="io.dcloud.js.map.MapInitImpl"/>-->
|
||||
</services>
|
||||
</properties>
|
||||
@ -1,34 +0,0 @@
|
||||
package com.gztbyc.pda_wms;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
||||
/**
|
||||
* 开机自启:监听系统开机完成广播,自动拉起应用。
|
||||
* 说明:Android 3.1+ 要求应用至少被用户启动过一次后,BOOT_COMPLETED 才会送达。
|
||||
*/
|
||||
public class BootReceiver extends BroadcastReceiver {
|
||||
|
||||
private static final String ACTION_QUICKBOOT_POWERON = "android.intent.action.QUICKBOOT_POWERON";
|
||||
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
if (intent == null || intent.getAction() == null) {
|
||||
return;
|
||||
}
|
||||
final String action = intent.getAction();
|
||||
if (!Intent.ACTION_BOOT_COMPLETED.equals(action) && !ACTION_QUICKBOOT_POWERON.equals(action)) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
|
||||
if (launch != null) {
|
||||
launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
context.startActivity(launch);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// 启动失败不阻断系统广播
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB |
@ -1,3 +0,0 @@
|
||||
<resources>
|
||||
<!-- app_name 由 build.gradle 从 config/android.json 动态注入(resValue),此处不再定义 -->
|
||||
</resources>
|
||||
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="DCloudActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:colorEdgeEffect">#333333</item>
|
||||
<item name="android:windowBackground">@color/ime_background</item>
|
||||
<item name="android:forceDarkAllowed">false</item>
|
||||
</style>
|
||||
</resources>
|
||||
@ -1,101 +0,0 @@
|
||||
# Android 离线打包(WMS_PDA)
|
||||
|
||||
本目录是 DCloud 官方 **Android 离线打包**集成工程,用于在本地用命令行出 APK(不需要 Android Studio,也不依赖 DCloud 云打包)。
|
||||
|
||||
## 目录
|
||||
|
||||
| 路径 | 说明 | git |
|
||||
|---|---|---|
|
||||
| `HBuilder-Integrate-AS/` | Android Studio 集成工程,**已提交**(保证发布基座一致)。包名/版本/签名/应用名/appid/appKey 全部由 `simpleDemo/build.gradle` 在构建时从 `config/android.json` 与根 `package.json` 动态读取,工程内不含任何密码 | ✅ |
|
||||
| `HBuilder-Integrate-AS/simpleDemo/libs/` | 5+ Runtime 等 aar(`lib.5plus.base-release.aar`、`uniapp-v8-release.aar`、`breakpad`、`install-apk` 等) | ✅ |
|
||||
| `keystore/` | 签名密钥文件 | ❌ (忽略) |
|
||||
| `icon/` `splash/` | 图标与启动图源文件,`prepare.cjs` 用它们覆盖 `res/` 下同名资源 | ✅ |
|
||||
| `SDK/` | DCloud 离线 SDK 解压目录(体积大,约 165MB),仅在需要额外原生模块时才下载 | ❌ (忽略) |
|
||||
| `pack.ps1` | 命令行打包主脚本(JDK/SDK 探测 → 注入 → `gradlew assembleRelease`) | ✅ |
|
||||
| `prepare.cjs` | 注入 App 资源、覆盖图标/启动图、对齐 `compilerVersion` | ✅ |
|
||||
|
||||
## 一键打包
|
||||
|
||||
```powershell
|
||||
npm run build:apk # 发行包:生产编译 + 产物地址校验 + 离线打包
|
||||
npm run build:apk -- -Clean # gradle 全量重编
|
||||
npm run build:apk -- -NoInject # 跳过资源注入(已注入过时用)
|
||||
npm run android:pack:raw # 跳过前端编译,仅用现有 dist/build/app-plus 打包
|
||||
|
||||
npm run dev:adb # 测试包:注入开发地址 → 打包 → 装机 → 启动(产物进 release/android/dev)
|
||||
npm run dev:adb -- --prod-api # 测试包但指向生产(排查线上问题时用)
|
||||
npm run dev:adb -- --api=http://192.168.1.10:6060 --no-install
|
||||
```
|
||||
|
||||
产物:`release/android/wms-pda_v{版本}_release.apk`(测试包为 `release/android/dev/wms-pda_v{版本}_release_dev.apk`)。版本唯一来源是根 `package.json` 的 `version`(X.Y.Z),`versionCode` 自动推导为 `X*1000000 + Y*1000 + Z`。
|
||||
|
||||
> ⚠ **版本号要两处同步**:`package.json.version` 与 `src/manifest.json` 的 `versionName`/`versionCode`(后者供 HBuilderX 云打包使用)。`prepare.cjs` 会在打包前校验两者并告警,避免云包/离线包版本号不一致。
|
||||
>
|
||||
> 历名包在线上的 `versionCode` 是云打包时手工填的小数字(如 1.0.121 → 125),而离线方案会得到 `1000122` 这类值。**今后统一用 `package.json` 推导,不要再手工填小数字**,否则切回云打包时会变成「降级安装」被系统拦下。
|
||||
|
||||
## 图标与启动图
|
||||
|
||||
| 文件 | 来源 | 尺寸 |
|
||||
|---|---|---|
|
||||
| `icon/app-icon.png` | 从线上 APK(v1.0.121)`res/9T.png` 提取 | 512×512 |
|
||||
| `splash/splash.png` | 从线上 APK `res/-u.png` 提取 | 1242×2208(竖屏) |
|
||||
|
||||
`prepare.cjs` 会把它们覆盖到 `simpleDemo/src/main/res/drawable/{icon,splash}.png`。有更高清的原始图标(如 1024×1024)时直接覆盖 `icon/app-icon.png` 即可。
|
||||
|
||||
从任意 APK 里重新取素材的办法:
|
||||
|
||||
```powershell
|
||||
# 解包 APK 后用 aapt2 查出图标文件名,再按尺寸挑最大的一张
|
||||
& "$env:ANDROID_HOME\build-tools\35.0.0\aapt2.exe" dump badging <apk路径> | Select-String 'application-icon'
|
||||
```
|
||||
|
||||
环境要求:JDK 17+(脚本会自动探测 `JAVA_HOME`、Android Studio JBR 等常见位置)、Android SDK(`ANDROID_HOME`/`ANDROID_SDK_ROOT`/`local.properties` 任一即可)。
|
||||
|
||||
## 与云打包的差异(重要)
|
||||
|
||||
- **签名不同**:云打包用的是 DCloud 的证书,本地离线打包用 `config/android.json` 配置的 keystore。若此前对外发布过云打包版本,切换后**签名不一致、无法覆盖安装**(需先卸载重装);若包名+签名已被第三方 SDK/推送/应用商店绑定,需要重新登记。
|
||||
- **权限来自 AndroidManifest**:离线打包**不会**读取 `src/manifest.json` 的权限声明,权限必须写在 `HBuilder-Integrate-AS/simpleDemo/src/main/AndroidManifest.xml`。增删权限时请两处同步,否则会出现「云打包能用、离线包缺权限」的差异。
|
||||
- **明文 HTTP**:生产接口是 `http://qimen.wms.gztbyc.com`,所以 `<application>` 上显式声明了 `android:usesCleartextTraffic="true"`(Android 9+ 默认禁止明文 HTTP)。日后切 HTTPS 可移除。
|
||||
- **appKey 校验**:`appKey` 与 `appId` + 包名 + 证书 SHA-256 严格绑定,不匹配时 APK 能装能开但启动白屏提示「未配置appkey或配置错误」。详见 `config/README.md`。
|
||||
- **Runtime 版本提示**:`prepare.cjs` 会把 www 内 `manifest.json`/`app-config-service.js` 的 `compilerVersion` 对齐到 `config/android.json` 的 `runtimeVersion`,用于消除启动时「本应用使用 HBuilderX %s 编译,而手机端 SDK 版本是 %s」的提示。
|
||||
|
||||
## 5+ 模块(aar)与 manifest 里勾选的模块
|
||||
|
||||
离线打包**不会**自动带上 `src/manifest.json` 里勾选的模块,必须同时满足两个条件:
|
||||
|
||||
1. 该模块的 aar 放进 `HBuilder-Integrate-AS/simpleDemo/libs/`;
|
||||
2. 在 `simpleDemo/src/main/assets/data/dcloud_properties.xml` 里声明对应 `<feature>`。
|
||||
|
||||
否则运行时才报错(例如蓝牙会提示「缺少蓝牙模块」,且代码里找不到该文案——它来自 5+ 运行时)。
|
||||
|
||||
当前已包含:
|
||||
|
||||
| 模块 | 提供物 | 备注 |
|
||||
|---|---|---|
|
||||
| Bluetooth(蓝牙打印 / 蓝牙扫码枪) | `libs/Bluetooth-release.aar` + `<feature name="Bluetooth" value="io.dcloud.feature.bluetooth.BluetoothFeature"/>` | 从离线 SDK 的 `SDK/libs/` 复制;本工程最初缺这一项(骨架克隆自不使用蓝牙的项目) |
|
||||
| Barcode / Camera / File / Storage / Console 等 | `libs/lib.5plus.base-release.aar` | 基础运行时自带 |
|
||||
| Webview-x5 | 未单独引入 | 已比对线上云打包 APK:其原生库与本工程完全一致(无 X5 专属 so),故保持一致 |
|
||||
|
||||
新增其他模块时:到离线 SDK 的 `SDK/libs/` 找同名 aar(命名通常是 `<模块>-release.aar`,如 `geolocation-amap-release.aar`、`share-weixin-release.aar`、`speech-release.aar`),复制到 `libs/`,并在 `dcloud_properties.xml` 增加同名 `<feature>` 行——**类名最快来源是从已发布的云端 APK 里抄**:
|
||||
|
||||
```powershell
|
||||
# 解包云端 APK 后对比两份配置,差异即为缺失的模块声明
|
||||
# (线上包 assets/data/dcloud_properties.xml vs 本工程同名文件)
|
||||
```
|
||||
|
||||
验证模块是否真的打进包里:
|
||||
|
||||
```powershell
|
||||
tar -xf release\android\wms-pda_v*.apk -C $env:TEMP\apkchk
|
||||
findstr /m /c:"io/dcloud/feature/bluetooth" $env:TEMP\apkchk\*.dex
|
||||
```
|
||||
|
||||
## 首次使用清单
|
||||
|
||||
1. 在 `config/android.json` 填 `appKey`、`keyAlias`、`storePassword`、`keyPassword`(该文件不提交 git);
|
||||
2. 把对应证书放入 `android-offline/keystore/`;
|
||||
3. `npm run build:apk`。
|
||||
|
||||
> ⚠️ **`appKey` 必须与签名证书指纹匹配**。线上已发布 APK(云打包,签名证书 SHA-256 `d9689a9b…25d6ff`)内的 appKey 为 `f523d8541674ad75105fa604f5a51a54`——它**只对该 SHA-256 对应的证书有效**。若本地离线打包用的是自有 keystore(`android-offline/keystore/` 里那把),需先比对指纹,不一致则到 dev.dcloud.net.cn 重新申请,否则 APK 启动会白屏提示「未配置appkey或配置错误」。比对办法见 `config/README.md`。
|
||||
|
||||
> 发布上传(scp + `latest.json`)在 `pack.ps1` 内,但只有存在 `config/deploy.json` 时才会执行;本仓库不提供该文件,因此默认不会上传。
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.4 KiB |
@ -1,3 +0,0 @@
|
||||
app-icon.png 已生成(1024x1024,深蓝渐变 + 包裹箱 + 扫描线,无文字)。
|
||||
如需重新生成或调整设计,编辑 scripts/gen-android-assets.ps1 后运行:
|
||||
powershell -NoProfile -ExecutionPolicy Bypass -File scripts\gen-android-assets.ps1
|
||||
@ -1,54 +0,0 @@
|
||||
# html5plus runtime 使用许可协议
|
||||
本协议是数字天堂(北京)网络技术有限公司(以下称“DCloud”)与您之间达成的关于html5plus runtime及相关配套软件(以下简称本软件)的协议。
|
||||
本协议签订地点为中华人民共和国北京市海淀区。
|
||||
您使用本软件即视为您已阅读并同意受本协议的约束。
|
||||
|
||||
## 定义
|
||||
html5plus runtime,即DCloud公司提供的App端引擎,该引擎可用于5+App、wap2app、uni-app的App端打包,及5+sdk、uni小程序sdk等离线打包用sdk。
|
||||
本软件包含iOS版和Android版。
|
||||
|
||||
本软件包括很多模块,包括DCloud的uni统计、uni-AD、uniPush等业务的客户端sdk部分,也属于本产品的模块。但这些模块都可以由您自行选择是否启用。
|
||||
|
||||
## 知识产权及使用授权
|
||||
您可以自由下载、使用、复制本软件而不需要向DCloud付费。无时间和地域限制。
|
||||
DCloud所拥有的知识产权,包括但不限于商标、专利、著作权、商业秘密、专有数据、源码,并不发生转移或共享。
|
||||
您使用本软件开发的代码及输出物,即手机端移动应用,其知识产权归属您所有。
|
||||
类似于您开发的应用内嵌了jvm或.net framework,虽然您的java代码的著作权属于您,但jvm等三方runtime的知识产权仍归原作者所有。
|
||||
如果DCloud开源了某些代码,这些代码会有单独的开源许可协议并提供在github等网站的DCloud官方账号下。您可以在遵守这些开源协议的基础上使用DCloud开源的代码。
|
||||
本软件可能会使用第三方软件或技术,例如三方开源代码,这类使用已经确保遵循这些三方软件的授权协议。详细的列表在本软件目录下的ThirdPartyNotices文件中查阅。
|
||||
特别的,如果您使用uni小程序sdk,该产品的授权范围仅限制在原生App中将某个栏目或模块进行小程序化而使用,不可用于将uni-app前端代码打包成App。
|
||||
您不得破解、反编译、逆向工程本软件,不得破解或劫持本软件网络请求,不得对DCloud服务进行网络攻击,不得利用DCloud系统漏洞谋利或侵害DCloud利益,不得替换、删改本软件自带的非用户自定义文件。
|
||||
未经书面许可您不可利用DCloud产品的全部或部分文件、模块、组件来制作与DCloud争夺用户的产品。
|
||||
|
||||
|
||||
## 隐私条款
|
||||
DCloud尊重用户隐私,遵循国家对数据隐私保护的相关法律法规,并在此公开所有本软件会上报DCloud服务器的数据清单,以及说明数据采集的必要性。
|
||||
1. 异常崩溃、错误日志
|
||||
本软件发生错误异常、崩溃时,会将错误信息发送给DCloud服务器。
|
||||
这些信息除了错误内容,也包括应用基本信息(如appid、包名)和环境信息(如设备型号、os名称、版本、网络类型等)。
|
||||
同时DCloud会提供web界面供您查看了解崩溃情况。您可以分析错误在什么情况下产生,不同设备的崩溃率分布情况,并进行改进。
|
||||
由于开发者的代码为前端代码,无法捕获原生异常和崩溃。如果DCloud不提供此信息,您将无法了解相关情况,所以采集和输出报告是帮助您顺利使用本软件的必要举措。
|
||||
2. 启动速度性能分析
|
||||
本软件每次启动会记录启动时长,也包括上述应用基本信息和环境信息。
|
||||
同时DCloud会提供web界面供你了解相关性能报表。您可以分析在不同的设备、网络环境下您的应用的启动速度是否异常,并进行改进。
|
||||
由于开发者的代码为前端代码,无法记录App初始启动计时点。如果DCloud不提供此信息,您将无法了解相关情况,所以采集和输出报告是帮助您顺利使用本软件的必要举措。
|
||||
3. 本软件不会采集用户的短信、通讯录、相册、剪贴板信息,不会采集用户的摄像头、麦克风数据。
|
||||
4. 除非国家法律法规规定或得到您的许可,否则DCloud不会将采集的数据授权给任何第三方。
|
||||
5. 如果您使用了DCloud的其他联网业务,比如uni统计、uni-AD、uniPush,这些业务的隐私条款不包括在本协议中。
|
||||
|
||||
## 安全
|
||||
您理解并同意,本软件同其他软件一样,无法承诺绝对的安全性。
|
||||
当DCloud发现本软件的任何安全漏洞时,将及时在[社区](https://ask.dcloud.net.cn/explore/)发送公告,并将及时发布紧急更新补丁和升级推送通知。
|
||||
|
||||
## 免责声明和违约条款
|
||||
您在使用本软件前应进行有效评估,DCloud不因您使用本软件而承担任何法律责任或经济赔偿责任。
|
||||
如果您违反本协议,包括但不限于破解本软件,DCloud将有权停止您使用本软件,造成的损失由您自行承担。
|
||||
如果您给DCloud造成重大损失,或者在接收到DCloud的停止违约通知后拒不改正,DCloud将有权停止对您的DCloud所有产品和服务的使用授权,罚没您在DCloud所有产品服务中的预付款项和应收款项,因此造成的损失由您自行承担。
|
||||
如果您的行为产生法律问题,DCloud有权追责您的法律责任。
|
||||
|
||||
## 协议修订
|
||||
根据发展,DCloud可能会对本协议进行修改。修改时,DCloud会在产品或者网页中显著的位置发布相关信息以便及时通知到用户。如果您选择继续使用本软件,即表示您同意接受这些修改。
|
||||
|
||||
## 联系我们
|
||||
若您对本软件有任何疑问、意见和建议,欢迎联系我们:[网站](https://DCloud.io)
|
||||
若您对本协议有任何不满,希望更改条款,可以通过与 bd@dcloud.io 沟通,商谈您需要的付费版使用协议。
|
||||
@ -1,338 +0,0 @@
|
||||
# Command-line APK packaging for WMS_PDA (no Android Studio needed).
|
||||
# Flow: detect JDK/SDK -> inject config (prepare.cjs) -> gradlew assembleRelease -> copy APK to release/android/
|
||||
#
|
||||
# 发布上传默认关闭:未提供 config/deploy.json 时会跳过(本仓库不提供该文件)。
|
||||
#
|
||||
# Usage:
|
||||
# .\pack.ps1 # package release APK
|
||||
# .\pack.ps1 -Clean # full rebuild
|
||||
# .\pack.ps1 -Timestamp # keep timestamped artifact name
|
||||
# .\pack.ps1 -VersionName "1.0.2" # override version (written back to package.json; versionCode auto-derived)
|
||||
# .\pack.ps1 -VersionCode 10002 # manually set versionCode (rarely needed)
|
||||
# .\pack.ps1 -NoInject # skip prepare.cjs injection (already injected)
|
||||
# .\pack.ps1 -NoUpload # package only, skip publish upload (scp + latest.json)
|
||||
# .\pack.ps1 -JavaHome '...' -AndroidSdk '...'
|
||||
param(
|
||||
[switch]$Clean,
|
||||
[switch]$Timestamp,
|
||||
[switch]$NoInject,
|
||||
[switch]$NoUpload,
|
||||
[switch]$Dev,
|
||||
[string]$VersionName = "",
|
||||
[string]$VersionCode = "",
|
||||
[string]$JavaHome = "",
|
||||
[string]$AndroidSdk = ""
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
|
||||
# ============ paths ============
|
||||
$root = Split-Path -Parent $MyInvocation.MyCommand.Path
|
||||
$projRoot = Split-Path -Parent $root
|
||||
Set-Location $root
|
||||
|
||||
$asDir = Join-Path $root 'HBuilder-Integrate-AS'
|
||||
$module = 'simpleDemo'
|
||||
$appFile = 'wms-pda'
|
||||
$gradlew = Join-Path $asDir 'gradlew.bat'
|
||||
$distDir = Join-Path $projRoot 'release\android'
|
||||
# -Dev: 真机调试包(接口地址可能指向开发环境),单独目录 + 文件名后缀,绝不覆盖发行包
|
||||
if ($Dev) { $distDir = Join-Path $distDir 'dev' }
|
||||
$apkSource = Join-Path $asDir "$module\build\outputs\apk\release\$module-release.apk"
|
||||
$buildGradle = Join-Path $asDir "$module\build.gradle"
|
||||
$configPath = Join-Path $projRoot 'config\android.json'
|
||||
|
||||
# ============ JDK detect (JDK 17+ required) ============
|
||||
function Get-JavaMajorVersion([string]$javaExe) {
|
||||
$prev = $ErrorActionPreference
|
||||
$ErrorActionPreference = 'Continue'
|
||||
try {
|
||||
$out = (cmd /c "`"$javaExe`" -version 2>&1" | Out-String)
|
||||
} finally {
|
||||
$ErrorActionPreference = $prev
|
||||
}
|
||||
if ($out -match 'version\s+"1\.(\d+)') { return [int]$Matches[1] }
|
||||
if ($out -match 'version\s+"(\d+)') { return [int]$Matches[1] }
|
||||
return 0
|
||||
}
|
||||
|
||||
$jdkCandidates = @()
|
||||
if ($JavaHome) { $jdkCandidates += $JavaHome }
|
||||
if ($env:JAVA_HOME) { $jdkCandidates += $env:JAVA_HOME }
|
||||
$jdkCandidates += @(
|
||||
"$env:LOCALAPPDATA\Programs\EclipseAdoptium",
|
||||
"$env:LOCALAPPDATA\Programs\Android Studio\jbr",
|
||||
"C:\Program Files\Android\Android Studio\jbr",
|
||||
"D:\Program Files\Android\Android Studio\jbr",
|
||||
"$env:USERPROFILE\.jdks",
|
||||
"C:\Program Files\Java",
|
||||
"C:\Program Files\Eclipse Adoptium"
|
||||
)
|
||||
|
||||
$selectedJava = ""
|
||||
foreach ($c in $jdkCandidates) {
|
||||
if (-not $c) { continue }
|
||||
$javaExe = Join-Path $c 'bin\java.exe'
|
||||
if (-not (Test-Path $javaExe)) {
|
||||
$found = Get-ChildItem $c -Recurse -Filter java.exe -ErrorAction SilentlyContinue | Select-Object -First 1
|
||||
if ($found) { $javaExe = $found.FullName }
|
||||
}
|
||||
if (Test-Path $javaExe) {
|
||||
$major = Get-JavaMajorVersion $javaExe
|
||||
if ($major -ge 17) {
|
||||
$selectedJava = Split-Path -Parent (Split-Path -Parent $javaExe)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($selectedJava -and (Test-Path (Join-Path $selectedJava 'bin\java.exe'))) {
|
||||
$JavaHome = $selectedJava
|
||||
$env:JAVA_HOME = $JavaHome
|
||||
$env:Path = "$JavaHome\bin;$env:Path"
|
||||
} else {
|
||||
Write-Host ""
|
||||
Write-Host "[error] JDK 17+ not found. Install JDK 17+ (or Android Studio JBR) or use -JavaHome '...'." -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
|
||||
# ============ Android SDK detect ============
|
||||
if (-not $AndroidSdk) { $AndroidSdk = $env:ANDROID_HOME }
|
||||
if (-not $AndroidSdk) { $AndroidSdk = $env:ANDROID_SDK_ROOT }
|
||||
$localProps = Join-Path $asDir 'local.properties'
|
||||
if (-not $AndroidSdk -and (Test-Path $localProps)) {
|
||||
$line = Select-String -Path $localProps -Pattern '^sdk\.dir=(.+)$'
|
||||
if ($line) { $AndroidSdk = [regex]::Replace($line.Matches[0].Groups[1].Value, '\\([\\:])', '$1') }
|
||||
}
|
||||
if (-not $AndroidSdk -or -not (Test-Path (Join-Path $AndroidSdk 'platform-tools'))) {
|
||||
$sdkCandidates = @(
|
||||
"$env:LOCALAPPDATA\Android\Sdk",
|
||||
"$env:USERPROFILE\AppData\Local\Android\Sdk",
|
||||
"C:\Android\Sdk",
|
||||
"D:\Android\Sdk"
|
||||
)
|
||||
foreach ($c in $sdkCandidates) {
|
||||
if (Test-Path (Join-Path $c 'platform-tools')) { $AndroidSdk = $c; break }
|
||||
}
|
||||
}
|
||||
if ($AndroidSdk -and (Test-Path (Join-Path $AndroidSdk 'platform-tools'))) {
|
||||
$env:ANDROID_HOME = $AndroidSdk
|
||||
$env:ANDROID_SDK_ROOT = $AndroidSdk
|
||||
$escaped = $AndroidSdk -replace '\\', '\\'
|
||||
$sdkLine = "sdk.dir=$escaped"
|
||||
if (Test-Path $localProps) {
|
||||
$props = Get-Content $localProps -Raw
|
||||
if ($props -match '(?m)^sdk\.dir=') {
|
||||
$props = $props -replace '(?m)^sdk\.dir=.*$', $sdkLine
|
||||
} else {
|
||||
$props = $props.TrimEnd() + "`r`n" + $sdkLine + "`r`n"
|
||||
}
|
||||
Set-Content -Path $localProps -Value $props -Encoding ASCII
|
||||
} else {
|
||||
Set-Content -Path $localProps -Value $sdkLine -Encoding ASCII
|
||||
}
|
||||
} else {
|
||||
Write-Host ""
|
||||
Write-Host "[error] Android SDK not found. Set ANDROID_HOME or use -AndroidSdk." -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
|
||||
# ============ pre-check ============
|
||||
if (-not (Test-Path $gradlew)) { Write-Host "[error] gradlew not found: $gradlew" -ForegroundColor Red; exit 1 }
|
||||
if (-not (Test-Path $configPath)) { Write-Host "[error] config/android.json not found. Copy config/android.example.json to config/android.json first." -ForegroundColor Red; exit 1 }
|
||||
if (-not (Test-Path $buildGradle)) { Write-Host "[error] build.gradle not found: $buildGradle" -ForegroundColor Red; exit 1 }
|
||||
|
||||
# ============ version: single source of truth = package.json ============
|
||||
# versionName = package.json "version" (X.Y.Z, three-part)
|
||||
# versionCode = X*1000000 + Y*1000 + Z (derived; each part must be 0-999)
|
||||
$pkgPath = Join-Path $projRoot 'package.json'
|
||||
if (-not (Test-Path $pkgPath)) { Write-Host "[error] package.json not found: $pkgPath" -ForegroundColor Red; exit 1 }
|
||||
|
||||
$pkg = Get-Content $pkgPath -Raw -Encoding UTF8 | ConvertFrom-Json
|
||||
$verName = [string]$pkg.version
|
||||
|
||||
# -VersionName overrides and writes back to package.json (keeps exe/apk in sync)
|
||||
if ($VersionName) {
|
||||
$verName = $VersionName
|
||||
$raw = [System.IO.File]::ReadAllText($pkgPath, [System.Text.Encoding]::UTF8)
|
||||
$raw = $raw -replace '("version"\s*:\s*")[^"]*(")', ('${1}' + $VersionName + '${2}')
|
||||
[System.IO.File]::WriteAllText($pkgPath, $raw, (New-Object System.Text.UTF8Encoding($false)))
|
||||
Write-Host ""
|
||||
Write-Host "[update] version written back to package.json -> $VersionName" -ForegroundColor Cyan
|
||||
}
|
||||
|
||||
# versionCode: explicit -VersionCode wins, otherwise derived from X.Y.Z
|
||||
if ($VersionCode) {
|
||||
$verCode = $VersionCode
|
||||
} else {
|
||||
$parts = @($verName -split '\.')
|
||||
if ($parts.Count -lt 3) {
|
||||
Write-Host "[error] version '$verName' must be three-part (X.Y.Z)" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
$numX = [int]$parts[0]
|
||||
$numY = [int]$parts[1]
|
||||
$numZ = [int]$parts[2]
|
||||
if ($numX -gt 999 -or $numY -gt 999 -or $numZ -gt 999) {
|
||||
Write-Host "[error] each part of version '$verName' must be 0-999 (e.g. 1.0.101 is ok, 1.0.1000 is not)" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
$verCode = [string]($numX * 1000000 + $numY * 1000 + $numZ)
|
||||
Write-Host ""
|
||||
Write-Host "[info] versionCode derived: $verName -> $verCode" -ForegroundColor DarkGray
|
||||
}
|
||||
|
||||
$cfg = Get-Content $configPath -Raw -Encoding UTF8 | ConvertFrom-Json
|
||||
|
||||
Write-Host ""
|
||||
Write-Host "================== uni-app Android packaging ==================" -ForegroundColor Cyan
|
||||
Write-Host " project : $root"
|
||||
Write-Host " appid : $($cfg.appId)"
|
||||
Write-Host " version : $verName ($verCode)"
|
||||
Write-Host " build : release"
|
||||
Write-Host " JDK : $($env:JAVA_HOME)"
|
||||
Write-Host " AndroidSDK: $($env:ANDROID_HOME)"
|
||||
Write-Host "===============================================================" -ForegroundColor Cyan
|
||||
|
||||
# ============ step 1: inject (prepare.cjs) ============
|
||||
if (-not $NoInject) {
|
||||
Write-Host ""
|
||||
Write-Host "[step 1/3] inject config + www resources (prepare.cjs) ..." -ForegroundColor Yellow
|
||||
node (Join-Path $root 'prepare.cjs')
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Write-Host "[error] prepare.cjs failed" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
} else {
|
||||
Write-Host ""
|
||||
Write-Host "[step 1/3] -NoInject specified, skip prepare.cjs" -ForegroundColor DarkGray
|
||||
}
|
||||
|
||||
# ============ step 2: gradle build ============
|
||||
$step = 2
|
||||
if ($Clean) {
|
||||
Write-Host ""
|
||||
Write-Host "[step 2/3] gradle clean ..." -ForegroundColor Yellow
|
||||
Push-Location $asDir
|
||||
& $gradlew clean --console=plain
|
||||
$cleanCode = $LASTEXITCODE
|
||||
Pop-Location
|
||||
if ($cleanCode -ne 0) { Write-Host "[error] clean failed" -ForegroundColor Red; exit 1 }
|
||||
$step = 3
|
||||
}
|
||||
|
||||
Write-Host ""
|
||||
Write-Host "[step $step/3] gradle assembleRelease ..." -ForegroundColor Yellow
|
||||
Push-Location $asDir
|
||||
& $gradlew assembleRelease --console=plain
|
||||
$buildCode = $LASTEXITCODE
|
||||
Pop-Location
|
||||
if ($buildCode -ne 0) {
|
||||
Write-Host "[error] packaging failed (gradle exit code $buildCode)" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
|
||||
# ============ step 3: copy artifact ============
|
||||
if (-not (Test-Path $apkSource)) {
|
||||
Write-Host "[error] APK not found: $apkSource" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
if (-not (Test-Path $distDir)) { New-Item -ItemType Directory -Path $distDir -Force | Out-Null }
|
||||
|
||||
$apkSuffix = ''
|
||||
if ($Dev) { $apkSuffix = '_dev' }
|
||||
|
||||
if ($Timestamp) {
|
||||
$stamp = Get-Date -Format 'yyyyMMdd_HHmmss'
|
||||
$apkName = "${appFile}_v${verName}_release${apkSuffix}_${stamp}.apk"
|
||||
} else {
|
||||
$apkName = "${appFile}_v${verName}_release${apkSuffix}.apk"
|
||||
}
|
||||
$apkDest = Join-Path $distDir $apkName
|
||||
Copy-Item -Path $apkSource -Destination $apkDest -Force
|
||||
|
||||
$apkSize = [math]::Round((Get-Item $apkDest).Length / 1MB, 2)
|
||||
Write-Host ""
|
||||
Write-Host "================== packaging done ==================" -ForegroundColor Green
|
||||
Write-Host " artifact : $apkDest"
|
||||
Write-Host " size : ${apkSize} MB"
|
||||
Write-Host " version : $verName ($verCode)"
|
||||
Write-Host "===================================================" -ForegroundColor Green
|
||||
|
||||
# ============ publish upload (scp + latest.json, same flow as sandan project) ============
|
||||
$deployCfgPath = Join-Path $projRoot 'config\deploy.json'
|
||||
if ($NoUpload -or $Dev) {
|
||||
Write-Host ""
|
||||
Write-Host "[hint] -NoUpload/-Dev specified, skip publish upload" -ForegroundColor DarkGray
|
||||
} elseif (-not (Test-Path $deployCfgPath)) {
|
||||
Write-Host ""
|
||||
Write-Host "[hint] config/deploy.json not found, skip publish upload (copy config/deploy.example.json and fill real values)" -ForegroundColor DarkGray
|
||||
} else {
|
||||
$dcfg = Get-Content $deployCfgPath -Raw -Encoding UTF8 | ConvertFrom-Json
|
||||
$dcfg = $dcfg.android
|
||||
if (-not $dcfg) {
|
||||
Write-Host "[error] config/deploy.json missing android section" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
$dHost = [string]$dcfg.host
|
||||
$dUser = [string]$dcfg.user
|
||||
$dKey = [string]$dcfg.keyPath
|
||||
$dRemDir = ([string]$dcfg.remoteDir).TrimEnd('/')
|
||||
$dUrlPre = [string]$dcfg.downloadUrlPrefix
|
||||
$dPort = 22
|
||||
if ($dcfg.port) { $dPort = [int]$dcfg.port }
|
||||
$dLatest = 'latest.json'
|
||||
if ($dcfg.latestJsonName) { $dLatest = [string]$dcfg.latestJsonName }
|
||||
if ($dUrlPre -and -not $dUrlPre.EndsWith('/')) { $dUrlPre = $dUrlPre + '/' }
|
||||
|
||||
$missing = @()
|
||||
if (-not $dHost) { $missing += 'host' }
|
||||
if (-not $dUser) { $missing += 'user' }
|
||||
if (-not $dRemDir) { $missing += 'remoteDir' }
|
||||
if (-not $dUrlPre) { $missing += 'downloadUrlPrefix' }
|
||||
if ($missing.Count -gt 0) {
|
||||
Write-Host "[error] config/deploy.json missing fields: $($missing -join ', ')" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
if ($dKey -and -not (Test-Path $dKey)) {
|
||||
Write-Host "[error] SSH key not found: $dKey" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
|
||||
# generate latest.json (same directory as the APK)
|
||||
$sha256 = (Get-FileHash -Path $apkDest -Algorithm SHA256).Hash
|
||||
$dlUrl = "$dUrlPre$apkName"
|
||||
$publishedAt = (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ')
|
||||
$latest = [ordered]@{
|
||||
version = $verName
|
||||
file = $apkName
|
||||
url = $dlUrl
|
||||
sha256 = $sha256
|
||||
publishedAtUtc = $publishedAt
|
||||
}
|
||||
$latestPath = Join-Path $distDir $dLatest
|
||||
[System.IO.File]::WriteAllText($latestPath, ($latest | ConvertTo-Json), (New-Object System.Text.UTF8Encoding($false)))
|
||||
|
||||
Write-Host ""
|
||||
Write-Host "[publish] upload to ${dUser}@${dHost}:${dRemDir}/ ..." -ForegroundColor Yellow
|
||||
$scpArgs = @('-i', $dKey, '-P', "$dPort", '-o', 'StrictHostKeyChecking=accept-new')
|
||||
& scp @scpArgs $apkDest "${dUser}@${dHost}:${dRemDir}/"
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Write-Host "[error] APK upload failed (scp exit code $LASTEXITCODE)" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
& scp @scpArgs $latestPath "${dUser}@${dHost}:${dRemDir}/"
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Write-Host "[error] $dLatest upload failed (scp exit code $LASTEXITCODE)" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
|
||||
Write-Host ""
|
||||
Write-Host "================== publish done ==================" -ForegroundColor Green
|
||||
Write-Host " download : $dlUrl"
|
||||
Write-Host " sha256 : $sha256"
|
||||
Write-Host " updated : ${dRemDir}/${dLatest}"
|
||||
Write-Host "=================================================" -ForegroundColor Green
|
||||
}
|
||||
|
||||
exit 0
|
||||
@ -1,209 +0,0 @@
|
||||
/**
|
||||
* Android 离线打包准备脚本
|
||||
* 职责:校验 config/android.json、拷贝 App 资源(www)、覆盖图标/启动图。
|
||||
* 包名/版本/签名/应用名/appid/appKey 等由 simpleDemo/build.gradle 在构建时动态读取
|
||||
* config/android.json 与 package.json,本脚本不再写入工程文件。
|
||||
*
|
||||
* 用法:
|
||||
* node android-offline/prepare.cjs
|
||||
* node android-offline/prepare.cjs <wwwSource> # 可选:覆盖 www 资源目录
|
||||
*/
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
|
||||
const ROOT = path.resolve(__dirname, '..')
|
||||
const OFFLINE_DIR = __dirname
|
||||
const CONFIG_PATH = path.join(ROOT, 'config', 'android.json')
|
||||
|
||||
const log = (...args) => console.log('[prepare]', ...args)
|
||||
const warn = (...args) => console.warn('[prepare][警告]', ...args)
|
||||
|
||||
// ---------- 1. 读取配置 ----------
|
||||
let config
|
||||
try {
|
||||
config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'))
|
||||
} catch (error) {
|
||||
if (error.code === 'ENOENT') {
|
||||
console.error(`[prepare][错误] 未找到配置文件: ${CONFIG_PATH}`)
|
||||
console.error('请复制 config/android.example.json 为 config/android.json 并填写(appKey、signing 等),详见 config/README.md')
|
||||
} else {
|
||||
console.error(`[prepare][错误] 配置文件解析失败 ${CONFIG_PATH}: ${error.message}`)
|
||||
}
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const required = ['appId', 'appName', 'packageName']
|
||||
for (const key of required) {
|
||||
if (!config[key]) {
|
||||
console.error(`[prepare][错误] config.json 缺少必填项: ${key}`)
|
||||
process.exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 1.5 版本一致性校验 ----------
|
||||
// 离线包的 versionName/versionCode 由 simpleDemo/build.gradle 从 package.json 推导
|
||||
// (versionCode = X*1000000 + Y*1000 + Z);而 src/manifest.json 的 versionName/versionCode
|
||||
// 是 HBuilderX 云打包使用的值。两者必须一致,否则同一版本会出现两个 APK 版本号,
|
||||
// 应用内更新提示、版本排查都会对不上号。
|
||||
// 注:编译产物 www/manifest.json 内含 version.name/version.code(来自 src/manifest.json)。
|
||||
// plus.runtime.getProperty(appid).version 读的正是这个值,不是 Android 原生 versionName。
|
||||
// 因此除一致性校验外,下面还会把注入 APK 的 www/manifest.json 版本强制对齐到 package.json。
|
||||
try {
|
||||
const pkgVersion = JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf-8')).version
|
||||
const [x, y, z] = String(pkgVersion).split('.').map((n) => parseInt(n, 10))
|
||||
const expectedCode = x * 1000000 + y * 1000 + z
|
||||
|
||||
const manifestText = fs.readFileSync(path.join(ROOT, 'src', 'manifest.json'), 'utf-8')
|
||||
const mVersion = (manifestText.match(/"versionName"\s*:\s*"([^"]*)"/) || [])[1]
|
||||
const mCode = Number((manifestText.match(/"versionCode"\s*:\s*(\d+)/) || [])[1])
|
||||
|
||||
log(`版本: package.json=${pkgVersion} (versionCode ${expectedCode}) | src/manifest.json=${mVersion} (versionCode ${mCode})`)
|
||||
|
||||
if (mVersion !== pkgVersion || mCode !== expectedCode) {
|
||||
warn('package.json 与 src/manifest.json 版本号不一致,请两处同步(否则云打包/离线包会出现不同版本号)')
|
||||
}
|
||||
} catch (error) {
|
||||
warn(`版本一致性校验已跳过: ${error.message}`)
|
||||
}
|
||||
|
||||
// ---------- 2. 定位 SDK 工程 ----------
|
||||
const AS_DIR = path.join(OFFLINE_DIR, 'HBuilder-Integrate-AS')
|
||||
const DEMO_DIR = path.join(AS_DIR, 'simpleDemo')
|
||||
|
||||
if (!fs.existsSync(AS_DIR)) {
|
||||
console.error('[prepare][错误] 未找到离线 SDK 工程: ' + AS_DIR)
|
||||
console.error('请先下载离线 SDK 并解压到 android-offline/ 目录,详见 README.md')
|
||||
process.exit(1)
|
||||
}
|
||||
if (!fs.existsSync(DEMO_DIR)) {
|
||||
console.error('[prepare][错误] 未找到 simpleDemo 工程: ' + DEMO_DIR)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
let failed = false
|
||||
|
||||
// ---------- 3. 签名配置预检(Gradle 构建时从 config 动态读取) ----------
|
||||
if (!config.signing || !config.signing.keystore) {
|
||||
warn('config/android.json 中 signing.keystore 为空,Gradle 构建时将因缺少签名配置而失败')
|
||||
} else if (!fs.existsSync(path.resolve(ROOT, config.signing.keystore))) {
|
||||
warn(`签名文件不存在: ${path.resolve(ROOT, config.signing.keystore)}`)
|
||||
}
|
||||
if (!config.appKey) {
|
||||
warn('config/android.json 中 appKey 为空,请到 https://dev.dcloud.net.cn 申请后填写')
|
||||
}
|
||||
|
||||
// ---------- 4. 拷贝 App 资源到 assets/apps/{appId}/www ----------
|
||||
const wwwTarget = path.join(DEMO_DIR, 'src', 'main', 'assets', 'apps', config.appId, 'www')
|
||||
|
||||
// 可选外部 www 源覆盖:node prepare.cjs <wwwSource>;其次用 config.android.json 的 wwwSource
|
||||
const wwwOverride = process.argv[2] ? path.resolve(ROOT, process.argv[2]) : ''
|
||||
|
||||
const candidates = [
|
||||
...(wwwOverride ? [wwwOverride] : []),
|
||||
...(config.wwwSource ? [path.resolve(ROOT, config.wwwSource)] : []),
|
||||
// 优先使用 CLI 最新编译产物(dist/build/app-plus)。
|
||||
// unpackage/resources 是 HBuilderX 本地打包产物,可能已过期,仅作兜底,
|
||||
// 避免把旧代码打进 APK。
|
||||
path.join(ROOT, 'dist', 'build', 'app-plus'),
|
||||
path.join(ROOT, 'unpackage', 'resources', config.appId, 'www'),
|
||||
]
|
||||
|
||||
const wwwSource = candidates.find((dir) => fs.existsSync(dir))
|
||||
if (!wwwSource) {
|
||||
failed = true
|
||||
console.error('[prepare][错误] 未找到 App 资源,请先执行 npm run build:app-plus(或 HBuilderX 生成本地打包资源)')
|
||||
} else {
|
||||
fs.rmSync(wwwTarget, { recursive: true, force: true })
|
||||
fs.cpSync(wwwSource, wwwTarget, { recursive: true })
|
||||
log(`✓ 拷贝 App 资源: ${path.relative(ROOT, wwwSource)} -> assets/apps/${config.appId}/www`)
|
||||
}
|
||||
|
||||
// ---------- 4.5 对齐编译器版本(隐藏"HTML5+ Runtime 版本不一致"提示) ----------
|
||||
// CLI 构建资源时写入的 compilerVersion(如 5.07)与离线 SDK Runtime 版本不一致时,
|
||||
// 启动会弹"本应用使用HBuilderX %s 编译,而手机端SDK版本是 %s"对话框。
|
||||
// 此处把 www 内 manifest.json / app-config-service.js 的 compilerVersion 对齐到
|
||||
// config/android.json 的 runtimeVersion(默认 5.24,与离线 SDK 一致),即可消除提示。
|
||||
const runtimeVersion = config.runtimeVersion || '5.24'
|
||||
function alignCompilerVersion (filePath) {
|
||||
try {
|
||||
if (!fs.existsSync(filePath)) return
|
||||
let text = fs.readFileSync(filePath, 'utf-8')
|
||||
const re = /"compilerVersion"\s*:\s*"[^"]*"/g
|
||||
text = text.replace(re, '"compilerVersion": "' + runtimeVersion + '"')
|
||||
fs.writeFileSync(filePath, text, 'utf-8')
|
||||
log(`✓ 对齐 compilerVersion -> ${runtimeVersion}: ${path.relative(ROOT, filePath)}`)
|
||||
} catch (e) {
|
||||
warn(`对齐 compilerVersion 失败 ${filePath}: ${e.message}`)
|
||||
}
|
||||
}
|
||||
alignCompilerVersion(path.join(wwwTarget, 'manifest.json'))
|
||||
alignCompilerVersion(path.join(wwwTarget, 'app-config-service.js'))
|
||||
|
||||
// ---------- 4.6 对齐 www/manifest.json 的应用版本(防止应用内读旧版本反复弹更新) ----------
|
||||
// plus.runtime.getProperty(appid).version 读取的是 www/manifest.json 的 version.name,
|
||||
// 而非 Android 原生 versionName。若 src/manifest.json 忘记与 package.json 同步,
|
||||
// 会出现 APK 系统版本是新的、但应用内读到的仍是旧版本,导致“已更新却反复弹更新”。
|
||||
// 此处把注入 APK 的 www/manifest.json 版本强制对齐到 package.json(唯一版本源)。
|
||||
function alignAppVersion (filePath) {
|
||||
try {
|
||||
if (!fs.existsSync(filePath)) return
|
||||
const pkg = JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf-8'))
|
||||
const parts = String(pkg.version).split('.').map((n) => parseInt(n, 10) || 0)
|
||||
const code = (parts[0] || 0) * 1000000 + (parts[1] || 0) * 1000 + (parts[2] || 0)
|
||||
let text = fs.readFileSync(filePath, 'utf-8')
|
||||
const replaced = text.replace(
|
||||
/"version"\s*:\s*\{[^}]*\}/,
|
||||
`"version":{"name":"${pkg.version}","code":${code}}`
|
||||
)
|
||||
if (replaced !== text) {
|
||||
fs.writeFileSync(filePath, replaced, 'utf-8')
|
||||
log(`✓ 对齐应用版本 -> ${pkg.version} (code ${code}): ${path.relative(ROOT, filePath)}`)
|
||||
}
|
||||
} catch (e) {
|
||||
warn(`对齐应用版本失败 ${filePath}: ${e.message}`)
|
||||
}
|
||||
}
|
||||
alignAppVersion(path.join(wwwTarget, 'manifest.json'))
|
||||
|
||||
// ---------- 9. 覆盖图标与启动图 ----------
|
||||
function findResFiles(pattern) {
|
||||
const resDir = path.join(DEMO_DIR, 'src', 'main', 'res')
|
||||
const hits = []
|
||||
if (!fs.existsSync(resDir)) return hits
|
||||
const walk = (dir) => {
|
||||
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
||||
const full = path.join(dir, entry.name)
|
||||
if (entry.isDirectory()) walk(full)
|
||||
else if (pattern.test(entry.name)) hits.push(full)
|
||||
}
|
||||
}
|
||||
walk(resDir)
|
||||
return hits
|
||||
}
|
||||
|
||||
function applyImage(cfgPath, patterns, desc) {
|
||||
if (!cfgPath) return
|
||||
const image = path.resolve(ROOT, cfgPath)
|
||||
if (!fs.existsSync(image)) {
|
||||
warn(`${desc}不存在,跳过: ${image}`)
|
||||
return
|
||||
}
|
||||
const targets = findResFiles(patterns)
|
||||
if (targets.length === 0) {
|
||||
warn(`${desc}: 未在 res 下找到目标文件(正则: ${patterns}),请手动替换`)
|
||||
return
|
||||
}
|
||||
for (const target of targets) {
|
||||
fs.copyFileSync(image, target)
|
||||
log(`✓ 覆盖${desc}: ${path.relative(ROOT, target)}`)
|
||||
}
|
||||
}
|
||||
|
||||
applyImage(config.icon, /^(icon\.png|ic_launcher(\.png)?)$/i, '应用图标')
|
||||
applyImage(config.splash, /^splash(\.png|_screen\.png)?$/i, '启动图')
|
||||
|
||||
// ---------- 5. 总结 ----------
|
||||
console.log('\n[prepare] 完成' + (failed ? '(部分失败,请查看上方错误)' : ''))
|
||||
console.log('后续:包名/版本/签名/应用名/appid/appKey 由 Gradle 构建时从 config/android.json 与 package.json 动态读取')
|
||||
if (!failed) process.exit(0)
|
||||
process.exit(1)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,99 +0,0 @@
|
||||
**项目集成需要添加msa_mdid_1.0.13.aar文件,以便获取移动智能设备标识公共服务平台提供的匿名设备标识符[OAID](https://www.html5plus.org/doc/zh_cn/device.html#plus.device.getOAID)、开发者匿名设备标识符VAID、及应用匿名设备标识符AAID,可用于解决Android10无法获取设备标识(如IMEI、IMSI、Wi-Fi MAC地址等)的问题**
|
||||
|
||||
## 2.8.1.80296_20200722
|
||||
1. 离线sdk不再支持wap2app应用,云打包不受影响。
|
||||
2. 离线sdk不再支持JS/NVUE文件原生混淆加密,云打包不受影响。
|
||||
3. 新增uniapp-v8-release.aar,调整 JS引擎默认从 jscore 改为 V8,提升运算性能 [详情](https://ask.dcloud.net.cn/article/37465) **注意:uniapp-v8-release.aar与uniapp-release.aar只能同时使用一个,重复会导致编译失败。**
|
||||
|
||||
## 2.7.11.80231_20200602
|
||||
1. 新增debug-server-release.aar,生成自定义基座时使用,生成正式包时需删除。
|
||||
2. 新增aps-igexin-fcm-release.aar,使用方式可参考[文档](https://nativesupport.dcloud.net.cn/AppDocs/usemodule/androidModuleConfig/push)
|
||||
|
||||
## 2.7.0.80159_20200506
|
||||
|
||||
1. 自定义组件编译模式下线,应用默认以v3编译模式运行。并在manifest去除相关概念。后续版本dcloud1.dat、dcloud2.dat也不在需要。
|
||||
|
||||
## 2.6.0.74021_20200224
|
||||
1. 新增腾讯X5内核,使用时只需添加webview-x5-release.aar和weex_webview-x5-release.aar即可。
|
||||
|
||||
## 2.5.4.72919_20200108
|
||||
1. 添加uniAd模块,具体配置可参考文件Feature-Android.xls或链接 https://ask.dcloud.net.cn/article/36814
|
||||
|
||||
## 2.4.6.71983_20191211
|
||||
1. 添加amap-gp-libs-release.aar,供上传google play使用,注意:amap-gp-libs-release.aar与amap-libs-release.aar互斥,二者使用时只能选其一。
|
||||
|
||||
## 2.4.2.71156_20191115
|
||||
1. 更新uni-app依赖,去掉bindingX相关依赖。新版依赖如下,可以参考项目实例。
|
||||
~~~
|
||||
/*uniapp所需库-----------------------开始*/
|
||||
implementation 'com.android.support:recyclerview-v7:26.1.0'
|
||||
implementation 'com.facebook.fresco:fresco:1.13.0'
|
||||
implementation "com.facebook.fresco:animated-gif:1.13.0"
|
||||
/*uniapp所需库-----------------------结束*/
|
||||
~~~
|
||||
|
||||
## 2.3.5.70306_20191018
|
||||
1. 新增aps-unipush-gp-release.aar和aps-igexin-gp-release.aar,解决个推或UniPush上传谷歌市场失败的问题,注意:谷歌版个推与原个推存在类冲突,若出现冲突,删掉一个即可。
|
||||
2. 更新uni-app依赖,去掉okhttp相关依赖。新版依赖如下,可以参考项目实例。
|
||||
~~~
|
||||
/*uniapp所需库-----------------------开始*/
|
||||
implementation 'com.android.support:recyclerview-v7:26.1.0'
|
||||
implementation 'com.alibaba.android:bindingx-core:1.0.3'
|
||||
implementation 'com.alibaba.android:bindingx_weex_plugin:1.0.3'
|
||||
implementation 'com.facebook.fresco:fresco:1.13.0'
|
||||
implementation "com.facebook.fresco:animated-gif:1.13.0"
|
||||
/*uniapp所需库-----------------------结束*/
|
||||
~~~
|
||||
3. 若出现以dc.okio或dc.suqareup.okhttp的类冲突,删除libs目录下dc-okhttp-2.7.5.jar、dc-okhttp-ws-2.7.5.jar、dc-okio-1.6.0.jar即可。
|
||||
4. 本版删掉sina-libs-release.aar,集成时只需集成openDefault-4.4.1.aar即可。
|
||||
5. google play版个推在原个推配置上需添加如下内容
|
||||
~~~
|
||||
<service
|
||||
android:name="io.dcloud.feature.apsGt.GTPushDevService"
|
||||
android:exported="true"
|
||||
android:label="PushService"
|
||||
android:process=":pushservice" />
|
||||
<activity
|
||||
android:name="com.igexin.sdk.PrivacyActivity"
|
||||
android:exported="false"/>
|
||||
~~~
|
||||
|
||||
## 1.9.9.69546_20190920
|
||||
1. 更新依赖,默认需添加fastjson依赖
|
||||
~~~
|
||||
implementation 'com.alibaba:fastjson:1.1.46.android'
|
||||
~~~
|
||||
## 1.9.9.67817_20190812
|
||||
1. 离线SDK已支持64位处理器,[Android平台配置支持的CPU类型(64位)](http://ask.dcloud.net.cn/article/36195)
|
||||
2. 添加map、live-pusher、video等component,具体集成方式参考Feature-Android.xls。
|
||||
3. 将gif库提取为专门的aar使用,您可以引入android-gif-drawable-release@1.2.17.aar或者引用远程仓库文件。
|
||||
4. 鉴于新浪和支付宝SDK升级缘故,对应所需库也发生了变化,详情见Feature-Android.xls。
|
||||
|
||||
## 1.9.9.67034_20190729
|
||||
1. barcode改进,相应配置发生变化
|
||||
~~~
|
||||
<feature name="Barcode" value="io.dcloud.feature.barcode2.BarcodeFeatureImpl"/>
|
||||
~~~
|
||||
2. gallery改进,图片预览更流畅,需集成gallery-dmcBig-release.aar文件(非必须添加),具体显示效果可参考HBuilderX中基座gallery模块。
|
||||
3. 录制mp3格式音频需集成audio-mp3aac-release.aar文件(非必须添加)。
|
||||
4. 基座添加glide依赖,集成SDK时必须添加。
|
||||
5. 集成uni-app时必须添加如下依赖。
|
||||
~~~
|
||||
implementation 'com.android.support:recyclerview-v7:26.1.0'
|
||||
implementation 'com.alibaba.android:bindingx-core:1.0.3'
|
||||
implementation 'com.alibaba.android:bindingx_weex_plugin:1.0.3'
|
||||
implementation 'com.squareup.okhttp:okhttp:2.3.0'
|
||||
implementation 'com.squareup.okhttp:okhttp-ws:2.3.0'
|
||||
implementation 'com.alibaba:fastjson:1.1.46.android'
|
||||
implementation 'com.facebook.fresco:fresco:1.13.0'
|
||||
implementation "com.facebook.fresco:animated-gif:1.13.0"
|
||||
~~~
|
||||
6. 新增sqlite模块,配置方式
|
||||
~~~
|
||||
<feature name="Sqlite" value="io.dcloud.feature.sqlite.DataBaseFeature"/>
|
||||
~~~
|
||||
|
||||
7. 自定义组件模式下和集成uni-app时必须添加uniapp-release.aar
|
||||
8. 新增混淆配置文件,可参考SDK目录下proguard.cfg文件进行配置。
|
||||
|
||||
本sdk的使用许可,详见HBuilder X使用许可协议
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB |
@ -1,3 +0,0 @@
|
||||
splash.png 已生成(1920x1080 横屏,深蓝渐变 + 包裹箱 + 底部进度条,无文字)。
|
||||
如需重新生成或调整设计,编辑 scripts/gen-android-assets.ps1 后运行:
|
||||
powershell -NoProfile -ExecutionPolicy Bypass -File scripts\gen-android-assets.ps1
|
||||
@ -1,81 +0,0 @@
|
||||
const webpack = require('webpack')
|
||||
const plugins = []
|
||||
|
||||
if (process.env.UNI_OPT_TREESHAKINGNG) {
|
||||
plugins.push(require('@dcloudio/vue-cli-plugin-uni-optimize/packages/babel-plugin-uni-api/index.js'))
|
||||
}
|
||||
|
||||
if (
|
||||
(
|
||||
process.env.UNI_PLATFORM === 'app-plus' &&
|
||||
process.env.UNI_USING_V8
|
||||
) ||
|
||||
(
|
||||
process.env.UNI_PLATFORM === 'h5' &&
|
||||
process.env.UNI_H5_BROWSER === 'builtin'
|
||||
)
|
||||
) {
|
||||
const path = require('path')
|
||||
|
||||
const isWin = /^win/.test(process.platform)
|
||||
|
||||
const normalizePath = path => (isWin ? path.replace(/\\/g, '/') : path)
|
||||
|
||||
const input = normalizePath(process.env.UNI_INPUT_DIR)
|
||||
try {
|
||||
plugins.push([
|
||||
require('@dcloudio/vue-cli-plugin-hbuilderx/packages/babel-plugin-console'),
|
||||
{
|
||||
file (file) {
|
||||
file = normalizePath(file)
|
||||
if (file.indexOf(input) === 0) {
|
||||
return path.relative(input, file)
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
])
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
process.UNI_LIBRARIES = process.UNI_LIBRARIES || ['@dcloudio/uni-ui']
|
||||
process.UNI_LIBRARIES.forEach(libraryName => {
|
||||
plugins.push([
|
||||
'import',
|
||||
{
|
||||
'libraryName': libraryName,
|
||||
'customName': (name) => {
|
||||
return `${libraryName}/lib/${name}/${name}`
|
||||
}
|
||||
}
|
||||
])
|
||||
})
|
||||
|
||||
if (process.env.UNI_PLATFORM !== 'h5') {
|
||||
plugins.push('@babel/plugin-transform-runtime')
|
||||
}
|
||||
|
||||
const config = {
|
||||
presets: [
|
||||
[
|
||||
'@vue/app',
|
||||
{
|
||||
modules: webpack.version[0] > 4 ? 'auto' : 'commonjs',
|
||||
useBuiltIns: process.env.UNI_PLATFORM === 'h5' ? 'usage' : 'entry'
|
||||
}
|
||||
]
|
||||
],
|
||||
plugins
|
||||
}
|
||||
|
||||
const UNI_H5_TEST = '**/@dcloudio/uni-h5/dist/index.umd.min.js'
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
config.overrides = [{
|
||||
test: UNI_H5_TEST,
|
||||
compact: true,
|
||||
}]
|
||||
} else {
|
||||
config.ignore = [UNI_H5_TEST]
|
||||
}
|
||||
|
||||
module.exports = config
|
||||
@ -11,12 +11,13 @@
|
||||
<u-input
|
||||
v-model="searchText"
|
||||
placeholder="请输入关键词搜索"
|
||||
:border="searchBorder"
|
||||
prefixIcon="search"
|
||||
prefixIconStyle="color: #909399; font-size: 18px"
|
||||
clearable
|
||||
@input="handleSearch"
|
||||
></u-input>
|
||||
>
|
||||
<template #prefix>
|
||||
<u-icon name="search" size="18" color="#909399"></u-icon>
|
||||
</template>
|
||||
</u-input>
|
||||
</view>
|
||||
|
||||
<!-- 底部列表 -->
|
||||
@ -25,21 +26,13 @@
|
||||
scroll-y="true"
|
||||
:style="{ height: listHeight + 'rpx' }"
|
||||
>
|
||||
<view
|
||||
v-if="showCreateAction"
|
||||
class="list-item list-item--create"
|
||||
@click="handleCreate"
|
||||
>
|
||||
<text class="item-text item-text--create">新增“{{ normalizedSearchText }}”</text>
|
||||
<u-icon name="plus" color="#2979ff" size="22"></u-icon>
|
||||
</view>
|
||||
<view class="list-item"
|
||||
v-for="item in filteredList"
|
||||
:key="item.value"
|
||||
:class="{ active: selectedValue === item.value }"
|
||||
@click="handleSelect(item)"
|
||||
>
|
||||
<text class="item-text" :style="{ fontSize: itemFontSize + 'rpx' }">{{ item.label }}</text>
|
||||
<text class="item-text">{{ item.label }}</text>
|
||||
<u-icon
|
||||
v-if="selectedValue === item.value"
|
||||
name="checkbox-mark"
|
||||
@ -75,37 +68,6 @@
|
||||
listHeight: {
|
||||
type: Number,
|
||||
default: 600
|
||||
},
|
||||
itemFontSize: {
|
||||
type: Number,
|
||||
default: 28
|
||||
},
|
||||
allowCreate: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
searchBorder: {
|
||||
type: String,
|
||||
default: 'surround'
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
normalizedSearchText() {
|
||||
return String(this.searchText || '').trim();
|
||||
},
|
||||
showCreateAction() {
|
||||
if (!this.allowCreate || !this.normalizedSearchText) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return !this.list.some(item => {
|
||||
if (!item || typeof item !== 'object') {
|
||||
return false;
|
||||
}
|
||||
|
||||
const label = String(item.label || '').trim().toLowerCase();
|
||||
return label === this.normalizedSearchText.toLowerCase();
|
||||
});
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@ -134,41 +96,11 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
normalizeInputText(raw) {
|
||||
if (typeof raw === 'string') {
|
||||
return raw;
|
||||
}
|
||||
if (typeof raw === 'number') {
|
||||
return String(raw);
|
||||
}
|
||||
if (raw && typeof raw === 'object') {
|
||||
if (typeof raw.detail === 'string') {
|
||||
return raw.detail;
|
||||
}
|
||||
if (raw.detail && typeof raw.detail.value === 'string') {
|
||||
return raw.detail.value;
|
||||
}
|
||||
if (raw.target && typeof raw.target.value === 'string') {
|
||||
return raw.target.value;
|
||||
}
|
||||
if (typeof raw.value === 'string') {
|
||||
return raw.value;
|
||||
}
|
||||
}
|
||||
return '';
|
||||
},
|
||||
handleClose() {
|
||||
this.$emit('close');
|
||||
},
|
||||
|
||||
handleSearch(raw) {
|
||||
if (typeof raw !== 'undefined') {
|
||||
const nextText = this.normalizeInputText(raw);
|
||||
if (nextText !== this.searchText) {
|
||||
this.searchText = nextText;
|
||||
}
|
||||
}
|
||||
|
||||
handleSearch() {
|
||||
if (!this.searchText.trim()) {
|
||||
this.filteredList = [...this.list];
|
||||
return;
|
||||
@ -194,15 +126,6 @@
|
||||
this.$emit('change', null);
|
||||
// 关闭弹窗
|
||||
this.$emit('close');
|
||||
},
|
||||
handleCreate() {
|
||||
const value = this.normalizedSearchText;
|
||||
if (!value) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.$emit('create', value);
|
||||
this.$emit('close');
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -240,18 +163,6 @@
|
||||
background-color: #f5f7fa;
|
||||
border-radius: 10rpx;
|
||||
padding: 0 20rpx;
|
||||
min-height: 84rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
::v-deep .u-input {
|
||||
height: 76rpx;
|
||||
}
|
||||
|
||||
::v-deep .u-input__content {
|
||||
height: 76rpx;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
.quick-filter {
|
||||
@ -312,14 +223,5 @@
|
||||
border-bottom: none;
|
||||
}
|
||||
}
|
||||
|
||||
.list-item--create {
|
||||
background: #f4f8ff;
|
||||
}
|
||||
|
||||
.item-text--create {
|
||||
color: #2979ff !important;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -2,12 +2,9 @@
|
||||
<view class="nav-wrap">
|
||||
<view class="status_bar"></view>
|
||||
<view class="nav-title">
|
||||
<view class="left">
|
||||
<view class="left-back" @click="back">
|
||||
<u-icon v-if="effectiveShowBack" name="arrow-left"></u-icon>
|
||||
<u-icon v-else name="home" @click="toHome"></u-icon>
|
||||
</view>
|
||||
<slot name="left"></slot>
|
||||
<view class="left" @click="back">
|
||||
<u-icon v-if="showBack" name="arrow-left"></u-icon>
|
||||
<u-icon v-else name="home" @click="toHome"></u-icon>
|
||||
</view>
|
||||
<view class="title">{{title}}</view>
|
||||
<view class="right">
|
||||
@ -21,39 +18,25 @@
|
||||
export default {
|
||||
props: {
|
||||
title: String,
|
||||
showBack: {
|
||||
type: Boolean,
|
||||
default: undefined
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
internalShowBack: true, // 默认显示返回按钮
|
||||
showBack: true, // 默认显示返回按钮
|
||||
pagesLength: 0
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
effectiveShowBack() {
|
||||
// 如果父组件显式传了 showBack,优先使用;否则用自动检测值
|
||||
return this.showBack !== undefined ? this.showBack : this.internalShowBack;
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
checkPagesLength() {
|
||||
// 获取当前页面栈
|
||||
const pages = getCurrentPages();
|
||||
this.pagesLength = pages.length;
|
||||
this.internalShowBack = pages.length > 1;
|
||||
console.log('当前页面栈长度:', pages.length, '显示返回按钮:', this.internalShowBack);
|
||||
this.showBack = pages.length > 1;
|
||||
console.log('当前页面栈长度:', pages.length, '显示返回按钮:', this.showBack);
|
||||
},
|
||||
back() {
|
||||
console.log("返回");
|
||||
if (this.$listeners && this.$listeners.back) {
|
||||
this.$emit('back');
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.effectiveShowBack) {
|
||||
if (this.showBack) {
|
||||
// 有上一页,正常返回
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
@ -70,12 +53,6 @@
|
||||
},
|
||||
toHome() {
|
||||
console.log('跳转到首页');
|
||||
const pages = getCurrentPages();
|
||||
const currentRoute = pages.length ? `/${pages[pages.length - 1].route || ''}` : '';
|
||||
if (currentRoute === '/pages/index/index') {
|
||||
console.log('当前已在首页,取消重复跳转');
|
||||
return;
|
||||
}
|
||||
|
||||
// 根据你的路由配置调整首页路径
|
||||
// 假设首页是 tabBar 页面
|
||||
@ -115,28 +92,19 @@
|
||||
/* #endif */
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
justify-content: flex-start;
|
||||
height:110rpx;
|
||||
line-height:110rpx;
|
||||
background: #FFF;
|
||||
justify-content: space-between;
|
||||
padding:0 20rpx;
|
||||
position: relative;
|
||||
|
||||
.left {
|
||||
min-width: 80rpx;
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
gap: 10rpx;
|
||||
|
||||
.left-back {
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
justify-content: center;
|
||||
|
||||
.u-icon {
|
||||
font-size: 40rpx;
|
||||
@ -144,20 +112,15 @@
|
||||
}
|
||||
|
||||
.title {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
white-space: nowrap;
|
||||
font-size: 36rpx;
|
||||
flex: 1;
|
||||
text-align: center;
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.right {
|
||||
min-width: 80rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
width: 80rpx;
|
||||
}
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
<!-- 总数显示(可选) -->
|
||||
<view v-if="showTotal" class="total-info">
|
||||
总数:<text class="total-info__num">{{ total }}</text>
|
||||
总数:{{ total }}
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -219,14 +219,7 @@ export default {
|
||||
.total-info {
|
||||
margin-left: 40rpx;
|
||||
color: #909399;
|
||||
font-size: 28rpx;
|
||||
|
||||
.total-info__num {
|
||||
margin-left: 4rpx;
|
||||
color: #2979ff;
|
||||
font-size: 34rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
font-size: 24rpx;
|
||||
}
|
||||
|
||||
|
||||
@ -10,16 +10,8 @@
|
||||
|
||||
<!-- 搜索框 -->
|
||||
<view class="search-box" v-if="showSearch">
|
||||
<SearchBar
|
||||
v-model="searchKeyword"
|
||||
placeholder="搜索货位编码、自定义名称"
|
||||
:show-scan="false"
|
||||
:show-search="false"
|
||||
:input-font-size="'34rpx'"
|
||||
:search-text-font-size="'34rpx'"
|
||||
@search="handleSearch"
|
||||
@clear="handleSearch"
|
||||
></SearchBar>
|
||||
<u-search v-model="searchKeyword" placeholder="搜索货位编码、自定义名称" bg-color="#f5f5f5" shape="round"
|
||||
:show-action="false" @search="handleSearch" @clear="handleSearch"></u-search>
|
||||
</view>
|
||||
|
||||
<!-- 货位列表 -->
|
||||
405
components/uploadImgCos/uploadImgCos.vue
Normal file
405
components/uploadImgCos/uploadImgCos.vue
Normal file
@ -0,0 +1,405 @@
|
||||
<template>
|
||||
<u-upload
|
||||
ref="uUploadRef"
|
||||
:fileList="fileList"
|
||||
:maxCount="maxCount"
|
||||
:multiple="multiple"
|
||||
:disabled="disabled"
|
||||
@afterRead="handleAfterRead"
|
||||
@delete="handleDelete"
|
||||
>
|
||||
</u-upload>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "UploadImgCos",
|
||||
props: {
|
||||
business_type: {
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
business_id: {
|
||||
type: Number,
|
||||
required: true
|
||||
},
|
||||
value: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
},
|
||||
maxCount: {
|
||||
type: Number,
|
||||
default: 6
|
||||
},
|
||||
multiple: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
internalFileList: [],
|
||||
// 记录正在上传的文件,用于避免重复上传
|
||||
uploadingFiles: new Set()
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
fileList: {
|
||||
get() {
|
||||
return this.internalFileList;
|
||||
},
|
||||
set(value) {
|
||||
this.internalFileList = value;
|
||||
}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
value: {
|
||||
immediate: true,
|
||||
handler(newVal) {
|
||||
this.formatFileList(newVal);
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
* 格式化文件列表
|
||||
*/
|
||||
formatFileList(externalList) {
|
||||
if (!externalList || !Array.isArray(externalList)) {
|
||||
this.internalFileList = [];
|
||||
return;
|
||||
}
|
||||
|
||||
this.internalFileList = externalList.map(item => {
|
||||
if (item.status) {
|
||||
return item;
|
||||
}
|
||||
|
||||
return {
|
||||
url: item.url || item.path || '',
|
||||
name: item.name || this.extractFileName(item.url) || '',
|
||||
status: 'success',
|
||||
message: '',
|
||||
id: item.id || item.fileId || ''
|
||||
};
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 提取文件名
|
||||
*/
|
||||
extractFileName(filePath) {
|
||||
if (!filePath || typeof filePath !== 'string') return null;
|
||||
return filePath.split(/[\\/]/).pop();
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取文件MD5
|
||||
*/
|
||||
async getFileMd5(filePath) {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.getFileInfo({
|
||||
filePath,
|
||||
digestAlgorithm: "md5",
|
||||
success: resolve,
|
||||
fail: reject
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 处理文件选择
|
||||
*/
|
||||
async handleAfterRead(event) {
|
||||
if (this.disabled) return;
|
||||
|
||||
const { file, name } = event;
|
||||
const files = Array.isArray(file) ? file : [file];
|
||||
|
||||
// 检查数量限制
|
||||
const remainingSlots = this.maxCount - this.fileList.length;
|
||||
if (remainingSlots <= 0) {
|
||||
uni.showToast({
|
||||
title: `最多只能上传${this.maxCount}个文件`,
|
||||
icon: 'none'
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const filesToUpload = files.slice(0, remainingSlots);
|
||||
|
||||
// 添加文件到列表(初始状态为pending)
|
||||
const startIndex = this.fileList.length;
|
||||
filesToUpload.forEach((file) => {
|
||||
this.fileList.push({
|
||||
...file,
|
||||
status: "pending",
|
||||
message: "等待上传"
|
||||
});
|
||||
});
|
||||
|
||||
// 串行上传
|
||||
for (let i = 0; i < filesToUpload.length; i++) {
|
||||
const fileIndex = startIndex + i;
|
||||
await this.processFileUpload(filesToUpload[i], fileIndex);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 处理单个文件上传流程
|
||||
*/
|
||||
async processFileUpload(file, fileIndex) {
|
||||
try {
|
||||
// 检查是否已经在上传
|
||||
const fileKey = `${file.url}_${file.size}`;
|
||||
if (this.uploadingFiles.has(fileKey)) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.uploadingFiles.add(fileKey);
|
||||
|
||||
// 1. 获取文件MD5
|
||||
const fileInfo = await this.getFileMd5(file.url);
|
||||
const fileName = this.extractFileName(file.url) || file.name;
|
||||
|
||||
// 2. 更新状态为上传中
|
||||
this.fileList[fileIndex] = {
|
||||
...file,
|
||||
status: "uploading",
|
||||
message: "上传中",
|
||||
md5: fileInfo.digest
|
||||
};
|
||||
|
||||
// 3. 获取COS上传配置
|
||||
const uploadConfig = await this.$http('common.getCOSUploadConfig', {
|
||||
data: {
|
||||
fileName,
|
||||
fileSize: fileInfo.size,
|
||||
fileType: file.type,
|
||||
id: this.business_id,
|
||||
md5: fileInfo.digest,
|
||||
type: this.business_type,
|
||||
}
|
||||
});
|
||||
|
||||
const configData = uploadConfig.data;
|
||||
if (!configData) {
|
||||
throw new Error("获取上传配置失败");
|
||||
}
|
||||
// 4. 执行COS上传(这里不会返回响应数据)
|
||||
await this.uploadToCOS(file.url, configData, fileIndex);
|
||||
|
||||
|
||||
// 5. 通知后端上传完成
|
||||
const notifyResult = await this.notifyUploadComplete(configData.fileInfo, fileIndex);
|
||||
|
||||
// 6. 更新状态为成功
|
||||
if (notifyResult.data?.data) {
|
||||
const { fileUrl, fileId } = notifyResult.data.data;
|
||||
this.fileList[fileIndex] = {
|
||||
...this.fileList[fileIndex],
|
||||
status: "success",
|
||||
message: "",
|
||||
url: fileUrl,
|
||||
id: fileId,
|
||||
successUrl: fileUrl // 保存成功后的URL
|
||||
};
|
||||
|
||||
// 7. 关联文件
|
||||
await this.referenceFiles();
|
||||
// 触发成功事件
|
||||
this.$emit('upload-success', {
|
||||
file: this.fileList[fileIndex],
|
||||
index: fileIndex
|
||||
});
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error("上传流程失败:", error);
|
||||
this.fileList[fileIndex] = {
|
||||
...this.fileList[fileIndex],
|
||||
status: "error",
|
||||
message: error.message || "上传失败"
|
||||
};
|
||||
} finally {
|
||||
// 清理上传记录
|
||||
const fileKey = `${file.url}_${file.size}`;
|
||||
this.uploadingFiles.delete(fileKey);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 上传文件到COS(关键修改:不需要处理响应)
|
||||
*/
|
||||
uploadToCOS(filePath, config, fileIndex) {
|
||||
return new Promise((resolve, reject) => {
|
||||
// COS上传不会返回数据,所以这里只是发起请求
|
||||
const uploadTask = uni.uploadFile({
|
||||
url: config.uploadUrl, // 应该从config中获取
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
formData: config.data,
|
||||
// COS上传成功不会有响应体,只会有状态码
|
||||
success: (res) => {
|
||||
// 注意:COS返回的HTTP状态码成功通常是204或200,但没有响应体
|
||||
if (res.statusCode === 200 || res.statusCode === 204) {
|
||||
resolve();
|
||||
} else {
|
||||
reject(new Error(`COS上传失败,状态码: ${res.statusCode}`));
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
reject(new Error("COS上传请求失败"));
|
||||
}
|
||||
});
|
||||
|
||||
// 可以监听上传进度
|
||||
uploadTask.onProgressUpdate = (res) => {
|
||||
this.fileList[fileIndex] = {
|
||||
...this.fileList[fileIndex],
|
||||
progress: res.progress,
|
||||
message: `上传中 ${res.progress}%`
|
||||
};
|
||||
|
||||
// 触发进度事件
|
||||
this.$emit('upload-progress', {
|
||||
index: fileIndex,
|
||||
progress: res.progress,
|
||||
totalBytesSent: res.totalBytesSent,
|
||||
totalBytesExpectedToSend: res.totalBytesExpectedToSend
|
||||
});
|
||||
};
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 通知后端上传完成
|
||||
*/
|
||||
async notifyUploadComplete(config, fileIndex) {
|
||||
try {
|
||||
// 调用后端接口,通知COS上传已完成
|
||||
const response = await this.$http('common.uploadSuccessNotify', {
|
||||
...config,
|
||||
fileInfo: {
|
||||
fileName: config.fileName,
|
||||
fileSize: config.fileSize,
|
||||
fileType: config.fileType,
|
||||
md5: config.md5
|
||||
}
|
||||
});
|
||||
return response;
|
||||
} catch (error) {
|
||||
console.error("上传完成通知失败:", error);
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 关联文件
|
||||
*/
|
||||
async referenceFiles() {
|
||||
console.log("this.fileList",this.fileList);
|
||||
try {
|
||||
// 获取所有成功的文件(包括之前已经关联的)
|
||||
const validFiles = this.fileList
|
||||
.filter(item => item.status === "success" && item.id)
|
||||
.map(item => ({ file_id: item.id }));
|
||||
|
||||
if (validFiles.length === 0) {
|
||||
// 如果没有成功文件,也要通知后端清空关联
|
||||
const response = await this.$http('common.ReferenceFile', {
|
||||
id: this.business_id,
|
||||
type: this.business_type,
|
||||
images: []
|
||||
});
|
||||
|
||||
// 更新外部绑定
|
||||
this.$emit('change', this.fileList);
|
||||
this.$emit('input', this.fileList);
|
||||
return response;
|
||||
}
|
||||
|
||||
const response = await this.$http('common.ReferenceFile', {
|
||||
id: this.business_id,
|
||||
type: this.business_type,
|
||||
images: validFiles
|
||||
});
|
||||
|
||||
// 更新外部绑定
|
||||
this.$emit('change', this.fileList);
|
||||
this.$emit('input', this.fileList);
|
||||
|
||||
return response;
|
||||
} catch (error) {
|
||||
console.error("关联文件失败:", error);
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 处理删除 - 修正版本
|
||||
*/
|
||||
async handleDelete(index) {
|
||||
const deletedFile = this.fileList[index];
|
||||
|
||||
// 从列表中移除
|
||||
this.fileList.splice(index, 1);
|
||||
|
||||
// 立即更新UI
|
||||
this.$emit('delete', {
|
||||
file: deletedFile,
|
||||
index
|
||||
});
|
||||
|
||||
// 更新外部绑定(立即更新,不等待)
|
||||
this.$emit('change', this.fileList);
|
||||
this.$emit('input', this.fileList);
|
||||
|
||||
// 异步更新文件关联
|
||||
try {
|
||||
await this.referenceFiles();
|
||||
} catch (error) {
|
||||
console.error("删除后重新关联失败:", error);
|
||||
// 这里可以选择给用户提示,但不阻塞UI
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* 手动上传
|
||||
*/
|
||||
upload() {
|
||||
if (this.$refs.uUploadRef && !this.disabled) {
|
||||
this.$refs.uUploadRef.chooseFile();
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取上传成功的文件
|
||||
*/
|
||||
getSuccessFiles() {
|
||||
return this.fileList.filter(item => item.status === "success");
|
||||
},
|
||||
|
||||
/**
|
||||
* 清空文件
|
||||
*/
|
||||
clearFiles() {
|
||||
this.fileList = [];
|
||||
this.$emit('input', []);
|
||||
this.$emit('change', []);
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@ -1,73 +0,0 @@
|
||||
# config 目录说明
|
||||
|
||||
本目录存放打包/发布相关配置。**含密码等敏感信息的一律不提交 git**,配套的 `*.example.json` 模板提交。
|
||||
|
||||
| 文件 | 说明 | 是否提交 |
|
||||
|---|---|---|
|
||||
| `android.json` | Android 离线打包本地配置(appKey、签名密码等) | ❌ |
|
||||
| `android.example.json` | 上述配置的模板,首次使用复制为 `android.json` | ✅ |
|
||||
| `deploy.json` | 发布上传配置(scp 目标、下载地址前缀等),存在时打包结束自动上传 APK + `latest.json` | ❌ |
|
||||
| `deploy.example.json` | 上述配置的模板,首次使用复制为 `deploy.json` | ✅ |
|
||||
|
||||
## android.json 字段
|
||||
|
||||
| 字段 | 说明 |
|
||||
|---|---|
|
||||
| `appId` | uni-app appid。**本项目为 `__UNI__0B3DAD3`,不要与工作台/散单的 `__UNI__900BDC1` 混用** |
|
||||
| `appKey` | DCloud 离线打包 Key,**按 `appId + packageName + 签名证书 SHA-256` 三者绑定** |
|
||||
| `appName` | 桌面显示的应用名(构建时写入 `resValue app_name`) |
|
||||
| `packageName` | Android 包名(`applicationId` 与 gradle `namespace` 都由它决定,发布后不可更改) |
|
||||
| `abis` | CPU 架构。此处与 `src/manifest.json` 的 `abiFilters` 保持一致(`armeabi-v7a`、`arm64-v8a`) |
|
||||
| `icon` / `splash` | 图标/启动图路径(相对项目根),`prepare.cjs` 会用它们覆盖 `res/` 下的同名资源 |
|
||||
| `wwwSource` | App 资源目录。留空则依次尝试 `dist/build/app-plus`(CLI 最新编译产物)、`unpackage/resources/<appId>/www`(HBuilderX 本地打包产物,仅作兜底) |
|
||||
| `runtimeVersion` | 离线 SDK 的 5+ Runtime 版本。`prepare.cjs` 会把 www 内 `manifest.json`/`app-config-service.js` 的 `compilerVersion` 对齐到该值,避免启动时弹「HBuilderX %s 编译 / 手机端 SDK %s」提示 |
|
||||
| `signing.keystore` | 签名文件路径(相对项目根),放在 `android-offline/keystore/`(该目录 git 不跟踪) |
|
||||
| `signing.storePassword` / `keyAlias` / `keyPassword` | 签名密码与别名,**自己填写,不要提交**。DCloud 下发的 keystore(PKCS12)别名固定为 `__uni__` + appid 小写,本项目即 `__uni__0b3dad3`;PKCS12 的 `storePassword` 与 `keyPassword` 必须相同 |
|
||||
|
||||
## appKey 务必与三者一致
|
||||
|
||||
`appKey` 失效的典型表现:APK 能装能开,但启动即白屏并提示「未配置appkey或配置错误」。此时按顺序核对:
|
||||
|
||||
1. `appId` 是否为 `__UNI__0B3DAD3`;
|
||||
2. `packageName` 是否与申请 Key 时填写的包名一致;
|
||||
3. 证书 SHA-256 是否与申请 Key 时使用的一致:
|
||||
```
|
||||
keytool -list -v -keystore android-offline\keystore\<你的证书> -alias <别名>
|
||||
```
|
||||
输出里的 `SHA256:` 即为指纹。
|
||||
|
||||
需要更换包名或证书时,要先去 https://dev.dcloud.net.cn → 应用详情 → Android → 离线打包 Key 管理 重新申请(需填包名与证书 SHA-256)。
|
||||
|
||||
### 当前已知指纹(用于快速判断是否需要重新申请 Key)
|
||||
|
||||
| 用途 | 证书 SHA-256 | appKey |
|
||||
|---|---|---|
|
||||
| 线上已发布 APK(DCloud 云打包签名) | `d9689a9ba66e55e3002508b6ea9bb3bc086a2ba541df9cb86cdde43d6c25d6ff` | `f523d8541674ad75105fa604f5a51a54` |
|
||||
| 本地离线打包(自有 keystore) | 用下面命令查,**与左栏不一致就必须重新申请** | 重新申请后填入本文件 |
|
||||
|
||||
```powershell
|
||||
& "$env:JAVA_HOME\bin\keytool.exe" -list -v -keystore "d:\WMS_PDA\android-offline\keystore\<证书文件>"
|
||||
# 输出里的 SHA256: 即上表右栏要用的指纹
|
||||
```
|
||||
|
||||
> 签名不同会导致**无法覆盖安装**已发布的云打包版本(需先卸载重装),这是切离线打包的必然代价。
|
||||
|
||||
## deploy.json 字段(发布上传)
|
||||
|
||||
打包结束后,`pack.ps1` 会检查 `config/deploy.json`:存在则生成 `latest.json`(版本、文件名、下载地址、SHA-256、发布时间)并用 `scp` 上传 APK 与 `latest.json`;不存在则跳过上传(仅打本地包)。加 `-NoUpload` 或 `-Dev` 也会跳过上传。
|
||||
|
||||
| 字段 | 必填 | 说明 |
|
||||
|---|---|---|
|
||||
| `host` | ✅ | scp 目标主机 IP/域名 |
|
||||
| `user` | ✅ | SSH 用户名 |
|
||||
| `remoteDir` | ✅ | 远程上传目录 |
|
||||
| `downloadUrlPrefix` | ✅ | 下载 URL 前缀,与 APK 文件名拼接成完整下载地址写入 `latest.json` |
|
||||
| `keyPath` | ⬜ | SSH 私钥路径,填写后会校验文件存在 |
|
||||
| `port` | ⬜ | SSH 端口,默认 22 |
|
||||
| `latestJsonName` | ⬜ | 版本清单文件名,默认 `latest.json` |
|
||||
|
||||
## 首次使用
|
||||
|
||||
1. 确认 `config/android.json` 已存在(本仓库已预填非敏感项),填写 `appKey`、`keyAlias`、`storePassword`、`keyPassword`;
|
||||
2. 确认 `android-offline/keystore/` 下有对应 keystore;
|
||||
3. 执行 `npm run build:apk`(= 生产编译 + 产物地址校验 + 离线打包)。
|
||||
@ -1,17 +0,0 @@
|
||||
{
|
||||
"appId": "__UNI__0B3DAD3",
|
||||
"appKey": "",
|
||||
"appName": "WMS_PDA",
|
||||
"packageName": "com.gztbyc.pda_wms",
|
||||
"abis": ["armeabi-v7a", "arm64-v8a"],
|
||||
"icon": "android-offline/icon/app-icon.png",
|
||||
"splash": "android-offline/splash/splash.png",
|
||||
"wwwSource": "",
|
||||
"runtimeVersion": "5.24",
|
||||
"signing": {
|
||||
"keystore": "android-offline/keystore/xxx.keystore",
|
||||
"storePassword": "",
|
||||
"keyAlias": "__uni__0b3dad3",
|
||||
"keyPassword": ""
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{
|
||||
"android": {
|
||||
"host": "your-server.example.com",
|
||||
"user": "deploy",
|
||||
"keyPath": "C:/Users/you/.ssh/id_rsa",
|
||||
"port": 22,
|
||||
"remoteDir": "/var/www/wms-pda/download",
|
||||
"downloadUrlPrefix": "https://your-server.example.com/wms-pda/download",
|
||||
"latestJsonName": "latest.json"
|
||||
}
|
||||
}
|
||||
152
core/request/apis.js
Normal file
152
core/request/apis.js
Normal file
@ -0,0 +1,152 @@
|
||||
/**
|
||||
* 接口列表文件
|
||||
*/
|
||||
export default {
|
||||
/** 公共 ↓ **/
|
||||
common: {
|
||||
ping: {
|
||||
path: "index.ping",
|
||||
auth: false,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
store: {
|
||||
path: "index.loadStores",
|
||||
auth: false,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
getCOSUploadConfig: {
|
||||
path: "index.getCOSUploadConfig",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
uploadSuccessNotify: {
|
||||
path: "index.uploadSuccessNotify",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
ReferenceFile: {
|
||||
path: "index.ReferenceFile",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
searchSpace: {
|
||||
path: "index.searchSpace",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
listTemplatesByType: {
|
||||
path: "setting.printTemplate.listTemplatesByType",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
}
|
||||
},
|
||||
/** 用户 ↓ **/
|
||||
user: {
|
||||
info: {
|
||||
path: "user.info",
|
||||
auth: false,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
login: {
|
||||
path: "user.login",
|
||||
auth: false,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
changeRole: {
|
||||
path: "user.changeRole",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
}
|
||||
},
|
||||
storage: {
|
||||
receiving: {
|
||||
getReceivingList: {
|
||||
path: "storage.receiving.getReceivingList",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
create: {
|
||||
path: "storage.receiving.create",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
get: {
|
||||
path: "storage.receiving.get",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
addDetail: {
|
||||
path: "storage.receiving.addDetail",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
deleteDetail: {
|
||||
path: "storage.receiving.deleteDetail",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
|
||||
detailChange: {
|
||||
path: "storage.receiving.detailChange",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
cancel: {
|
||||
path: "storage.receiving.cancel",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
completeReceiving: {
|
||||
path: "storage.receiving.completeReceiving",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
}
|
||||
}
|
||||
},
|
||||
stock: {
|
||||
search: {
|
||||
path: "stock.search",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
}
|
||||
},
|
||||
print: {
|
||||
getList: {
|
||||
path: "print.getList",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
getComputerPrinter: {
|
||||
path: "print.getComputerPrinter",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
},
|
||||
send:{
|
||||
path: "print.send",
|
||||
auth: true,
|
||||
method: "POST",
|
||||
isSystemApi: true
|
||||
}
|
||||
}
|
||||
};
|
||||
91
core/request/index.js
Normal file
91
core/request/index.js
Normal file
@ -0,0 +1,91 @@
|
||||
import coreRequest from './request'
|
||||
import apiList from './apis.js'
|
||||
import store from '@/core/store/index.js'
|
||||
import { setToken,removeToken } from '../utils/auth';
|
||||
import router from '@/core/router'
|
||||
|
||||
const Request = new coreRequest();
|
||||
export default function http(
|
||||
url,
|
||||
data = {},
|
||||
toastBefore = '', // 请求前加载提示
|
||||
toastAfter = true, // 请求后错误提示
|
||||
responseType = 'text'
|
||||
) {
|
||||
let api = getApiPath(url);
|
||||
console.log(api);
|
||||
/* 请求之前拦截器 */
|
||||
Request.interceptor.request((config, cancel) => {
|
||||
let token = uni.getStorageSync('token');
|
||||
if (api.auth && !token) {
|
||||
store.dispatch('logout');
|
||||
uni.hideLoading()
|
||||
throw (`暂未登录,已阻止此次API请求: '${api.url}'`);
|
||||
}
|
||||
token && Request.setConfig(config => {
|
||||
config.header.authorization = `Bearer ${token}`
|
||||
})
|
||||
if (toastBefore !== '') {
|
||||
uni.showLoading({
|
||||
title: toastBefore,
|
||||
mask: true
|
||||
});
|
||||
}
|
||||
return config
|
||||
});
|
||||
|
||||
/* 请求之后拦截器 */
|
||||
Request.interceptor.response((res) => {
|
||||
const headers = res.header;
|
||||
console.log(res);
|
||||
const response = res.data;
|
||||
const token = headers?.authorization || headers?.Authorization // 新的token
|
||||
if (token) {
|
||||
const newToken = token.substring(7) // 去掉'Bearer '前缀
|
||||
setToken(newToken)
|
||||
}
|
||||
uni.hideLoading();
|
||||
if (response?.flag === "failure") {
|
||||
if (toastAfter) {
|
||||
uni.showToast({
|
||||
title: response.message || '请求出错,稍后重试',
|
||||
icon: 'none',
|
||||
duration: 1000,
|
||||
mask: true
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// token过期注销
|
||||
if (res.statusCode === 401) {
|
||||
removeToken();
|
||||
uni.showToast({
|
||||
title: '登录已过期,请重新登录',
|
||||
icon: 'none',
|
||||
duration: 1000,
|
||||
mask: true
|
||||
});
|
||||
uni.reLaunch('/pages/login/index')
|
||||
}
|
||||
return response
|
||||
})
|
||||
|
||||
return Request.request({
|
||||
url: api.url,
|
||||
path: api.path,
|
||||
data,
|
||||
method: api.method,
|
||||
responseType
|
||||
})
|
||||
}
|
||||
|
||||
// 组装接口路径
|
||||
function getApiPath(url) {
|
||||
let apiArray = url.split(".");
|
||||
let api = apiList;
|
||||
apiArray.forEach(v => {
|
||||
api = api[v];
|
||||
});
|
||||
return api;
|
||||
}
|
||||
@ -24,8 +24,6 @@ export default class Request {
|
||||
params: {},
|
||||
method: 'GET',
|
||||
dataType: 'json',
|
||||
// 默认请求超时 20s,避免弱网下请求长时间挂起(真机 PDA 网络环境差异明显)
|
||||
timeout: 20000,
|
||||
// #ifndef MP-ALIPAY || APP-PLUS
|
||||
responseType: 'text',
|
||||
// #endif
|
||||
@ -113,45 +111,13 @@ export default class Request {
|
||||
mergeUrl += mergeUrl.indexOf('?') === -1 ? `?${query}` : `&${query}`
|
||||
}
|
||||
options.url = mergeUrl
|
||||
// 硬超时兜底:uni.request 的 timeout 在弱网/部分安卓 WebView 下可能不触发,
|
||||
// 用独立定时器保证请求 Promise 必定 settle,超时主动 abort 并走拦截器,避免界面无限卡住
|
||||
const timeoutMs = Number(options.timeout) > 0 ? Number(options.timeout) : 20000;
|
||||
let settled = false;
|
||||
let task = null;
|
||||
const timer = setTimeout(() => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
if (task && typeof task.abort === 'function') {
|
||||
try { task.abort(); } catch (e) {}
|
||||
}
|
||||
// 构造符合响应拦截器预期的结构,使 toastAfter/隐藏 loading/错误提示链路完整生效
|
||||
const timeoutRes = {
|
||||
errMsg: `request:fail timeout(${timeoutMs}ms)`,
|
||||
statusCode: 0,
|
||||
header: {},
|
||||
data: { flag: 'failure', message: '网络超时,请检查网络后重试' }
|
||||
};
|
||||
let handled = timeoutRes;
|
||||
try {
|
||||
handled = this.requestAfter(timeoutRes);
|
||||
} catch (e) {}
|
||||
reject(handled);
|
||||
}, timeoutMs + 2000);
|
||||
const settle = (fn, value) => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
clearTimeout(timer);
|
||||
fn(value);
|
||||
};
|
||||
options.success = res => {
|
||||
settle(resolve, this.requestAfter(res))
|
||||
resolve(this.requestAfter(res))
|
||||
}
|
||||
options.fail = err => {
|
||||
const handled = this.requestAfter(err);
|
||||
// 原生失败(超时/断网/abort)时透传原始 errMsg,便于调用方识别失败原因
|
||||
settle(reject, handled === undefined || handled === null ? err : handled)
|
||||
reject(this.requestAfter(err))
|
||||
}
|
||||
task = uni.request(options)
|
||||
uni.request(options)
|
||||
})
|
||||
}
|
||||
|
||||
@ -6,8 +6,7 @@ import {
|
||||
import store from '@/core/store'
|
||||
import {
|
||||
getToken,
|
||||
removeToken,
|
||||
isWorkbenchSession
|
||||
removeToken
|
||||
} from '@/core/utils/auth'
|
||||
const router = createRouter({
|
||||
platform: process.env.VUE_APP_PLATFORM,
|
||||
@ -20,14 +19,21 @@ const router = createRouter({
|
||||
}) => {
|
||||
switch (type) {
|
||||
case 3: // APP退出应用
|
||||
|
||||
case 2:
|
||||
// #ifdef APP-PLUS
|
||||
router.$lockStatus = false;
|
||||
store.commit('app/showExitConfirm');
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '您确定要退出应用吗?',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
plus.runtime.quit();
|
||||
}
|
||||
}
|
||||
});
|
||||
// #endif
|
||||
break;
|
||||
case 2:
|
||||
router.$lockStatus = false;
|
||||
break;
|
||||
case 0:
|
||||
router.$lockStatus = false;
|
||||
break;
|
||||
@ -52,13 +58,6 @@ const router = createRouter({
|
||||
//全局路由前置守卫
|
||||
router.beforeEach(async (to, from, next) => {
|
||||
const hasToken = getToken();
|
||||
|
||||
// 工作台会话(token = workbenchToken):不做用户态校验,不调用 user.info
|
||||
if (hasToken && isWorkbenchSession()) {
|
||||
console.log('工作台会话放行:', to.path);
|
||||
next();
|
||||
return;
|
||||
}
|
||||
|
||||
if (hasToken) {
|
||||
console.log("去哪里",to);
|
||||
@ -72,45 +71,31 @@ router.beforeEach(async (to, from, next) => {
|
||||
const hasGetUserInfo = store.getters.user.employees_name;
|
||||
console.log("有没有用户信息",hasGetUserInfo);
|
||||
if (hasGetUserInfo) {
|
||||
try {
|
||||
store.dispatch('floatWindowManager/is_visible').catch(error => {
|
||||
console.log('浮窗显示检查失败:', error);
|
||||
});
|
||||
if(to.meta && to.meta.auth){
|
||||
console.log(to.path);
|
||||
const hasPermiss =await store.dispatch('checkPath',to.path);
|
||||
if(!hasPermiss){
|
||||
next({path:"/pages/403"})
|
||||
return;
|
||||
}
|
||||
const isVisible =await store.dispatch('floatWindowManager/is_visible');
|
||||
if(to.meta && to.meta.auth){
|
||||
console.log(to.path);
|
||||
const hasPermiss =await store.dispatch('checkPath',to.path);
|
||||
if(!hasPermiss){
|
||||
next({path:"/pages/403"})
|
||||
return;
|
||||
}
|
||||
const hasFromPath = !!from.path;
|
||||
const isSameRoute = hasFromPath && to.path === from.path && to.fullPath === from.fullPath;
|
||||
if(isSameRoute){
|
||||
console.log('路由重复,取消跳转:', to.path);
|
||||
next(false);
|
||||
}else{
|
||||
console.log('路由放行:', from.path, '->', to.path);
|
||||
next();
|
||||
}
|
||||
} catch (error) {
|
||||
console.log('已登录分支路由守卫异常:', error);
|
||||
}
|
||||
if(to.path==from.path){
|
||||
next(false);
|
||||
}else{
|
||||
next();
|
||||
}
|
||||
|
||||
} else {
|
||||
console.log("没有用户信息");
|
||||
await store.dispatch('getUserInfo');
|
||||
console.log("获取完成,去哪里",to)
|
||||
try {
|
||||
await store.dispatch('getUserInfo');
|
||||
console.log("获取完成,去哪里",to)
|
||||
store.dispatch('floatWindowManager/is_visible').catch(error => {
|
||||
console.log('浮窗显示检查失败:', error);
|
||||
});
|
||||
if (to.path === '/pages/index/index') {
|
||||
console.log('路由放行:', from.path, '->', to.path);
|
||||
await store.dispatch('floatWindowManager/is_visible');
|
||||
// 关键修改:等待获取用户信息
|
||||
if (to.path === '/pages/index/index'){
|
||||
next();
|
||||
} else {
|
||||
console.log('路由重定向:', from.path, '->', to.fullPath);
|
||||
}else{
|
||||
next({
|
||||
path: to.fullPath,
|
||||
NAVTYPE: 'SwitchTab'
|
||||
@ -118,10 +103,6 @@ router.beforeEach(async (to, from, next) => {
|
||||
}
|
||||
} catch (error) {
|
||||
await store.dispatch('logout');
|
||||
next({
|
||||
path: '/pages/login/index',
|
||||
replace: true
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -7,10 +7,7 @@ import setting from './modules/setting.js'
|
||||
import broadcast from './modules/broadcast.js'
|
||||
import floatWindowManager from './modules/floatWindowManager.js'
|
||||
import bluetoothPrint from './modules/bluetoothPrint.js'
|
||||
import bluetoothScale from './modules/bluetoothScale.js'
|
||||
import print from './modules/print.js'
|
||||
import deviceInfo from './modules/deviceInfo.js'
|
||||
import app from './modules/app.js'
|
||||
|
||||
const store = new Vuex.Store({
|
||||
modules: {
|
||||
@ -19,10 +16,7 @@ const store = new Vuex.Store({
|
||||
broadcast,
|
||||
floatWindowManager,
|
||||
bluetoothPrint,
|
||||
bluetoothScale,
|
||||
print,
|
||||
deviceInfo,
|
||||
app
|
||||
print
|
||||
}
|
||||
})
|
||||
|
||||
@ -80,7 +80,7 @@ const actions = {
|
||||
commit,
|
||||
state
|
||||
}) {
|
||||
if (!state || !state.initialized) {
|
||||
if (!state.initialized) {
|
||||
console.error('[Broadcast] 请先初始化模块');
|
||||
return false;
|
||||
}
|
||||
@ -109,7 +109,7 @@ const actions = {
|
||||
commit,
|
||||
state
|
||||
}) {
|
||||
if (!state || !state.enabled) {
|
||||
if (!state.enabled) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -124,12 +124,10 @@ const actions = {
|
||||
* 暂停监听
|
||||
*/
|
||||
pause({
|
||||
commit,
|
||||
state
|
||||
commit
|
||||
}) {
|
||||
return actions.stop({
|
||||
commit,
|
||||
state: state || {}
|
||||
commit
|
||||
});
|
||||
},
|
||||
|
||||
@ -157,7 +155,7 @@ const actions = {
|
||||
throw new Error('配置必须包含broadcastAction');
|
||||
}
|
||||
|
||||
if (!state || !state.enabled) {
|
||||
if (!state.enabled) {
|
||||
console.warn('[Broadcast] 广播功能已禁用,配置更新无效');
|
||||
return false;
|
||||
}
|
||||
@ -201,7 +199,7 @@ const actions = {
|
||||
throw new Error('Action不能为空');
|
||||
}
|
||||
|
||||
if (!state || !state.enabled) {
|
||||
if (!state.enabled) {
|
||||
console.warn('[Broadcast] 广播功能已禁用,Action更新无效');
|
||||
return false;
|
||||
}
|
||||
@ -224,12 +222,11 @@ const actions = {
|
||||
state
|
||||
}) {
|
||||
const scannerStatus = scanner.getStatus();
|
||||
const safeState = state || {};
|
||||
return {
|
||||
...scannerStatus,
|
||||
moduleEnabled: !!safeState.enabled,
|
||||
moduleInitialized: !!safeState.initialized,
|
||||
moduleActive: !!safeState.active
|
||||
moduleEnabled: state.enabled,
|
||||
moduleInitialized: state.initialized,
|
||||
moduleActive: state.active
|
||||
};
|
||||
},
|
||||
|
||||
@ -5,16 +5,13 @@ import http from "../../request";
|
||||
// 默认键值对设置
|
||||
const defaultSettings = {
|
||||
// 广播相关
|
||||
'broadcast.action': 'android.intent.action.SCANRESULT',
|
||||
'broadcast.key': 'value',
|
||||
'broadcast.action': 'com.pda.scan.RESULT',
|
||||
'broadcast.key': 'scan_data',
|
||||
|
||||
// 扫描相关
|
||||
'scan.sound': 'true',
|
||||
'scan.vibrate': 'true',
|
||||
'scan.auto_focus': 'true',
|
||||
|
||||
// 声音与通知
|
||||
'voice.enabled': 'true',
|
||||
|
||||
// 界面相关
|
||||
'ui.theme': 'light',
|
||||
@ -245,19 +242,6 @@ const getters = {
|
||||
auto_focus: state.settings['scan.auto_focus'] === 'true'
|
||||
};
|
||||
},
|
||||
|
||||
// 获取声音与通知设置
|
||||
voiceSettings: state => {
|
||||
if (Object.keys(state.settings).length === 0) {
|
||||
return {
|
||||
enabled: defaultSettings['voice.enabled'] === 'true'
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
enabled: state.settings['voice.enabled'] === 'true'
|
||||
};
|
||||
},
|
||||
|
||||
// 获取界面设置
|
||||
uiSettings: state => {
|
||||
@ -8,23 +8,6 @@ import {
|
||||
removeToken
|
||||
} from '@/core/utils/auth'
|
||||
import { router } from '../../router'
|
||||
import { clearSession, goLogin } from '@/core/utils/auth-guard'
|
||||
|
||||
const normalizeMenus = (user = {}) => {
|
||||
const sourceMenus = Array.isArray(user.menus)
|
||||
? user.menus
|
||||
: (Array.isArray(user.permissions) ? user.permissions : []);
|
||||
|
||||
const allChildren = sourceMenus.flatMap(item => item.children || []);
|
||||
return allChildren.filter(menu =>
|
||||
menu &&
|
||||
menu.component &&
|
||||
menu.component !== 'Layout' &&
|
||||
menu.meta &&
|
||||
menu.meta.title
|
||||
);
|
||||
}
|
||||
|
||||
const state = {
|
||||
token: uni.getStorageSync("token") || "",
|
||||
isLogin: uni.getStorageSync("isLogin") || false, // 是否登陆
|
||||
@ -36,7 +19,7 @@ const state = {
|
||||
user: {},
|
||||
app: {
|
||||
device: "pda",
|
||||
project:"wms"
|
||||
project:"warehouse"
|
||||
},
|
||||
permissions: [],
|
||||
menus:[],
|
||||
@ -85,20 +68,22 @@ const actions = {
|
||||
});
|
||||
dispatch('logout');
|
||||
console.log("无权登录");
|
||||
reject({ msg: '无权登录' });
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
const user = data
|
||||
const menuList = normalizeMenus(user);
|
||||
console.log('用户信息接口菜单列表:', menuList);
|
||||
commit('SET_PERMISSIONS', user.permissions)
|
||||
commit('SET_USER', user)
|
||||
|
||||
commit('SET_ROLEID', user.employees_id)
|
||||
resolve(user)
|
||||
|
||||
}).catch(e => {
|
||||
}).then(() => {
|
||||
// 只有在登录的时候请求购物车信息,订单信息,获取登录信息之后。
|
||||
token && dispatch('getCartList');
|
||||
token && dispatch('getUserData');
|
||||
})
|
||||
.catch(e => {
|
||||
reject(e)
|
||||
})
|
||||
})
|
||||
@ -130,139 +115,52 @@ const actions = {
|
||||
commit,
|
||||
dispatch
|
||||
}) {
|
||||
clearSession(store)
|
||||
return goLogin()
|
||||
removeToken();
|
||||
commit('SET_PERMISSIONS', [])
|
||||
commit('SET_USER', {})
|
||||
commit('SET_ROLEID', 0)
|
||||
router.replace('/pages/login/index')
|
||||
},
|
||||
checkPath({
|
||||
commit,
|
||||
state
|
||||
},path) {
|
||||
const normalizePath = (target = '') => String(target)
|
||||
.trim()
|
||||
.replace(/^\/+/, '')
|
||||
.replace(/\.vue$/i, '');
|
||||
|
||||
const targetPath = normalizePath(path);
|
||||
if (!targetPath) {
|
||||
return false;
|
||||
let has = false;
|
||||
console.log("所有菜单",state.menus);
|
||||
for(let i =0;i<state.menus.length;i++){
|
||||
if(state.menus[i].component==path){
|
||||
has = true;
|
||||
}
|
||||
}
|
||||
|
||||
console.log("所有菜单", state.menus);
|
||||
return (state.menus || []).some(menu => {
|
||||
const componentPath = normalizePath(menu?.component || '');
|
||||
const menuPath = normalizePath(menu?.path || '');
|
||||
return componentPath === targetPath || menuPath === targetPath;
|
||||
});
|
||||
return has;
|
||||
},
|
||||
login({
|
||||
commit,
|
||||
state,
|
||||
dispatch
|
||||
state
|
||||
}, userInfo) {
|
||||
const { username, password } = userInfo
|
||||
const {
|
||||
username,
|
||||
password
|
||||
} = userInfo
|
||||
return new Promise((resolve, reject) => {
|
||||
const safeUsername = String(username || '').trim()
|
||||
if (!safeUsername || !password) {
|
||||
reject({ msg: '请输入账号和密码' })
|
||||
return
|
||||
}
|
||||
|
||||
http('user.login', {
|
||||
username: safeUsername,
|
||||
password,
|
||||
device: state.app.device,
|
||||
project: state.app.project
|
||||
}).then(async (response) => {
|
||||
if (response && response.flag === 'failure') {
|
||||
reject({ msg: response.message || '账号密码登录失败' })
|
||||
return
|
||||
}
|
||||
|
||||
const token =
|
||||
response?.data?.token ||
|
||||
response?.token ||
|
||||
response?.data?.access_token ||
|
||||
response?.access_token ||
|
||||
response?.data?.accessToken ||
|
||||
response?.accessToken
|
||||
|
||||
if (!token) {
|
||||
reject({ msg: response?.message || '登录成功但未返回token' })
|
||||
return
|
||||
}
|
||||
|
||||
setToken(token)
|
||||
|
||||
try {
|
||||
await dispatch('getUserInfo', token)
|
||||
} catch (e) {
|
||||
reject({ msg: e?.msg || e?.message || '用户信息加载失败' })
|
||||
return
|
||||
}
|
||||
|
||||
resolve()
|
||||
}).catch(error => {
|
||||
reject({ msg: error?.msg || error?.message || error?.data?.message || '登录失败' })
|
||||
})
|
||||
})
|
||||
http('user.login', {
|
||||
username: username.trim(),
|
||||
password: password,
|
||||
device: state.app.device,
|
||||
project:state.app.project
|
||||
}).then(response => {
|
||||
const {
|
||||
data
|
||||
} = response;
|
||||
console.log("登录返回数据",data);
|
||||
setToken(data.token)
|
||||
resolve()
|
||||
}).catch(error => {
|
||||
console.log("出错",error)
|
||||
reject(error)
|
||||
})
|
||||
})
|
||||
},
|
||||
loginByCode({
|
||||
state,
|
||||
dispatch
|
||||
}, payload) {
|
||||
const code = String(payload?.code || '').trim();
|
||||
const uuid = String(payload?.uuid || '').trim();
|
||||
const loginCode = code || uuid;
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!loginCode) {
|
||||
reject({ msg: '缺少或无效的登录码code' });
|
||||
return;
|
||||
}
|
||||
|
||||
http('user.loginByCode', {
|
||||
code: loginCode,
|
||||
device: state.app.device,
|
||||
project: state.app.project
|
||||
}).then(async response => {
|
||||
if (response && response.flag === 'failure') {
|
||||
reject({ msg: response.message || '工牌登录失败' });
|
||||
return;
|
||||
}
|
||||
|
||||
const token =
|
||||
response?.data?.token ||
|
||||
response?.token ||
|
||||
response?.data?.access_token ||
|
||||
response?.access_token ||
|
||||
response?.data?.accessToken ||
|
||||
response?.accessToken;
|
||||
|
||||
const authToken = token || getToken();
|
||||
|
||||
if (!authToken) {
|
||||
reject({ msg: response?.message || '登录成功但未返回token' });
|
||||
return;
|
||||
}
|
||||
|
||||
if (token) {
|
||||
setToken(token);
|
||||
}
|
||||
|
||||
try {
|
||||
await dispatch('getUserInfo', authToken);
|
||||
} catch (e) {
|
||||
reject({ msg: e?.msg || e?.message || '用户信息加载失败' });
|
||||
return;
|
||||
}
|
||||
|
||||
resolve(response);
|
||||
}).catch(error => {
|
||||
reject({ msg: error?.msg || error?.message || error?.data?.message || '工牌登录失败' });
|
||||
});
|
||||
})
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
const mutations = {
|
||||
@ -286,7 +184,19 @@ const mutations = {
|
||||
},
|
||||
SET_USER: (state, user) => {
|
||||
state.user = user;
|
||||
state.menus = normalizeMenus(user);
|
||||
const allChildren = user.menus.flatMap(item =>
|
||||
item.children || [] // 确保 children 存在,否则返回空数组
|
||||
);
|
||||
|
||||
// 2. 过滤有效菜单并限制数量
|
||||
const validMenus = allChildren.filter(menu =>
|
||||
menu &&
|
||||
menu.component &&
|
||||
menu.component !== 'Layout' &&
|
||||
menu.meta &&
|
||||
menu.meta.title
|
||||
)
|
||||
state.menus = validMenus;
|
||||
},
|
||||
SET_ROLEID: (state, roleId) => {
|
||||
state.roleId = roleId
|
||||
14
core/utils/auth.js
Normal file
14
core/utils/auth.js
Normal file
@ -0,0 +1,14 @@
|
||||
const TokenKey = 'token'
|
||||
|
||||
export function getToken() {
|
||||
return uni.getStorageSync(TokenKey);
|
||||
}
|
||||
|
||||
export function setToken(token) {
|
||||
console.log("设置token");
|
||||
return uni.setStorageSync(TokenKey,token);
|
||||
}
|
||||
|
||||
export function removeToken() {
|
||||
return uni.setStorageSync(TokenKey,'');
|
||||
}
|
||||
@ -114,9 +114,6 @@ export default class BroadcastManager {
|
||||
const dataKey = this.config.dataKey || 'value';
|
||||
const data = intent.getStringExtra(dataKey);
|
||||
|
||||
// 诊断日志:每次收到广播都打印(含 data 为空的情况),便于排查“后续扫描无反应”
|
||||
console.log('[BroadcastManager] 收到广播 action=', intent.getAction(), ' dataKey=', dataKey, ' data=', data);
|
||||
|
||||
if (!data) {
|
||||
return;
|
||||
}
|
||||
@ -4,26 +4,7 @@ import {
|
||||
import {
|
||||
router
|
||||
} from '@/core/router'
|
||||
import voice from './voice'
|
||||
export default {
|
||||
normalizeRoutePath(path = '') {
|
||||
return String(path || '')
|
||||
.trim()
|
||||
.split('?')[0]
|
||||
.split('#')[0]
|
||||
.replace(/^\/+/, '/');
|
||||
},
|
||||
getCurrentRoutePath() {
|
||||
const pages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
|
||||
const currentPage = pages[pages.length - 1];
|
||||
const route = currentPage?.route || '';
|
||||
return this.normalizeRoutePath(route ? `/${route}` : '');
|
||||
},
|
||||
isSameCurrentRoute(path = '') {
|
||||
const targetPath = this.normalizeRoutePath(path);
|
||||
const currentPath = this.getCurrentRoutePath();
|
||||
return !!targetPath && !!currentPath && targetPath === currentPath;
|
||||
},
|
||||
|
||||
/**
|
||||
* 跳转再封装,主要是为了兼容外链。
|
||||
@ -32,11 +13,6 @@ export default {
|
||||
*/
|
||||
routerTo(path, isTabbar) {
|
||||
if (path) {
|
||||
if (this.isSameCurrentRoute(path)) {
|
||||
console.log('检测到重复跳转,已拦截:', path);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 是否跳转外部链接
|
||||
if (~path.indexOf('http') || ~path.indexOf('www')) {
|
||||
// #ifdef H5
|
||||
@ -141,40 +117,6 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 语音播报
|
||||
* @param {String} text - 播报内容
|
||||
* @param {Object} options - 播报选项
|
||||
* @return {Promise<Boolean>}
|
||||
*/
|
||||
speakText(text = '', options = {}) {
|
||||
try {
|
||||
const saved = uni.getStorageSync('app_settings');
|
||||
let settings = null;
|
||||
if (typeof saved === 'string' && saved) {
|
||||
settings = JSON.parse(saved);
|
||||
} else if (saved && typeof saved === 'object') {
|
||||
settings = saved;
|
||||
}
|
||||
|
||||
if (settings && settings['voice.enabled'] === 'false') {
|
||||
return Promise.resolve(false);
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('[tools.speakText] 读取语音播报开关失败,使用默认开启:', error);
|
||||
}
|
||||
|
||||
return voice.speak(text, options);
|
||||
},
|
||||
|
||||
/**
|
||||
* 停止语音播报
|
||||
* @return {Boolean}
|
||||
*/
|
||||
stopSpeak() {
|
||||
return voice.stop();
|
||||
},
|
||||
|
||||
/**
|
||||
* 微信头像
|
||||
* @param {String} url -图片地址
|
||||
9
day.log
9
day.log
@ -1,9 +0,0 @@
|
||||
2026-03-23
|
||||
统计口径:当前工作区不是 git 仓库,以下内容按文件最后修改时间整理。
|
||||
|
||||
一、今日完成
|
||||
|
||||
二、问题记录
|
||||
暂无
|
||||
|
||||
三、后续计划
|
||||
3
env.js
Normal file
3
env.js
Normal file
@ -0,0 +1,3 @@
|
||||
export const BASE_URL = 'http://192.168.11.56:6060' //后台根域名 https://demo.shopro.top
|
||||
export const API_URL = `${BASE_URL}/system` //后台接口域名
|
||||
export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss
|
||||
@ -1,21 +1,16 @@
|
||||
import Vue from 'vue'
|
||||
// 引入全局uView(必须先于 App 导入:App.vue 模板里的 u-icon/u-button 走 easycom 自动导入,
|
||||
// 其 props.js 依赖 uni.$u,需先由 uView 的 index.js 在模块加载时设置 uni.$u)
|
||||
import uView from '@/uni_modules/uview-ui'
|
||||
|
||||
import App from './App'
|
||||
import core from "@/core";
|
||||
|
||||
// 引入全局uView
|
||||
import uView from '@/uni_modules/uview-ui'
|
||||
|
||||
import mixin from './common/mixin'
|
||||
import {
|
||||
router,
|
||||
RouterMount
|
||||
} from "@/core/router";
|
||||
import store from "@/core/store";
|
||||
import { setupDevLogToLogcat } from "@/core/utils/dev-log";
|
||||
|
||||
// 仅测试包(npm run dev:adb)生效:把 console 输出转发到 logcat,便于真机日志实时查看
|
||||
setupDevLogToLogcat();
|
||||
|
||||
Vue.config.productionTip = false
|
||||
App.mpType = 'app'
|
||||
@ -45,9 +40,7 @@ async function initializeApp() {
|
||||
|
||||
await store.dispatch("bluetoothPrint/initializeBluetooth");
|
||||
// 3. 初始化安卓消息窗口模块(APP环境)
|
||||
// 已停用:浮窗功能未完成(落地页 /pages/message/index 为空,也无消息/角标数据来源),
|
||||
// 需要恢复时取消下面一行注释即可(路由守卫里的 is_visible 在未初始化时会安全返回 false)
|
||||
// await initializeFloatWindow();
|
||||
await initializeFloatWindow();
|
||||
|
||||
// 4. 挂载路由和App
|
||||
RouterMount(app, router, "#app");
|
||||
@ -2,15 +2,10 @@
|
||||
"name" : "WMS_PDA",
|
||||
"appid" : "__UNI__0B3DAD3",
|
||||
"description" : "多平台快速开发的UI框架",
|
||||
"versionName" : "1.0.144",
|
||||
"versionCode" : 1000144,
|
||||
"versionName" : "2.0.37",
|
||||
"versionCode" : 1,
|
||||
"transformPx" : false,
|
||||
"app-plus" : {
|
||||
"statusbar" : {
|
||||
"immersed" : true,
|
||||
"style" : "dark",
|
||||
"background" : "#FFFFFF"
|
||||
},
|
||||
"optimization" : {
|
||||
"subPackages" : true
|
||||
},
|
||||
@ -29,10 +24,7 @@
|
||||
"nvueCompiler" : "uni-app",
|
||||
"compilerVersion" : 3,
|
||||
"modules" : {
|
||||
"Webview-x5" : {},
|
||||
"Barcode" : {},
|
||||
"Bluetooth" : {},
|
||||
"Camera" : {}
|
||||
"Webview-x5" : {}
|
||||
},
|
||||
"distribute" : {
|
||||
"android" : {
|
||||
@ -99,9 +91,6 @@
|
||||
"spotlight@3x" : "unpackage/res/icons/120x120.png"
|
||||
}
|
||||
}
|
||||
},
|
||||
"splashscreen" : {
|
||||
"useOriginalMsgbox" : false
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -139,6 +128,7 @@
|
||||
"appid" : ""
|
||||
},
|
||||
"h5" : {
|
||||
"template" : "template.h5.html",
|
||||
"router" : {
|
||||
"mode" : "history",
|
||||
"base" : ""
|
||||
58
package.json
58
package.json
@ -1,66 +1,16 @@
|
||||
{
|
||||
"name": "wms-pda",
|
||||
"version": "1.0.144",
|
||||
"private": true,
|
||||
"description": "天豹云仓 WMS_PDA(uni-app Vue2 + @vue/cli 4.5)",
|
||||
"id": "uview-ui",
|
||||
"scripts": {
|
||||
"serve": "npm run dev:h5",
|
||||
"build": "npm run build:h5",
|
||||
"dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 NODE_OPTIONS=\"--openssl-legacy-provider --require=./scripts/node-compat.cjs\" vue-cli-service uni-serve",
|
||||
"dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus NODE_OPTIONS=\"--openssl-legacy-provider --require=./scripts/node-compat.cjs\" vue-cli-service uni-build --watch",
|
||||
"build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 NODE_OPTIONS=\"--openssl-legacy-provider --require=./scripts/node-compat.cjs\" vue-cli-service uni-build && node scripts/check-build-env.cjs dist/build/h5",
|
||||
"build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus NODE_OPTIONS=\"--openssl-legacy-provider --require=./scripts/node-compat.cjs\" vue-cli-service uni-build && node scripts/check-build-env.cjs dist/build/app-plus",
|
||||
"build:apk": "node scripts/build-apk.cjs",
|
||||
"dev:adb": "node scripts/dev-adb.cjs",
|
||||
"build:app-plus:dev": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus NODE_OPTIONS=\"--openssl-legacy-provider --require=./scripts/node-compat.cjs\" vue-cli-service uni-build",
|
||||
"android:pack:raw": "powershell -NoProfile -ExecutionPolicy Bypass -File android-offline/pack.ps1",
|
||||
"check:env": "node scripts/check-build-env.cjs",
|
||||
"lint": "eslint . --fix",
|
||||
"test": "eslint . --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@dcloudio/uni-app": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-app-plus": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-h5": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-i18n": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-mp-vue": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-mp-weixin": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-stat": "2.0.2-5020620260917001",
|
||||
"core-js": "^3.8.3",
|
||||
"html2canvas": "^1.4.1",
|
||||
"pinyin-pro": "^3.28.0",
|
||||
"qrcode": "^1.5.4",
|
||||
"regenerator-runtime": "^0.12.1",
|
||||
"uni-read-pages": "^1.0.5",
|
||||
"uqrcodejs": "^4.0.7",
|
||||
"vue": ">= 2.6.14 < 2.7",
|
||||
"vuex": "^3.6.2"
|
||||
"uqrcodejs": "^4.0.7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@dcloudio/uni-cli-i18n": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-cli-shared": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-migration": "2.0.2-5020620260917001",
|
||||
"@dcloudio/uni-template-compiler": "2.0.2-5020620260917001",
|
||||
"@dcloudio/vue-cli-plugin-hbuilderx": "2.0.2-5020620260917001",
|
||||
"@dcloudio/vue-cli-plugin-uni": "2.0.2-5020620260917001",
|
||||
"@dcloudio/vue-cli-plugin-uni-optimize": "2.0.2-5020620260917001",
|
||||
"@dcloudio/webpack-uni-mp-loader": "2.0.2-5020620260917001",
|
||||
"@dcloudio/webpack-uni-pages-loader": "2.0.2-5020620260917001",
|
||||
"@vue/cli-plugin-babel": "~4.5.0",
|
||||
"@vue/cli-service": "~4.5.0",
|
||||
"babel-plugin-import": "^1.11.0",
|
||||
"copy-webpack-plugin": "^5.1.2",
|
||||
"cross-env": "^7.0.2",
|
||||
"eslint": "^8.2.0",
|
||||
"eslint-config-airbnb": "^19.0.0",
|
||||
"postcss": "^7.0.39",
|
||||
"postcss-comment": "^2.0.0",
|
||||
"sass": "~1.49.8",
|
||||
"sass-loader": "^8.0.2",
|
||||
"vue-template-compiler": ">= 2.6.14 < 2.7"
|
||||
},
|
||||
"browserslist": [
|
||||
"Android >= 4.4",
|
||||
"iOS >= 9"
|
||||
]
|
||||
"eslint-config-airbnb": "^19.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
159
pages.json
Normal file
159
pages.json
Normal file
@ -0,0 +1,159 @@
|
||||
{
|
||||
// "condition": { //模式配置,仅开发期间生效
|
||||
// "current": 0, //当前激活的模式(list 的索引项)
|
||||
// "list": [{
|
||||
// "name": "test", //模式名称
|
||||
// "path": "pages/componentsA/test/test", //启动页面,必选
|
||||
// "query": "" //启动参数,在页面的onLoad函数里面得到
|
||||
// }]
|
||||
// },
|
||||
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
|
||||
|
||||
{
|
||||
"path": "pages/login/index",
|
||||
|
||||
"style": {
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/oa/index",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/index/index",
|
||||
"style": {
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/work/index",
|
||||
"style": {
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/user/index",
|
||||
"style": {
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/message/index",
|
||||
"style": {
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/404",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/settings/broadcastSettings",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/settings/index",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/settings/networkTest",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/work/storage/receiving/receiving",
|
||||
"meta": {
|
||||
"auth": true
|
||||
},
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/work/storage/relocation",
|
||||
"meta": {
|
||||
"auth": true
|
||||
},
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/403",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/work/storage/receiving/receivingCreate",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/work/storage/receiving/receivingDetail",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/work/storage/receiving/receivingList",
|
||||
"style" :
|
||||
{
|
||||
"titleNView": false
|
||||
}
|
||||
}
|
||||
|
||||
],
|
||||
"globalStyle": {
|
||||
"navigationBarTextStyle": "black",
|
||||
"navigationBarTitleText": "WMS_PDA",
|
||||
"navigationBarBackgroundColor": "#FFFFFF",
|
||||
"backgroundColor": "#f8f8f8"
|
||||
},
|
||||
"tabBar": {
|
||||
"borderStyle": "white",
|
||||
"backgroundColor": "#333",
|
||||
"color": "#555",
|
||||
"selectedColor": "#24afd6",
|
||||
"list": [{
|
||||
"text": "作业",
|
||||
"pagePath": "pages/index/index",
|
||||
"iconPath": "static/icon/index.png",
|
||||
"selectedIconPath": "static/icon/index_a.png"
|
||||
},
|
||||
{
|
||||
"text": "工单",
|
||||
"pagePath": "pages/oa/index",
|
||||
"iconPath": "static/icon/oa.png",
|
||||
"selectedIconPath": "static/icon/oa_a.png"
|
||||
},
|
||||
{
|
||||
"text": "我的",
|
||||
"pagePath": "pages/user/index",
|
||||
"iconPath": "static/icon/mime.png",
|
||||
"selectedIconPath": "static/icon/mime_a.png"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user