Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王海
TangKuPos
Commits
b890849f
Commit
b890849f
authored
Mar 14, 2018
by
陈前
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复开单崩溃
parent
c87c41ae
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
11 deletions
+9
-11
app/libs/zx_print_library-debug.aar
app/libs/zx_print_library-debug.aar
+0
-0
app/src/main/java/com/xingdata/zzdpos/App.java
app/src/main/java/com/xingdata/zzdpos/App.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/C.java
app/src/main/java/com/xingdata/zzdpos/C.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
+4
-4
app/src/main/res/layout/fragment_service.xml
app/src/main/res/layout/fragment_service.xml
+2
-4
app/src/main/res/mipmap-xhdpi/bg_service.jpg
app/src/main/res/mipmap-xhdpi/bg_service.jpg
+0
-0
app/src/main/res/mipmap-xhdpi/bg_service.png
app/src/main/res/mipmap-xhdpi/bg_service.png
+0
-0
No files found.
app/libs/zx_print_library-debug.aar
View file @
b890849f
No preview for this file type
app/src/main/java/com/xingdata/zzdpos/App.java
View file @
b890849f
...
@@ -71,7 +71,7 @@ public class App extends Application {
...
@@ -71,7 +71,7 @@ public class App extends Application {
.
start
();
.
start
();
// 初始化异常处理
// 初始化异常处理
//
initEx();
initEx
();
//初始化Fragment框架
//初始化Fragment框架
initFragment
();
initFragment
();
...
...
app/src/main/java/com/xingdata/zzdpos/C.java
View file @
b890849f
...
@@ -68,7 +68,7 @@ public class C {
...
@@ -68,7 +68,7 @@ public class C {
* sn:test2018 设备型号 AECRC10 (pos)
* sn:test2018 设备型号 AECRC10 (pos)
* sn:test2019 设备型号 X990 (收银机)
* sn:test2019 设备型号 X990 (收银机)
*/
*/
private
static
final
String
URL_TEST
=
"http://
tk.51zzd.cn
:8080/"
;
private
static
final
String
URL_TEST
=
"http://
121.40.56.52
:8080/"
;
/**
/**
* 开发平台(开发人员使用)
* 开发平台(开发人员使用)
...
...
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @
b890849f
...
@@ -71,7 +71,7 @@ public class DBFactory {
...
@@ -71,7 +71,7 @@ public class DBFactory {
* @return 商品List
* @return 商品List
*/
*/
public
static
Observable
<
Pager
<
Sssku
>>
querySku
(
int
pageNum
,
Long
skuGrpId
)
{
public
static
Observable
<
Pager
<
Sssku
>>
querySku
(
int
pageNum
,
Long
skuGrpId
)
{
RealmQuery
<
Sssku
>
query
=
DB
.
getInstance
().
get
(
Main
Presenter
.
class
).
where
(
Sssku
.
class
);
RealmQuery
<
Sssku
>
query
=
DB
.
getInstance
().
get
(
Store
Presenter
.
class
).
where
(
Sssku
.
class
);
//skuGrpId
//skuGrpId
if
(
skuGrpId
!=
null
&&
skuGrpId
>
0
)
query
.
equalTo
(
"skuGrpId"
,
skuGrpId
);
if
(
skuGrpId
!=
null
&&
skuGrpId
>
0
)
query
.
equalTo
(
"skuGrpId"
,
skuGrpId
);
...
...
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @
b890849f
...
@@ -28,8 +28,8 @@ public final class SystemUtil {
...
@@ -28,8 +28,8 @@ public final class SystemUtil {
* @return 设备型号
* @return 设备型号
*/
*/
public
static
String
getDeviceModel
()
{
public
static
String
getDeviceModel
()
{
return
DeviceUtils
.
getModel
();
//
return DeviceUtils.getModel();
//
return "X990";
return
"X990"
;
}
}
...
@@ -57,8 +57,8 @@ public final class SystemUtil {
...
@@ -57,8 +57,8 @@ public final class SystemUtil {
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
}
}
//
return "test2019";
return
"test2019"
;
return
deviceSN
;
//
return deviceSN;
}
}
/**
/**
...
...
app/src/main/res/layout/fragment_service.xml
View file @
b890849f
...
@@ -42,10 +42,8 @@
...
@@ -42,10 +42,8 @@
<ImageView
<ImageView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"200dp"
android:src=
"@mipmap/bg_service"
android:background=
"@mipmap/bg_service"
/>
/>
</ScrollView>
</ScrollView>
...
...
app/src/main/res/mipmap-xhdpi/bg_service.jpg
0 → 100644
View file @
b890849f
31 KB
app/src/main/res/mipmap-xhdpi/bg_service.png
deleted
100644 → 0
View file @
c87c41ae
464 KB
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