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

Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

Browse Source 
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
This commit is contained in:
hch
2023-10-19 18:28:24 +08:00
parent bcfd1c22e6 38471cedc8
commit 0287995bf9
27 changed files with 933 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/com/yunbao/common/glide/ImgLoader.java
View File

@@ -321,6 +321,23 @@ public class ImgLoader {
}
builder.into(imageView);
}
public static void displayBlur(Context context, String url, ImageView imageView,int radius) {
displayBlur(context, url, imageView,-1,-1,radius);
}
public static void displayBlur(Context context, String url, ImageView imageView, int width, int height,int radius) {
if (!contextIsExist(context)) {
return;
}
RequestBuilder<Drawable> builder = Glide.with(context)
.load(url)
.thumbnail(thumbnail)
.apply(RequestOptions.bitmapTransform(new BlurTransformation(radius)));
if (width != -1 && height != -1) {
builder = builder.override(width, height);
}
builder.into(imageView);
}
/**
* 显示模糊的毛玻璃图片

2
common/src/main/res/values-en-rUS/string.xml
View File

@@ -787,8 +787,6 @@
<string name="only_open_anchor">For the time being, it is only open to the anchor</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

2
common/src/main/res/values-zh-rHK/strings.xml
View File

@@ -828,8 +828,6 @@
<string name="only_open_anchor">暫時只對主播開放</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

2
common/src/main/res/values-zh-rTW/strings.xml
View File

@@ -828,8 +828,6 @@
<string name="only_open_anchor">暫時只對主播開放</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

2
common/src/main/res/values-zh/strings.xml
View File

@@ -828,8 +828,6 @@
<string name="only_open_anchor">暫時只對主播開放</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

4
common/src/main/res/values/strings.xml
View File

@@ -787,8 +787,8 @@
<string name="only_open_anchor">For the time being, it is only open to the anchor</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="facebook_app_id">391137926073929</string>
<string name="facebook_client_token">64dbc61681a4492544be268eb1084c3e</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>