Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
A
AnchorCollect
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hywang
AnchorCollect
Commits
b8c195a0
Commit
b8c195a0
authored
Oct 16, 2023
by
hywang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.不再保存图片base64,增加图片路径
parent
e38e23f3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
245 additions
and
232 deletions
+245
-232
build.gradle
app/build.gradle
+3
-3
DaoMaster.java
...rc/main/java/com/phlx/anchorcollect/db/gen/DaoMaster.java
+2
-2
CattleResumeEntity.java
...ava/com/phlx/anchorcollect/entity/CattleResumeEntity.java
+19
-8
SyncVM.java
...c/main/java/com/phlx/anchorcollect/ui/setting/SyncVM.java
+221
-219
No files found.
app/build.gradle
View file @
b8c195a0
...
...
@@ -9,8 +9,8 @@ android {
applicationId
"com.phlx.anchorcollect"
minSdkVersion
21
targetSdkVersion
29
versionCode
1
1
versionName
"2.0.
5
"
versionCode
1
2
versionName
"2.0.
6
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
...
...
@@ -48,7 +48,7 @@ android {
}
greendao
{
schemaVersion
5
//数据库版本号
schemaVersion
6
//数据库版本号
daoPackage
'com.phlx.anchorcollect.db.gen'
targetGenDir
'src/main/java'
}
...
...
app/src/main/java/com/phlx/anchorcollect/db/gen/DaoMaster.java
View file @
b8c195a0
...
...
@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
* Master of DAO (schema version
5
): knows all DAOs.
* Master of DAO (schema version
6
): knows all DAOs.
*/
public
class
DaoMaster
extends
AbstractDaoMaster
{
public
static
final
int
SCHEMA_VERSION
=
5
;
public
static
final
int
SCHEMA_VERSION
=
6
;
/** Creates underlying database table using DAOs. */
public
static
void
createAllTables
(
Database
db
,
boolean
ifNotExists
)
{
...
...
app/src/main/java/com/phlx/anchorcollect/entity/CattleResumeEntity.java
View file @
b8c195a0
...
...
@@ -81,6 +81,9 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
/** 照片路径;(可以多图片“,”分割) */
private
String
photo
;
/** 照片路径, 手持机用*/
private
String
photoPath
;
/** 状态(育种,育成,成年;淘汰,出售) */
private
String
status
;
...
...
@@ -162,6 +165,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
junHeavy
=
in
.
readString
();
decAppScore
=
in
.
readString
();
photo
=
in
.
readString
();
photoPath
=
in
.
readString
();
status
=
in
.
readString
();
if
(
in
.
readByte
()
==
0
)
{
isOut
=
null
;
...
...
@@ -194,14 +198,14 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
remark
=
in
.
readString
();
}
@Generated
(
hash
=
1
106807371
)
@Generated
(
hash
=
1
557063295
)
public
CattleResumeEntity
(
Long
unid
,
String
registrationNo
,
String
individualNo
,
String
circleNo
,
String
raiseType
,
String
raiseVarieties
,
String
birthdate
,
Double
birthHeavy
,
String
sex
,
String
birthDifficulty
,
String
isTwins
,
String
childTime
,
String
grade
,
String
fatherReg
,
String
motherReg
,
Double
fromMilkHeavy
,
String
health
,
String
junHeavy
,
String
decAppScore
,
String
photo
,
String
status
,
Long
isOut
,
Integer
age
,
String
colour
,
String
inputTime
,
Long
deptId
,
Long
deptName
,
String
uploadStatus
,
String
uploadTime
,
String
createBy
,
String
createTime
,
String
updateBy
,
String
updateTime
,
String
remark
)
{
String
photo
,
String
photoPath
,
String
status
,
Long
isOut
,
Integer
age
,
String
colour
,
String
inputTime
,
Long
deptId
,
Long
deptName
,
String
uploadStatus
,
String
uploadTime
,
String
create
By
,
String
create
Time
,
String
updateBy
,
String
updateTime
,
String
remark
)
{
this
.
unid
=
unid
;
this
.
registrationNo
=
registrationNo
;
this
.
individualNo
=
individualNo
;
...
...
@@ -222,6 +226,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this
.
junHeavy
=
junHeavy
;
this
.
decAppScore
=
decAppScore
;
this
.
photo
=
photo
;
this
.
photoPath
=
photoPath
;
this
.
status
=
status
;
this
.
isOut
=
isOut
;
this
.
age
=
age
;
...
...
@@ -275,6 +280,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
dest
.
writeString
(
junHeavy
);
dest
.
writeString
(
decAppScore
);
dest
.
writeString
(
photo
);
dest
.
writeString
(
photoPath
);
dest
.
writeString
(
status
);
if
(
isOut
==
null
)
{
dest
.
writeByte
((
byte
)
0
);
...
...
@@ -328,10 +334,6 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
}
};
public
static
long
getSerialVersionUID
()
{
return
serialVersionUID
;
}
public
Long
getUnid
()
{
return
unid
;
}
...
...
@@ -492,6 +494,14 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this
.
photo
=
photo
;
}
public
String
getPhotoPath
()
{
return
photoPath
;
}
public
void
setPhotoPath
(
String
photoPath
)
{
this
.
photoPath
=
photoPath
;
}
public
String
getStatus
()
{
return
status
;
}
...
...
@@ -627,6 +637,7 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
", junHeavy='"
+
junHeavy
+
'\''
+
", decAppScore='"
+
decAppScore
+
'\''
+
", photo='"
+
photo
+
'\''
+
", photoPath='"
+
photoPath
+
'\''
+
", status='"
+
status
+
'\''
+
", isOut="
+
isOut
+
", age="
+
age
+
...
...
app/src/main/java/com/phlx/anchorcollect/ui/setting/SyncVM.java
View file @
b8c195a0
This diff is collapsed.
Click to expand it.
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