工资条无数据界面优化

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/PayTestActivity.java

@@ -2,10 +2,8 @@ package com.xzjmyk.pm.activity.ui.me;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.R;
 
 public class PayTestActivity extends BaseActivity {
     private int paytype = -1;
@@ -13,33 +11,33 @@ public class PayTestActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_pay_test);
-        initView();
+//        setContentView(R.layout.activity_pay_test);
+//        initView();
     }
 
-    private void initView() {
-        findViewById(R.id.wxpay_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paytype = 1;
-              gotoPayActivity(paytype);
-            }
-        });
-        findViewById(R.id.alipay_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paytype = 2;
-                gotoPayActivity(paytype);
-            }
-        });
-        findViewById(R.id.unionpay_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paytype = 3;
-                gotoPayActivity(paytype);
-        }
-        });
-    }
+//    private void initView() {
+//        findViewById(R.id.wxpay_btn).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                paytype = 1;
+//              gotoPayActivity(paytype);
+//            }
+//        });
+//        findViewById(R.id.alipay_btn).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                paytype = 2;
+//                gotoPayActivity(paytype);
+//            }
+//        });
+//        findViewById(R.id.unionpay_btn).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                paytype = 3;
+//                gotoPayActivity(paytype);
+//        }
+//        });
+//    }
 
     private void gotoPayActivity(int type) {
         startActivity(new Intent(this,PayListActivity.class)

WeiChat/src/main/res/layout/activity_pay_test.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/base_bg"
-    android:orientation="vertical"
-    >
-    <Button
-        android:id="@+id/wxpay_btn"
-        android:text="微信"
-        android:layout_gravity="center_horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/bg_bule_btn"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:layout_marginTop="50dp"
-        android:layout_marginLeft="50dp"
-        android:layout_marginRight="50dp"
-        />
-    <Button
-        android:id="@+id/alipay_btn"
-        android:text="支付宝"
-        android:layout_gravity="center_horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/bg_bule_btn"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:layout_marginTop="20dp"
-        android:layout_marginLeft="50dp"
-        android:layout_marginRight="50dp"
-        />
-
-    <Button
-        android:id="@+id/unionpay_btn"
-        android:text="银联"
-        android:layout_gravity="center_horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/bg_bule_btn"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:layout_marginTop="20dp"
-        android:layout_marginLeft="50dp"
-        android:layout_marginRight="50dp"
-        />
-
-
-</LinearLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri May 18 14:01:24 CST 2018
-debugName=262
+#Mon May 21 14:29:54 CST 2018
+debugName=268
 versionName=630
-debugCode=262
+debugCode=268
 versionCode=170

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -109,6 +109,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
 
     private void showDatas(String result) {
+        LogUtil.prinlnLongMsg("resultWage",result);
         haveData = true;
         wages_ll.setVisibility(View.VISIBLE);
         try {
@@ -116,7 +117,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             if (salaryObject != null){
                 JSONArray configsArray = salaryObject.getJSONArray("configs");
                 JSONObject dataObject = salaryObject.getJSONObject("data");
-                if (dataObject.size() == 0) {
+                if ( dataObject == null || dataObject.size() == 0 ||  ListUtils.isEmpty(configsArray)) {
                     showEnty();
                     return;
                 }
@@ -163,6 +164,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             }
        } catch (Exception e) {
             e.printStackTrace();
+            showEnty();
         }
 }