Browse Source

💄 第一次进入app时的隐私政策修改,app logo细节调整

master
LiuSiXiang-007 1 year ago
parent
commit
3da1e54453
  1. 4
      app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java
  2. 4
      app/src/main/java/com/kanglai/push/ui/activity/SplashActivity.java
  3. 7
      app/src/main/res/values/strings.xml
  4. BIN
      library/core/src/main/res/drawable-hdpi/icon_app.png
  5. BIN
      library/core/src/main/res/drawable-mdpi/icon_app.png
  6. BIN
      library/core/src/main/res/drawable-xhdpi/icon_app.png
  7. BIN
      library/core/src/main/res/drawable-xxhdpi/icon_app.png
  8. BIN
      library/core/src/main/res/drawable-xxxhdpi/icon_app.png
  9. 8
      library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java
  10. 5
      library/umeng/src/main/java/com/dolphin/umeng/util/MultimediaUtil.java

4
app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java

@ -42,8 +42,8 @@ public class DocumentActivity extends BaseActivity<ActivityDocumentBinding, Docu @@ -42,8 +42,8 @@ public class DocumentActivity extends BaseActivity<ActivityDocumentBinding, Docu
String type = getIntent().getStringExtra("DOCUMENT_TYPE");
if (!StringUtils.isTrimEmpty(type)){
mViewModel.judgeTit(type);
if ("0".equals(type)) mWebView.loadUrl("https://www.kanglailab.com/about.html");
else mWebView.loadUrl("https://wx.mail.qq.com/list/readtemplate?name=app_intro.html#/agreement/appPolicy");
if ("0".equals(type)) mWebView.loadUrl("https://www.kanglailab.com/about.html"); // 用户协议
else mWebView.loadUrl("https://wx.mail.qq.com/list/readtemplate?name=app_intro.html#/agreement/appPolicy"); // 隐私政策
mWebView.requestFocus(); // 获取焦点
mWebView.getSettings().setJavaScriptEnabled(true); // 加载js清单

4
app/src/main/java/com/kanglai/push/ui/activity/SplashActivity.java

@ -44,8 +44,8 @@ public class SplashActivity extends UmengSplashMessageActivity { @@ -44,8 +44,8 @@ public class SplashActivity extends UmengSplashMessageActivity {
/** 软件隐私协议 */
private void softwarePrivacyAgreement() {
SpannableStringBuilder spannable = new SpannableStringBuilder(getResources().getString(R.string.privacy_agreement));
spannable.setSpan(new ForegroundColorSpan(Color.BLUE), 65, 69, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
spannable.setSpan(new ForegroundColorSpan(Color.RED), 133, 137, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
spannable.setSpan(new ForegroundColorSpan(Color.RED), 31, 39, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
spannable.setSpan(new ForegroundColorSpan(Color.RED), 40, 48, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
AlertDialog builder =new AlertDialog.Builder(this, R.style.alert_dialog_white_background)
.setTitle("隐私政策")
.setMessage(spannable)

7
app/src/main/res/values/strings.xml

@ -1,9 +1,14 @@ @@ -1,9 +1,14 @@
<resources>
<string name="privacy_agreement">
<!--
1、为向您提供交易相关基本功能,我们会收集·使用必要的信息。\n
2、您的隐私政策需要透出友盟+的隐私合规协议,具体可看文档中心的【合规指南】。\n
2、基于您的明示授权,我们可能会获取您的位置(为您提供附近的商品·店铺及优惠资讯等)等信息。\n
3、我们会采取业界先进的安全措施保护您的信息安全。\n
-->
<string name="privacy_agreement">
感谢您选择有信!\n
为保障您的权利,在使用我们的服务前,请通过《有信用户协议》和《有信隐私政策》了解我们对于个人信息的使用情况与您所享有的相关权利。\n
</string>
<!-- 勿扰模式权限申请 -->
<string name="privacy_DND">

BIN
library/core/src/main/res/drawable-hdpi/icon_app.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 143 KiB

BIN
library/core/src/main/res/drawable-mdpi/icon_app.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 143 KiB

BIN
library/core/src/main/res/drawable-xhdpi/icon_app.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 143 KiB

BIN
library/core/src/main/res/drawable-xxhdpi/icon_app.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 143 KiB

BIN
library/core/src/main/res/drawable-xxxhdpi/icon_app.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 143 KiB

8
library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java

@ -189,12 +189,12 @@ public final class UmengClient { @@ -189,12 +189,12 @@ public final class UmengClient {
}, 1000, TimeUnit.MILLISECONDS);
}
if (pushChatMessage.getPlayToText() && pushChatMessage.getPlaySound()) {
MultimediaUtil.playSoundAndTtsSpeak(pushChatMessage.getOnlineRingtone(), pushChatMessage.getText());
if (pushChatMessage.getPlayToText() && pushChatMessage.getPlaySound()) { // 仅在三重声音播放中选择一种
MultimediaUtil.playSoundAndTtsSpeak(pushChatMessage.getOnlineRingtone(), pushChatMessage.getText()); // 提示音
} else if (pushChatMessage.getPlayToText()) {
MultimediaUtil.ttsSpeak(pushChatMessage.getText());
MultimediaUtil.ttsSpeak(pushChatMessage.getText()); // 百度语音转文字
} else if (pushChatMessage.getPlaySound()) {
MultimediaUtil.playSound(pushChatMessage.getOnlineRingtone());
MultimediaUtil.playSound(pushChatMessage.getOnlineRingtone()); // 播放在线铃声
}
RxBus.getInstance().postSticky(pushChatMessage);
}

5
library/umeng/src/main/java/com/dolphin/umeng/util/MultimediaUtil.java

@ -12,6 +12,11 @@ import com.dolphin.umeng.R; @@ -12,6 +12,11 @@ import com.dolphin.umeng.R;
import lombok.experimental.UtilityClass;
/**
* 媒体声音播放工具类
* @Author: liusixiang007
* @since: 2024/1/27
*/
@UtilityClass
public class MultimediaUtil {

Loading…
Cancel
Save