Browse Source

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

Bitliker 8 years ago
parent
commit
48472756dc

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Apr 12 18:52:32 CST 2018
-debugName=299
+#Tue Apr 17 13:49:08 CST 2018
+debugName=304
 versionName=628
-debugCode=299
+debugCode=304
 versionCode=168

+ 2 - 2
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);

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

@@ -38,7 +38,7 @@ 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);

+ 1 - 0
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;

+ 6 - 6
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();