1.添加app升级弹窗

.idea/misc.xml

@@ -87,6 +87,7 @@
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_help.xml" value="0.16455696202531644" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_personal_center.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_setting.xml" value="0.136" />
+        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_version_record.xml" value="0.21064814814814814" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/item_comprehensive_evaluation.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/item_diagnosis.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/layout_help_item.xml" value="0.1" />

personalcenter/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
         <activity
-            android:name=".activity.PersonalCenterActivity"
+            android:name=".personalcenter.PersonalCenterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />

personalcenter/src/main/java/com/yingyang/personalcenter/activity/PersonalCenterActivity.kt → personalcenter/src/main/java/com/yingyang/personalcenter/personalcenter/PersonalCenterActivity.kt

@@ -1,4 +1,4 @@
-package com.yingyang.personalcenter.activity
+package com.yingyang.personalcenter.personalcenter
 
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.google.android.flexbox.FlexDirection

personalcenter/src/main/java/com/yingyang/personalcenter/activity/PersonalCenterViewModel.kt → personalcenter/src/main/java/com/yingyang/personalcenter/personalcenter/PersonalCenterViewModel.kt

@@ -1,4 +1,4 @@
-package com.yingyang.personalcenter.activity
+package com.yingyang.personalcenter.personalcenter
 
 import com.yingyang.personalcenter.entity.UserInfoBean
 import com.yingyang.personalcenter.net.PERSONALCENTER_API

personalcenter/src/main/java/com/yingyang/personalcenter/version/VersionRecordActivity.kt

@@ -0,0 +1,20 @@
+package com.yingyang.personalcenter.version
+
+import com.yingyang.personalcenter.databinding.ActivityVersionRecordBinding
+import com.yingyangfly.baselib.base.BaseActivity
+
+class VersionRecordActivity : BaseActivity<ActivityVersionRecordBinding>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+}

personalcenter/src/main/manifest/AndroidManifest.xml

@@ -3,6 +3,9 @@
     package="com.yingyang.personalcenter">
 
     <application>
+        <activity
+            android:name=".VersionRecordActivity"
+            android:exported="false" />
         <activity
             android:name=".setting.SettingActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -19,7 +22,7 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
         <activity
-            android:name=".activity.PersonalCenterActivity"
+            android:name=".personalcenter.PersonalCenterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />

personalcenter/src/main/res/layout/activity_version_record.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/icon_uniform_background">
+
+        <LinearLayout
+            android:id="@+id/backLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_35px"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_48px"
+                android:background="@mipmap/icon_back" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:text="@string/back_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/divider_32px"
+            android:text="@string/version_record"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_38px"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/divider_60px"
+            android:layout_marginTop="@dimen/divider_57px"
+            android:layout_marginEnd="@dimen/divider_60px"
+            android:layout_marginBottom="@dimen/divider_122px"
+            android:background="@drawable/bg_setting_center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

personalcenter/src/main/res/values/strings.xml

@@ -14,4 +14,5 @@
     <string name="brightness" tools:ignore="ResourceName">显示与亮度</string>
     <string name="sound" tools:ignore="ResourceName">声音</string>
     <string name="help" tools:ignore="ResourceName">使用帮助</string>
+    <string name="version_record" tools:ignore="ResourceName">版本记录</string>
 </resources>

webview/src/main/java/com/yingyangfly/webview/BridgeWebActivity.kt

@@ -18,6 +18,7 @@ import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.ViewTool
+import com.yingyangfly.baselib.voice.PlayVoice
 import com.yingyangfly.webview.databinding.ActivityBridgeWebBinding
 
 /**
@@ -29,6 +30,7 @@ class BridgeWebActivity : AppCompatActivity() {
     private lateinit var binding: ActivityBridgeWebBinding
     private lateinit var webSettings: WebSettings
     private var url: String = ""
+    private var playVoice: PlayVoice? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,6 +38,8 @@ class BridgeWebActivity : AppCompatActivity() {
             hideBar(BarHide.FLAG_HIDE_BAR)
             navigationBarColor(com.yingyangfly.baselib.R.color.transparent)
         }
+        playVoice = PlayVoice()
+        playVoice?.setContext(this)
         url = intent.getStringExtra("url") ?: ""
         binding = DataBindingUtil.setContentView(this, R.layout.activity_bridge_web)
         ViewTool.inflateLayoutPixels(this, binding.root, 1194, 834)
@@ -101,7 +105,7 @@ class BridgeWebActivity : AppCompatActivity() {
                 val msg = it.split("voice:")
                 if (msg.isNullOrEmpty().not()) {
                     if (msg[1].isNullOrEmpty().not()) {
-//                        playVoice?.speak(msg[1])
+                        playVoice?.speak(msg[1])
                     }
                 }
             }
@@ -111,6 +115,9 @@ class BridgeWebActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         destoryWebView()
+        if (playVoice != null) {
+            playVoice?.stop()
+        }
         super.onDestroy()
     }