Browse Source

提交类型 bug修改
提交内容 地图查询时候出现没有当前定位的情况下回闪退问题

Bitliker 8 years ago
parent
commit
1136d30e05

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Apr 17 13:49:08 CST 2018
-debugName=304
+#Fri Apr 20 10:29:19 CST 2018
+debugName=308
 versionName=628
-debugCode=304
+debugCode=308
 versionCode=168

+ 0 - 1
app_modular/apputils/src/main/java/com/modular/apputils/utils/playsdk/WxPlay.java

@@ -42,7 +42,6 @@ public class WxPlay {
         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");

+ 2 - 5
app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -66,7 +66,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 +122,8 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
                         startActivity(intent);
                     } else {
                         SystemUtil.phoneAction(BusinessTravelActivity.this, remain.toString());
-
                     }
                 }
-
             }
         });
         mRefreshLayout.setEnabledPullUp(false);
@@ -199,7 +196,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 +207,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);
         }

+ 1 - 1
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" />