diff --git a/common/build.gradle b/common/build.gradle index 09d7dd30a..74f2b754f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -194,5 +194,6 @@ dependencies { //选择器 api 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.11' api 'com.github.gzu-liyujiang.AndroidPicker:WheelView:4.1.11' + api 'com.alibaba:fastjson:1.2.53' } diff --git a/common/libs/bdasr_3.0.8.2.jar b/common/libs/bdasr_3.0.8.2.jar deleted file mode 100644 index cc0dc5014..000000000 Binary files a/common/libs/bdasr_3.0.8.2.jar and /dev/null differ diff --git a/common/src/main/java/com/yunbao/common/HtmlConfig.java b/common/src/main/java/com/yunbao/common/HtmlConfig.java index 70e7c8011..cc331d026 100644 --- a/common/src/main/java/com/yunbao/common/HtmlConfig.java +++ b/common/src/main/java/com/yunbao/common/HtmlConfig.java @@ -8,7 +8,7 @@ public class HtmlConfig { //登录即代表同意服务和隐私条款 public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3"; - public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/portal/page/index/id/59"; + public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59"; //注册用户协议 public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2"; diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java index 88f66388d..439bc94da 100644 --- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java +++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java @@ -65,7 +65,7 @@ public class CommonHttpUtil { * @param poi 是否要查询POI */ public static void getAddressInfoByTxLocaitonSdk(final double lng, final double lat, final int poi, int pageIndex, String tag, final HttpCallback commonCallback) { - String txMapAppKey = CommonAppConfig.getInstance().getTxMapAppKey(); + /*String txMapAppKey = CommonAppConfig.getInstance().getTxMapAppKey(); String s = "/ws/geocoder/v1/?get_poi=" + poi + "&key=" + txMapAppKey + "&location=" + lat + "," + lng + "&poi_options=address_format=short;radius=1000;page_size=20;page_index=" + pageIndex + ";policy=5" + CommonAppConfig.getInstance().getTxMapAppSecret(); String sign = MD5Util.getMD5(s); @@ -101,7 +101,7 @@ public class CommonHttpUtil { commonCallback.onFinish(); } } - }); + });*/ } /** @@ -112,7 +112,7 @@ public class CommonHttpUtil { */ public static void searchAddressInfoByTxLocaitonSdk(final double lng, final double lat, String keyword, int pageIndex, final HttpCallback commonCallback) { - String txMapAppKey = CommonAppConfig.getInstance().getTxMapAppKey(); + /* String txMapAppKey = CommonAppConfig.getInstance().getTxMapAppKey(); String s = "/ws/place/v1/search?boundary=nearby(" + lat + "," + lng + ",1000)&key=" + txMapAppKey + "&keyword=" + keyword + "&orderby=_distance&page_index=" + pageIndex + "&page_size=20" + CommonAppConfig.getInstance().getTxMapAppSecret(); String sign = MD5Util.getMD5(s); @@ -146,7 +146,7 @@ public class CommonHttpUtil { commonCallback.onFinish(); } } - }); + });*/ } diff --git a/settings.gradle b/settings.gradle index 1305f2842..aec525cd0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include ':app', ':video', ':common', ':main', ':baidu', ':live', ':lib_country_code' +include ':app', ':video', ':common', ':main', ':live', ':lib_country_code' include ':FaceUnity' //include ':baidu' //include ':recognizer'//融云语音转文字模块