version:1.0.1
fix: update:基本跳转对接完成
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="300dp"
|
||||
android:layout_width="260dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/background_add"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
@@ -21,7 +21,7 @@
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="权限申请说明"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="20sp"
|
||||
android:textSize="12sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -45,7 +45,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="18sp"
|
||||
android:textSize="9sp"
|
||||
tools:text="内容文本" />
|
||||
</ScrollView>
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
android:id="@+id/linearLayout5"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintBottom_toBottomOf="parent">
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
android:gravity="center"
|
||||
android:text="拒绝"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="19sp"
|
||||
android:textSize="10sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_content" />
|
||||
@@ -78,7 +78,7 @@
|
||||
android:gravity="center"
|
||||
android:text="同意"
|
||||
android:textColor="@color/default_blue"
|
||||
android:textSize="19sp"
|
||||
android:textSize="10sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_content"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_content" />
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="300dp"
|
||||
android:layout_width="260dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/background_add"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
<ImageView
|
||||
android:layout_width="19dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:layout_height="19dp"
|
||||
android:background="@drawable/icon_x" />
|
||||
</LinearLayout>
|
||||
|
||||
55
app/src/main/res/layout/fg_content_book.xml
Normal file
55
app/src/main/res/layout/fg_content_book.xml
Normal file
@@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_book_icon"
|
||||
android:layout_width="61dp"
|
||||
android:layout_height="81dp"
|
||||
android:layout_marginLeft="12dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_book_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:layout_toRightOf="@+id/iv_book_icon"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="9dp" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_ksyd"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/tv_book_name"
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_toRightOf="@+id/iv_book_icon"
|
||||
android:background="@drawable/icon_ds_ksyd"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_data"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="71dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:background="@drawable/icon_img_default" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:text="暂无内容"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="9dp" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
66
app/src/main/res/layout/fg_content_book_list.xml
Normal file
66
app/src/main/res/layout/fg_content_book_list.xml
Normal file
@@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_book_icon"
|
||||
android:layout_width="61dp"
|
||||
android:layout_height="81dp"
|
||||
android:layout_marginLeft="9dp" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_book_icon1"
|
||||
android:layout_width="29dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_marginLeft="9dp"
|
||||
android:layout_toRightOf="@+id/iv_book_icon" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_book_icon2"
|
||||
android:layout_width="29dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_marginLeft="9dp"
|
||||
android:layout_toRightOf="@+id/iv_book_icon1" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_book_icon3"
|
||||
android:layout_width="29dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_below="@+id/iv_book_icon1"
|
||||
android:layout_marginLeft="9dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_toRightOf="@+id/iv_book_icon" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_book_icon4"
|
||||
android:layout_width="29dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_below="@+id/iv_book_icon1"
|
||||
android:layout_marginLeft="9dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_toRightOf="@+id/iv_book_icon1" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_data"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="71dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:background="@drawable/icon_img_default" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:text="暂无内容"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="9dp" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
@@ -515,6 +515,7 @@
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:onClick="@{click::openAppsDialog}"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="click"
|
||||
type="com.xwad.os.fragment.english.EnglishFragment.BtnClick" />
|
||||
</data>
|
||||
|
||||
|
||||
@@ -526,6 +529,7 @@
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:onClick="@{click::openAppsDialog}"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="click"
|
||||
type="com.xwad.os.fragment.math.MathFragment.BtnClick" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
@@ -452,6 +455,7 @@
|
||||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:onClick="@{click::openAppsDialog}"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -35,11 +35,9 @@
|
||||
<ImageView
|
||||
android:id="@+id/pgzy"
|
||||
android:layout_width="71dp"
|
||||
android:layout_height="78dp"
|
||||
android:layout_below="@+id/pgkst"
|
||||
android:layout_marginLeft="88dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_toRightOf="@+id/fdzy"
|
||||
android:layout_height="77dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginTop="142dp"
|
||||
android:background="@drawable/icon_ai_pgzy"
|
||||
android:onClick="onClick"
|
||||
android:tag="@string/tag_args_new_aijtjs_zypg"
|
||||
|
||||
30
app/src/main/res/layout/item_chart.xml
Normal file
30
app/src/main/res/layout/item_chart.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/ll"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="bottom"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.xwad.os.view.jxw.view.VerticalProgressBar
|
||||
android:id="@+id/battery_pb"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:background="@color/white" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_data"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="1dp"
|
||||
android:text="05.10"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="8dp" />
|
||||
</LinearLayout>
|
||||
23
app/src/main/res/layout/item_yw_app.xml
Normal file
23
app/src/main/res/layout/item_yw_app.xml
Normal file
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/rl_root"
|
||||
android:layout_width="53dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_app_icon"
|
||||
android:layout_width="28dp"
|
||||
android:layout_height="28dp"
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_app_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/iv_app_icon"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="5dp"
|
||||
android:gravity="center"
|
||||
android:textColor="#ffffff"
|
||||
android:textSize="9dp" />
|
||||
</RelativeLayout>
|
||||
Reference in New Issue
Block a user