yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	config.gradle
This commit is contained in:
18142669586 2023-07-17 16:11:17 +08:00
commit 034f2dba5d
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/build.gradle
View File

@ -194,5 +194,6 @@ dependencies {
//选择器 //选择器
api 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.11' api 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.11'
api 'com.github.gzu-liyujiang.AndroidPicker:WheelView:4.1.11' api 'com.github.gzu-liyujiang.AndroidPicker:WheelView:4.1.11'
api 'com.alibaba:fastjson:1.2.53'
} }

BIN
common/libs/bdasr_3.0.8.2.jar
View File

Binary file not shown.

2
common/src/main/java/com/yunbao/common/HtmlConfig.java
View File

@ -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_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"; public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";

8
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@ -65,7 +65,7 @@ public class CommonHttpUtil {
* @param poi 是否要查询POI * @param poi 是否要查询POI
*/ */
public static void getAddressInfoByTxLocaitonSdk(final double lng, final double lat, final int poi, int pageIndex, String tag, final HttpCallback commonCallback) { 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 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(); + "&poi_options=address_format=short;radius=1000;page_size=20;page_index=" + pageIndex + ";policy=5" + CommonAppConfig.getInstance().getTxMapAppSecret();
String sign = MD5Util.getMD5(s); String sign = MD5Util.getMD5(s);
@ -101,7 +101,7 @@ public class CommonHttpUtil {
commonCallback.onFinish(); 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) { 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 + 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(); "&page_size=20" + CommonAppConfig.getInstance().getTxMapAppSecret();
String sign = MD5Util.getMD5(s); String sign = MD5Util.getMD5(s);
@ -146,7 +146,7 @@ public class CommonHttpUtil {
commonCallback.onFinish(); commonCallback.onFinish();
} }
} }
}); });*/
} }

2
settings.gradle
View File

@ -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 ':FaceUnity'
//include ':baidu' //include ':baidu'
//include ':recognizer'//融云语音转文字模块 //include ':recognizer'//融云语音转文字模块