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
172beea1
Commit
172beea1
authored
Mar 01, 2018
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化系统错误对话框
parent
c5f082de
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
35 deletions
+47
-35
app/build.gradle
app/build.gradle
+30
-30
app/src/main/java/com/xingdata/zzdpos/C.java
app/src/main/java/com/xingdata/zzdpos/C.java
+15
-3
app/src/main/java/com/xingdata/zzdpos/api/ResultFilter.java
app/src/main/java/com/xingdata/zzdpos/api/ResultFilter.java
+1
-1
app/src/main/res/layout/activity_server_err.xml
app/src/main/res/layout/activity_server_err.xml
+1
-1
No files found.
app/build.gradle
View file @
172beea1
...
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
...
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
apply
plugin:
'realm-android'
apply
plugin:
'realm-android'
android
{
android
{
compileSdkVersion
27
compileSdkVersion
27
buildToolsVersion
'27.0.
0
'
buildToolsVersion
'27.0.
3
'
defaultConfig
{
defaultConfig
{
applicationId
"com.xingdata.zzdpos"
applicationId
"com.xingdata.zzdpos"
minSdkVersion
21
minSdkVersion
21
...
@@ -57,33 +57,33 @@ dependencies {
...
@@ -57,33 +57,33 @@ dependencies {
androidTestCompile
(
'com.android.support.test.espresso:espresso-core:2.2.2'
,
{
androidTestCompile
(
'com.android.support.test.espresso:espresso-core:2.2.2'
,
{
exclude
group:
'com.android.support'
,
module:
'support-annotations'
exclude
group:
'com.android.support'
,
module:
'support-annotations'
})
})
compile
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
compile
'com.android.support:appcompat-v7:27.0.2'
implementation
'com.android.support:appcompat-v7:27.0.2'
compile
'com.android.support:support-v4:27.0.2'
implementation
'com.android.support:support-v4:27.0.2'
compile
'com.android.support:design:27.0.2'
implementation
'com.android.support:design:27.0.2'
compile
'com.android.support:cardview-v7:27.0.2'
implementation
'com.android.support:cardview-v7:27.0.2'
compile
'com.android.support.constraint:constraint-layout:1.0.2'
implementation
'com.android.support.constraint:constraint-layout:1.0.2'
compile
'com.squareup.retrofit2:retrofit:2.3.0'
implementation
'com.squareup.retrofit2:retrofit:2.3.0'
compile
'com.squareup.retrofit2:converter-gson:2.3.0'
implementation
'com.squareup.retrofit2:converter-gson:2.3.0'
compile
'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
implementation
'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
compile
'com.squareup.okhttp3:okhttp:3.9.0'
implementation
'com.squareup.okhttp3:okhttp:3.9.0'
compile
'com.squareup.okhttp3:logging-interceptor:3.9.0'
implementation
'com.squareup.okhttp3:logging-interceptor:3.9.0'
compile
'io.reactivex.rxjava2:rxjava:2.1.5'
implementation
'io.reactivex.rxjava2:rxjava:2.1.5'
compile
'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation
'io.reactivex.rxjava2:rxandroid:2.0.1'
compile
'com.alibaba:fastjson:1.1.67.android'
implementation
'com.alibaba:fastjson:1.1.67.android'
compile
'com.blankj:utilcode:1.11.1'
implementation
'com.blankj:utilcode:1.11.1'
compile
'com.facebook.fresco:fresco:1.5.0'
implementation
'com.facebook.fresco:fresco:1.5.0'
compile
'com.facebook.fresco:animated-gif:1.5.0'
implementation
'com.facebook.fresco:animated-gif:1.5.0'
compile
'com.hwangjr.rxbus:rxbus:2.0.0'
implementation
'com.hwangjr.rxbus:rxbus:2.0.0'
compile
'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
implementation
'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
compile
'com.yanzhenjie:permission:1.1.2'
implementation
'com.yanzhenjie:permission:1.1.2'
compile
'com.wanjian:cockroach:0.0.5'
implementation
'com.wanjian:cockroach:0.0.5'
compile
'me.yokeyword:fragmentation:1.1.6'
implementation
'me.yokeyword:fragmentation:1.1.6'
compile
'com.github.arcadefire:nice-spinner:1.3.1'
implementation
'com.github.arcadefire:nice-spinner:1.3.1'
compile
'com.contrarywind:Android-PickerView:3.2.5'
implementation
'com.contrarywind:Android-PickerView:3.2.5'
compile
'com.github.ybq:Android-SpinKit:1.1.0'
implementation
'com.github.ybq:Android-SpinKit:1.1.0'
compile
'com.youth.banner:banner:1.4.10'
implementation
'com.youth.banner:banner:1.4.10'
compile
'me.dm7.barcodescanner:zxing:1.9.8'
implementation
'me.dm7.barcodescanner:zxing:1.9.8'
compile
'com.google.zxing:core:3.3.1'
implementation
'com.google.zxing:core:3.3.1'
compile
(
name:
'zx_print_library-debug'
,
ext:
'aar'
)
implementation
(
name:
'zx_print_library-debug'
,
ext:
'aar'
)
}
}
app/src/main/java/com/xingdata/zzdpos/C.java
View file @
172beea1
...
@@ -58,11 +58,23 @@ public class C {
...
@@ -58,11 +58,23 @@ public class C {
}
}
public
static
final
class
URL
{
public
static
final
class
URL
{
// public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
/**
* 支付服务器
*/
public
static
final
String
TEMP_PAY_URL
=
"http://demo.51zzd.cn/"
;
public
static
final
String
TEMP_PAY_URL
=
"http://demo.51zzd.cn/"
;
/**
* 测试环境(客户演示使用)sn:test01,设备号:AECRC10
*/
// public static final String BASE_URL = "http://121.40.56.52:8080/";
/**
* 开发平台(开发人员使用)
*/
// public static final String BASE_URL = "http://demo.51zzd.cn:8080/";//开发测试平台
/**
* 生产平台
*/
public
static
final
String
BASE_URL
=
"http://tk.51zzd.com/"
;
public
static
final
String
BASE_URL
=
"http://121.40.56.52:8080/"
;
// public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
private
static
final
String
PKG
=
"/tk/"
;
private
static
final
String
PKG
=
"/tk/"
;
...
...
app/src/main/java/com/xingdata/zzdpos/api/ResultFilter.java
View file @
172beea1
...
@@ -34,7 +34,7 @@ class ResultFilter<T> implements Function<HttpMessage<T>, T> {
...
@@ -34,7 +34,7 @@ class ResultFilter<T> implements Function<HttpMessage<T>, T> {
@Override
@Override
public
void
run
()
{
public
void
run
()
{
Intent
intent
=
new
Intent
();
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
"serverErr"
,
"
错误
码:"
+
tHttpMessage
.
getReturnCode
()
+
intent
.
putExtra
(
"serverErr"
,
"
状态
码:"
+
tHttpMessage
.
getReturnCode
()
+
"\n\n\n"
+
tHttpMessage
.
getReturnInfo
());
"\n\n\n"
+
tHttpMessage
.
getReturnInfo
());
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
intent
.
setClass
(
ActivityUtils
.
getTopActivity
(),
ServerErrActivity
.
class
);
intent
.
setClass
(
ActivityUtils
.
getTopActivity
(),
ServerErrActivity
.
class
);
...
...
app/src/main/res/layout/activity_server_err.xml
View file @
172beea1
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/all_margin"
android:layout_margin=
"@dimen/all_margin"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
服务器接口异常
"
android:text=
"
系统提示
"
android:textSize=
"@dimen/et_textsize"
android:textSize=
"@dimen/et_textsize"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
...
...
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