Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
huangzhicong
/
SmartCanteen
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
296db9d3
authored
May 15, 2020
by
pye52
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、更新README及文档
2、写入成功code改为0
parent
7a99f04f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
README.md
+8
-8
app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java
+1
-1
智慧食堂开发文档.docx
+0
-0
No files found.
README.md
View file @
296db9d3
### 分支管理
| 分支名 | 描述 |
| ---------- | ------------------------------------------------------------ |
| develop |
deprecated 开发分支作为源分支,所有新功能开发和bug修复都在develop派生分支进行
|
|
test | deprecated 测试环境,仅用作打包使用,打包前先从develop分支合并过来并递增版本号
|
|
uat | deprecated uat环境,仅用作打包使用,打包前先从develop分支合并过来并递增版本号
|
| production | deprecated 生产环境,仅用作打包使用,打包前先从develop分支合并过来并递增版本号 |
| new_master | 重构版本,通过Build Variants来切换到指定的环境,打包同理。已配置好混淆 |
|
new_for_phone | 重构版本,供手机测试,通过Build Variants来切换到指定的环境,打包同理。已配置好混淆
|
| 分支名 | 描述 |
作用 |
| ---------- | ------------------------------------------------------------ |
------------------------------------------------------------ |
| develop |
开发分支 | 整合新功能及bug修复
|
|
fea-xxx | deprecated 测试环境,仅用作打包使用,打包前先从develop分支合并过来并递增版本号 | 新功能实现
|
|
bug-xxx | bug分支,"xxx"为bug简称 | 修复bug
|
| production | deprecated 生产环境,仅用作打包使用,打包前先从develop分支合并过来并递增版本号 |
|
| new_master | 重构版本,通过Build Variants来切换到指定的环境,打包同理。已配置好混淆 |
|
|
for_phone | 重构版本,供手机测试 |
|
### 特殊功能二维码
在线生成二维码:https://www.liantu.com
...
...
app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java
View file @
296db9d3
...
...
@@ -100,7 +100,7 @@ public class PayOfflineViewModel extends ViewModel {
private
static
final
String
RESPONSE_MESSAGE
=
"message"
;
private
static
final
String
RESPONSE_OFFLINE_RESULT
=
"操作完成"
;
private
static
final
String
RESPONSE_PAY_OFFLINE_RESULT
=
"PAY_OFFLINE_RESULT"
;
private
static
final
String
RESPONSE_SUCCESS
=
"
1
"
;
private
static
final
String
RESPONSE_SUCCESS
=
"
0
"
;
// 每心跳多少次后进行一次离线订单检测
private
static
final
int
PAY_OFFLINE_CHECK
=
30
;
// 当链接频繁断开时,给予离线订单检测一定缓冲时间
...
...
智慧食堂开发文档.docx
View file @
296db9d3
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment