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

version:2.4 beta

Browse Source 
fix:
add:优化接口请求，修复一下报错，删除极光推送和高德地图sdk
This commit is contained in:
fanhuitong
2022-06-29 19:59:19 +08:00
parent ace28e65b5
commit 657d45ab33
67 changed files with 13003 additions and 2963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,19 +11,19 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_height="@dimen/dp_28"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_exit"
android:layout_width="64dp"
android:layout_width="@dimen/dp_44"
android:layout_height="match_parent"
android:gravity="center"
android:text="返回"
android:textColor="@color/black"
android:textSize="18sp"
android:textSize="@dimen/sp_15"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -31,9 +31,9 @@
<ImageView
android:id="@+id/iv_exit"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/bt_return"
@@ -48,7 +48,7 @@
android:gravity="center_horizontal"
android:text="我的设备"
android:textColor="#4b4b4b"
android:textSize="24sp"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -59,9 +59,10 @@
android:id="@+id/tv_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginEnd="@dimen/dp_8"
android:text="version"
android:textColor="@color/black"
android:textSize="@dimen/sp_8"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -76,9 +77,9 @@
<ImageView
android:id="@+id/qr_code"
android:layout_width="160dp"
android:layout_height="160dp"
android:layout_marginTop="64dp"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_44"
android:adjustViewBounds="true"
android:background="@drawable/qrcode_shape"
android:scaleType="fitCenter"
@@ -92,7 +93,7 @@
android:id="@+id/tv_sn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/dp_4"
android:text="sn"
android:textColor="@color/black"
android:textStyle="bold"
@@ -104,7 +105,7 @@
android:id="@+id/tv_bind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/dp_4"
android:text="@string/scan_tips"
android:textColor="@color/black"
android:textStyle="bold"
@@ -117,9 +118,9 @@
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="56dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_16"
android:adjustViewBounds="true"
android:src="@drawable/bind_applet"
app:layout_constraintTop_toBottomOf="@+id/tv_bind"
@@ -127,9 +128,9 @@
<ImageView
android:id="@+id/iv_appqrcode"
android:layout_width="406dp"
android:layout_height="150dp"
android:layout_marginBottom="64dp"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_100"
android:layout_marginBottom="@dimen/dp_44"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/applet_qrcode"
@@ -143,10 +144,10 @@
android:id="@+id/tv_customversion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="4dp"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_4"
android:textColor="@color/lightgrey"
android:textSize="16sp"
android:textSize="@dimen/sp_9"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout-land/custom_dialog.xml
View File

@@ -7,11 +7,11 @@
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="300dp"
android:layout_width="@dimen/dp_240"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/bg_dialog"
android:minWidth="300dp"
android:minWidth="@dimen/dp_240"
android:orientation="vertical"
android:paddingTop="8dp"
app:layout_constraintBottom_toBottomOf="parent"