Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/C.java

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'realm-android'
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.0'
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.xingdata.zzdpos"
         minSdkVersion 21
@@ -57,33 +57,33 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:support-v4:27.0.2'
-    compile 'com.android.support:design:27.0.2'
-    compile 'com.android.support:cardview-v7:27.0.2'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    compile 'io.reactivex.rxjava2:rxjava:2.1.5'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'com.alibaba:fastjson:1.1.67.android'
-    compile 'com.blankj:utilcode:1.11.1'
-    compile 'com.facebook.fresco:fresco:1.5.0'
-    compile 'com.facebook.fresco:animated-gif:1.5.0'
-    compile 'com.hwangjr.rxbus:rxbus:2.0.0'
-    compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
-    compile 'com.yanzhenjie:permission:1.1.2'
-    compile 'com.wanjian:cockroach:0.0.5'
-    compile 'me.yokeyword:fragmentation:1.1.6'
-    compile 'com.github.arcadefire:nice-spinner:1.3.1'
-    compile 'com.contrarywind:Android-PickerView:3.2.5'
-    compile 'com.github.ybq:Android-SpinKit:1.1.0'
-    compile 'com.youth.banner:banner:1.4.10'
-    compile 'me.dm7.barcodescanner:zxing:1.9.8'
-    compile 'com.google.zxing:core:3.3.1'
-    compile(name: 'zx_print_library-debug', ext: 'aar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support:support-v4:27.0.2'
+    implementation 'com.android.support:design:27.0.2'
+    implementation 'com.android.support:cardview-v7:27.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.9.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'com.alibaba:fastjson:1.1.67.android'
+    implementation 'com.blankj:utilcode:1.11.1'
+    implementation 'com.facebook.fresco:fresco:1.5.0'
+    implementation 'com.facebook.fresco:animated-gif:1.5.0'
+    implementation 'com.hwangjr.rxbus:rxbus:2.0.0'
+    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
+    implementation 'com.yanzhenjie:permission:1.1.2'
+    implementation 'com.wanjian:cockroach:0.0.5'
+    implementation 'me.yokeyword:fragmentation:1.1.6'
+    implementation 'com.github.arcadefire:nice-spinner:1.3.1'
+    implementation 'com.contrarywind:Android-PickerView:3.2.5'
+    implementation 'com.github.ybq:Android-SpinKit:1.1.0'
+    implementation 'com.youth.banner:banner:1.4.10'
+    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
+    implementation 'com.google.zxing:core:3.3.1'
+    implementation(name: 'zx_print_library-debug', ext: 'aar')
 }

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -58,11 +58,23 @@ public class C {
     }
 
     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/";
+        /**
+         * 测试环境（客户演示使用）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://demo.51zzd.cn:8080/";
-//        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
 
         private static final String PKG = "/tk/";
 

app/src/main/java/com/xingdata/zzdpos/api/ResultFilter.java

@@ -34,7 +34,7 @@ class ResultFilter<T> implements Function<HttpMessage<T>, T> {
                     @Override
                     public void run() {
                         Intent intent = new Intent();
-                        intent.putExtra("serverErr", "错误码：" + tHttpMessage.getReturnCode() +
+                        intent.putExtra("serverErr", "状态码：" + tHttpMessage.getReturnCode() +
                                 "\n\n\n" + tHttpMessage.getReturnInfo());
                         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         intent.setClass(ActivityUtils.getTopActivity(), ServerErrActivity.class);
@@ -72,7 +72,7 @@ class ResultFilter<T> implements Function<HttpMessage<T>, T> {
                     @Override
                     public void run() {
                         Intent intent = new Intent();
-                        intent.putExtra("serverErr", "错误码：" + tHttpMessage.getReturnCode() +
+                        intent.putExtra("serverErr", "状态码：" + tHttpMessage.getReturnCode() +
                                 "\n\n\n" + tHttpMessage.getReturnInfo());
                         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         intent.setClass(ActivityUtils.getTopActivity(), ServerErrActivity.class);

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java

@@ -178,6 +178,11 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
 
     public void setVip(Vip mVip) {
         this.vip = mVip;
+        if (mVip!=null){
+            vipTag=Byte.parseByte(String.valueOf(mVip.getVipTag()));
+        }else {
+            vipTag=null;
+        }
     }
 
     public Vip getmVip() {

app/src/main/res/layout/activity_server_err.xml

@@ -16,7 +16,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/all_margin"
                 android:gravity="center"
-                android:text="服务器接口异常"
+                android:text="系统提示"
                 android:textSize="@dimen/et_textsize"
                 android:textStyle="bold"/>