Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Apr 20 10:48:22 CST 2018
-debugName=142
+#Tue Apr 24 09:41:13 CST 2018
+debugName=143
 versionName=613
-debugCode=142
+debugCode=143
 versionCode=152

app_core/common/src/main/java/com/core/model/Approval.java

@@ -238,37 +238,65 @@ public class Approval {
     }
 
     public void data2Values() {
-        if (dfType.equals("D")) {
-            if (values.endsWith("00:00:00")) {
-                long time = TimeUtils.f_str_2_long(values);
-                if (time > 0) {
-                    values = TimeUtils.s_long_2_str(time);
+        switch (dfType) {
+            case "D":
+                data2DType();
+                break;
+            case "B":
+                if (values.equals("1")) {
+                    values = VALUES_YES;
+                } else {
+                    values = VALUES_NO;
                 }
-            }
-            if (!StringUtil.isEmpty(oldValues) && oldValues.endsWith("00:00:00")) {
-                long time = TimeUtils.f_str_2_long(oldValues);
-                if (time > 0) {
-                    oldValues = TimeUtils.s_long_2_str(time);
+                setOldSelectValues();
+                break;
+            case "YN":
+                if (values.equals("-1")) {
+                    values = VALUES_YES;
+                } else if (values.equals("1") && type == DETAIL && isNeerInput()) {
+                    values = VALUES_UNKNOWN;
+                } else {
+                    values = VALUES_NO;
                 }
+                setOldSelectValues();
+                break;
+
+            case "C":
+                if (values.equals("-1")) {
+                    values = VALUES_YES;
+                } else if (values.equals("1") && type == DETAIL && isNeerInput()) {
+                    values = VALUES_UNKNOWN;
+                } else if (values.equals("0")) {
+                    values = VALUES_NO;
+                }
+                setOldSelectValues();
+                break;
+
+
+        }
+    }
+
+    private void setOldSelectValues() {
+        if (!StringUtil.isEmpty(oldValues)) {
+            if (oldValues.equals("0")) {
+                oldValues = VALUES_NO;
+            } else if (oldValues.equals("-1") || oldValues.equals("1")) {
+                oldValues = VALUES_YES;
             }
-        } else if ("C".equals(dfType) || "YN".equals(dfType)) {
-            if (values.equals("-1")) {
-                values = VALUES_YES;
-            } else if ("YN".equals(dfType) &&values.equals("1")&& type == DETAIL && isNeerInput()) {
-                values = VALUES_UNKNOWN;
-            } else {
-                values = VALUES_NO;
-            }
-            if (!StringUtil.isEmpty(oldValues)) {
-                if (oldValues.equals("-1")) oldValues = VALUES_YES;
-                else if (oldValues.equals("0")) oldValues = VALUES_NO;
+        }
+    }
+
+    private void data2DType() {
+        if (values.endsWith("00:00:00")) {
+            long time = TimeUtils.f_str_2_long(values);
+            if (time > 0) {
+                values = TimeUtils.s_long_2_str(time);
             }
-        } else if ("B".equals(dfType)) {
-            if (values.equals("1")) values = VALUES_YES;
-            else values = VALUES_NO;
-            if (!StringUtil.isEmpty(oldValues)) {
-                if (oldValues.equals("1")) oldValues = VALUES_YES;
-                else oldValues = VALUES_NO;
+        }
+        if (!StringUtil.isEmpty(oldValues) && oldValues.endsWith("00:00:00")) {
+            long time = TimeUtils.f_str_2_long(oldValues);
+            if (time > 0) {
+                oldValues = TimeUtils.s_long_2_str(time);
             }
         }
     }

app_modular/apputils/src/main/java/com/modular/apputils/utils/playsdk/AliPlay.java

@@ -82,7 +82,7 @@ public class AliPlay extends Handler {
             @Override
             public void run() {
                 try {
-                    payThread(ct,orderInfo,onPlayListener);
+                    payThread(ct, orderInfo, onPlayListener);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -90,7 +90,7 @@ public class AliPlay extends Handler {
         });
     }
 
-    private void payThread(Activity ct,  String orderInfo,  OnPlayListener onPlayListener) throws Exception {
+    private void payThread(Activity ct, String orderInfo, OnPlayListener onPlayListener) throws Exception {
         PayTask alipay = new PayTask(ct);
         LogUtil.i("orderInfo=" + orderInfo);
         Map<String, String> result = alipay.payV2(orderInfo, true);

app_modular/apputils/src/main/java/com/modular/apputils/utils/playsdk/WxPlay.java

@@ -38,11 +38,10 @@ public class WxPlay {
 
     public void wxPay(Context context, String orderInfo, OnPlayListener onPlayListener) {
         wxApi = WXAPIFactory.createWXAPI(context, Constants.WXPAY_APPID);
-//        orderInfo = orderInfo.replaceAll("\\\\", "");
+//      orderInfo = orderInfo.replaceAll("\\\\", "");
         LogUtil.d("wxpayorderinfo", orderInfo);
         if (JSONUtil.validate(orderInfo)) {
             JSONObject orderObject = JSON.parseObject(orderInfo);
-
             PayReq request = new PayReq();
             request.appId = Constants.WXPAY_APPID;
             request.partnerId = JSONUtil.getText(orderObject, "partnerid");

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -2,6 +2,7 @@ package com.uas.appworks.OA.platform.activity;
 
 import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -57,7 +58,7 @@ import java.util.Map;
 
 public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHttpListener {
     private BaseRefreshLayout mRefreshLayout;
-    private EmptyRecyclerView mRecyclerView;
+    private RecyclerView mRecyclerView;
     private RelativeLayout remainRl;
     private TextView remainTag;
     private TextView remainTv;
@@ -66,7 +67,6 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
     private String cusCode;
     private String appSceret;
     private String appkey;
-    private MaterialDialog mDialog;
 
     @Override
     protected int getLayoutId() {
@@ -123,10 +123,8 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
                         startActivity(intent);
                     } else {
                         SystemUtil.phoneAction(BusinessTravelActivity.this, remain.toString());
-
                     }
                 }
-
             }
         });
         mRefreshLayout.setEnabledPullUp(false);
@@ -199,7 +197,7 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
 
 
     private void handlerData(String message) throws Exception {
-
+        LogUtil.i("message=" + message);
         JSONObject object = JSON.parseObject(message);
         int isLead = JSONUtil.getInt(object, "isLead");
         cusCode = JSONUtil.getText(object, "travelCard");
@@ -210,7 +208,7 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         JSONArray listdata = JSONUtil.getJSONArray(object, "listdata");
         List<BusinessTravel> models = new ArrayList<>();
         if (this.isLead) {
-            BusinessTravel model=new BusinessTravel();
+            BusinessTravel model = new BusinessTravel();
             model.setType(BusinessTravel.LEADER);
             models.add(model);
         }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -80,6 +80,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 
     @Override
     public void onAttach(Context context) {
+
         super.onAttach(context);
         if (context instanceof BaseActivity) {
             baseActivity = (BaseActivity) context;

app_modular/appworks/src/main/java/com/uas/appworks/utils/TravelUtils.java

@@ -101,11 +101,11 @@ public class TravelUtils {
         LogUtil.i("p=" + p);
         if (NetUtils.isNetWorkConnected(ct)) {
             String baseUrl = null;
-//            if (BaseConfig.isDebug()) {
-//                appkey = "y8gd87dsdkencgzk394k7s5c78io35c";
-//                appSceret = "e212e142a5c9e0590eefb7d9f1bc91d7";
-//                baseUrl = "http://124.254.45.234:8082/oa/caslogin/";
-//            } else {
+            if (BaseConfig.isDebug()) {
+                appkey = "y8gd87dsdkencgzk394k7s5c78io35c";
+                appSceret = "e212e142a5c9e0590eefb7d9f1bc91d7";
+                baseUrl = "http://124.254.45.234:8082/oa/caslogin/";
+            } else {
                 baseUrl = "http://h5.auvgo.com/oa/caslogin/";
                 if (TextUtils.isEmpty(appkey)) {
                     appkey = "fjdsfnvg6523fsgjkff879fidsf";
@@ -113,7 +113,7 @@ public class TravelUtils {
                 if (TextUtils.isEmpty(appSceret)) {
                     appSceret = "9891ca5330271eba81ec1332e740c210";
                 }
-//            }
+            }
             String username = CommonUtil.getEmcode();
             String data = appkey + username.toUpperCase() + appSceret;
             String key = Md5Util.toMD5(appSceret).toUpperCase();

app_modular/appworks/src/main/res/layout/activity_business_travel.xml

@@ -51,7 +51,7 @@
         android:visibility="gone"
         app:enablePullUp="true">
 
-        <com.modular.apputils.widget.EmptyRecyclerView
+        <android.support.v7.widget.RecyclerView
             android:id="@+id/mRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />