tt/FLYSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.8.2

Browse Source 
date:2021-11-09 10:09:21
fix:
add:增加隐私政策和用户协议
This commit is contained in:
Fanhuitong
2021-11-09 10:10:06 +08:00
parent 32e1d3726f
commit d69ed39e22
17 changed files with 1858 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/bt_return.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

48
app/src/main/res/layout-land/activity_main.xml
View File

@@ -24,6 +24,19 @@
android:text="返回"
android:textColor="@color/black"
android:textSize="18sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_exit"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/bt_return"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -61,10 +74,37 @@
android:text="@string/hello"
android:textColor="@color/activation_color"
android:textSize="16sp"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintStart_toStartOf="@+id/textView3"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
<TextView
android:id="@+id/tv_pripolicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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"
app:layout_constraintBottom_toBottomOf="@+id/tv_pripolicy"
app:layout_constraintStart_toEndOf="@+id/tv_pripolicy"
app:layout_constraintTop_toTopOf="@+id/tv_pripolicy" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -72,7 +112,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_guide">
app:layout_constraintTop_toBottomOf="@+id/tv_pripolicy">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
@@ -245,11 +285,11 @@
<TextView
android:layout_width="2px"
android:background="@color/gray"
android:layout_height="match_parent"
android:layout_marginTop="50dp"
android:layout_marginBottom="80dp"
android:layout_height="match_parent" />
android:background="@color/gray" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"

44
app/src/main/res/layout-port/activity_main.xml
View File

@@ -26,6 +26,19 @@
android:text="返回"
android:textColor="@color/black"
android:textSize="18sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_exit"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/bt_return"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -63,17 +76,44 @@
android:text="@string/hello"
android:textColor="@color/activation_color"
android:textSize="16sp"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintStart_toStartOf="@+id/textView3"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
<TextView
android:id="@+id/tv_pripolicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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"
app:layout_constraintBottom_toBottomOf="@+id/tv_pripolicy"
app:layout_constraintStart_toEndOf="@+id/tv_pripolicy"
app:layout_constraintTop_toTopOf="@+id/tv_pripolicy" />
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/tv_guide">
app:layout_constraintTop_toBottomOf="@+id/tv_pripolicy">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

13
app/src/main/res/layout/activity_privacypolicy.xml Normal file
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>

13
app/src/main/res/layout/activity_useragreement.xml Normal file
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>

2
app/src/main/res/values/strings.xml
View File

@@ -15,4 +15,6 @@
名单设置、系统功能及影音娱乐管控设置、学习机使用时间段管控等等；或您亦可选择暂不绑定家长管控账号，直接激活AI学习系统进行学习（请务必仔细核对并选择正确
学龄段，激活后无法更改或退费）。请注意：若未绑定家长管控账号，学习机应用市场将无法启用应用下载，敬请注意！</string>
<string name="hint">请务必仔细核对并选择正确学龄段，激活后无法更改或退费</string>
<string name="privacy_policy"><u>隐私政策</u></string>
<string name="user_agreement"><u>用户协议</u></string>
</resources>

3
app/src/main/res/values/styles.xml
View File

@@ -16,6 +16,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="CustomDialog" parent="Theme.AppCompat.Dialog.Alert">
@@ -46,7 +47,7 @@
</style>
<style name="activity_styles" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- <item name="android:windowFullscreen">true</item>-->
<!-- <item name="android:windowFullscreen">true</item>-->
<!--设置dialog的背景-->
<item name="android:windowBackground">@android:color/transparent</item>
<!--设置Dialog的windowFrame框为无-->