yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into yinyou_dating

Browse Source 
# Conflicts:
#	app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
#	app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
#	app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
#	app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
#	app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java
#	app/src/main/res/layout/include_mic_charm_layout.xml
#	app/src/main/res/layout/item_boss_micro.xml
#	app/src/main/res/values/colors.xml
#	core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
This commit is contained in:
huangjian
2021-03-01 15:09:51 +08:00
parent a14c70aee5 ff06564224
commit 6c1ea65436
168 changed files with 5178 additions and 3903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nim_uikit/src/com/netease/nim/uikit/common/util/log/LogUtil.java
View File

@@ -42,7 +42,7 @@ public class LogUtil extends NimLog {
public static void print(String msg) {
if (BasicConfig.INSTANCE.isDebuggable()) {
Log.e("mouse_debug", msg);
Log.d("mouse_debug", msg);
}
}