Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MiYaFastCashier
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jiangjiantao
MiYaFastCashier
Commits
f5b6fb4f
Commit
f5b6fb4f
authored
Apr 18, 2022
by
zhaopengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级版本管控
parent
96fd5ab7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
7 deletions
+40
-7
AccountPasswordManageKit.java
...ya/fastcashier/utils/manage/AccountPasswordManageKit.java
+0
-6
版本历史.md
doc/版本历史.md
+17
-0
颜色不透明度与16进制转换.txt
doc/颜色不透明度与16进制转换.txt
+22
-0
versions.gradle
versions.gradle
+1
-1
No files found.
app/src/main/java/com/miya/fastcashier/utils/manage/AccountPasswordManageKit.java
View file @
f5b6fb4f
...
@@ -6,7 +6,6 @@ import android.text.TextUtils;
...
@@ -6,7 +6,6 @@ import android.text.TextUtils;
import
com.blankj.utilcode.util.FileIOUtils
;
import
com.blankj.utilcode.util.FileIOUtils
;
import
com.blankj.utilcode.util.FileUtils
;
import
com.blankj.utilcode.util.FileUtils
;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.miya.fastcashier.service.AccountService
;
import
com.miya.fastcashier.service.AccountService
;
import
com.permissionx.guolindev.PermissionX
;
import
com.permissionx.guolindev.PermissionX
;
...
@@ -63,7 +62,6 @@ public class AccountPasswordManageKit {
...
@@ -63,7 +62,6 @@ public class AccountPasswordManageKit {
}
}
public
void
initAccountPassword
(
AppCompatActivity
context
,
AccountPasswordManageCallback
callback
)
{
public
void
initAccountPassword
(
AppCompatActivity
context
,
AccountPasswordManageCallback
callback
)
{
LogUtils
.
e
(
"path"
,
getCurrentAccountFilePath
());
if
(
FileUtils
.
isFileExists
(
getCurrentAccountFilePath
()))
{
if
(
FileUtils
.
isFileExists
(
getCurrentAccountFilePath
()))
{
Executors
.
newCachedThreadPool
().
execute
(
new
Runnable
()
{
Executors
.
newCachedThreadPool
().
execute
(
new
Runnable
()
{
@Override
@Override
...
@@ -76,7 +74,6 @@ public class AccountPasswordManageKit {
...
@@ -76,7 +74,6 @@ public class AccountPasswordManageKit {
if
(
callback
!=
null
){
if
(
callback
!=
null
){
callback
.
onPasswordGet
(
password
);
callback
.
onPasswordGet
(
password
);
}
}
LogUtils
.
e
(
"FileExists"
,
password
);
}
}
});
});
}
}
...
@@ -87,13 +84,11 @@ public class AccountPasswordManageKit {
...
@@ -87,13 +84,11 @@ public class AccountPasswordManageKit {
AccountService
.
INSTANCE
.
setAccountPassword
(
ACCOUNT_DEFAULT_PASSWORD
);
AccountService
.
INSTANCE
.
setAccountPassword
(
ACCOUNT_DEFAULT_PASSWORD
);
if
(
callback
!=
null
){
if
(
callback
!=
null
){
callback
.
onPasswordGet
(
ACCOUNT_DEFAULT_PASSWORD
);
callback
.
onPasswordGet
(
ACCOUNT_DEFAULT_PASSWORD
);
LogUtils
.
e
(
"FileNoExists"
,
ACCOUNT_DEFAULT_PASSWORD
);
}
}
if
(
FileUtils
.
createOrExistsFile
(
getCurrentAccountFilePath
()))
{
if
(
FileUtils
.
createOrExistsFile
(
getCurrentAccountFilePath
()))
{
Executors
.
newCachedThreadPool
().
execute
(
new
Runnable
()
{
Executors
.
newCachedThreadPool
().
execute
(
new
Runnable
()
{
@Override
@Override
public
void
run
()
{
public
void
run
()
{
LogUtils
.
e
(
"creat File"
,
ACCOUNT_DEFAULT_PASSWORD
);
FileIOUtils
.
writeFileFromString
(
getCurrentAccountFilePath
(),
ACCOUNT_DEFAULT_PASSWORD
);
FileIOUtils
.
writeFileFromString
(
getCurrentAccountFilePath
(),
ACCOUNT_DEFAULT_PASSWORD
);
}
}
});
});
...
@@ -116,7 +111,6 @@ public class AccountPasswordManageKit {
...
@@ -116,7 +111,6 @@ public class AccountPasswordManageKit {
}
else
{
}
else
{
if
(
callback
!=
null
){
if
(
callback
!=
null
){
callback
.
onPasswordGet
(
accountPassword
);
callback
.
onPasswordGet
(
accountPassword
);
LogUtils
.
e
(
"loadAccountPassword"
,
accountPassword
);
}
}
}
}
}
}
...
...
doc/版本历史.md
0 → 100644
View file @
f5b6fb4f
# 版本历史
## tag 2022.04.6
#### v2.1.0
-添加管理员密码权限
-修改密码,退款密码校验
-优化订单流水相关,统一管理,修改存储无上限为每日清除前一天记录
## tag 2022.03.26
#### v2.1.0
-退款流程修改:允许多次退款
## tag 2022.03.24以前
#### v1.0 v2.0
-登录,登出
-收款,退款,主扫,被扫
-查询订单,打印,结算
doc/颜色不透明度与16进制转换.txt
0 → 100644
View file @
f5b6fb4f
100% — FF
95% — F2
90% — E6
85% — D9
80% — CC
75% — BF
70% — B3
65% — A6
60% — 99
55% — 8C
50% — 80
45% — 73
40% — 66
35% — 59
30% — 4D
25% — 40
20% — 33
15% — 26
10% — 1A
5% — 0D
0% — 00
\ No newline at end of file
versions.gradle
View file @
f5b6fb4f
ext
{
ext
{
VERSION_CODE
=
2
1
VERSION_CODE
=
2
2
VERSION_NAME
=
'2.1.1'
VERSION_NAME
=
'2.1.1'
}
}
\ No newline at end of file
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