version:1.8.2

date:2021-11-09 10:10:54
fix:
add:增加隐私政策和用户协议
This commit is contained in:
2021-11-09 10:11:09 +08:00
parent fe77634164
commit 8077892ed2
16 changed files with 512 additions and 7 deletions

View File

@@ -163,9 +163,31 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include layout="@layout/include_line_horizontal" />
<TextView
android:id="@+id/tv_pripolicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:autoLink="all"
android:text="@string/privacy_policy"
android:textColor="@color/activation_color"
android:textSize="16sp"
android:visibility="visible" />
<TextView
android:id="@+id/tv_useragreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:autoLink="all"
android:text="@string/user_agreement"
android:textColor="@color/activation_color"
android:textSize="16sp"
android:visibility="visible" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

View File

@@ -163,9 +163,33 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include layout="@layout/include_line_horizontal" />
<TextView
android:id="@+id/tv_pripolicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:autoLink="all"
android:text="@string/privacy_policy"
android:textColor="@color/activation_color"
android:textSize="16sp"
android:visibility="visible"
app:layout_constraintStart_toEndOf="@+id/tv_guide"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
<TextView
android:id="@+id/tv_useragreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:autoLink="all"
android:text="@string/user_agreement"
android:textColor="@color/activation_color"
android:textSize="16sp"
android:visibility="visible" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.PrivacyPolicyActivity">
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.UserAgreementActivity">
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -18,5 +18,6 @@
<color name="red">#d64743</color>
<color name="blue">#00a0e9</color>
<color name="adapter_selector_default">#f0f0f0</color>
<color name="activation_color">#4880ff</color>
</resources>

View File

@@ -5,4 +5,6 @@
<string name="search_edit">\t请输入应用名称或关键字</string>
<string name="no_bind">为了营造良好的学习环境应用中心默认开启“守护模式“由家长推送第三方应用下载。请家长在微信小程序搜索【教管壹云管控AI学习机】—选择应用设置下载。平板端会显示家长所选择的应用。</string>
<string name="no_app">该设备暂时无白名单应用以供安装,请使用家长绑定账号推荐相关应用至平板应用市场!</string>
<string name="privacy_policy"><u>隐私政策</u></string>
<string name="user_agreement"><u>用户协议</u></string>
</resources>

View File

@@ -18,6 +18,7 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@color/colorPrimary</item>
<item name="android:fitsSystemWindows">true</item>
<item name="android:navigationBarColor">?attr/colorPrimary</item>
</style>
<style name="activity_styles" parent="Theme.AppCompat.Light.DarkActionBar">