version:6.1

fix:
update:增加主页没有激活不显示天气
This commit is contained in:
2022-11-04 18:16:30 +08:00
parent 1a632e1e6e
commit aa3ceda9f1
22 changed files with 989 additions and 168 deletions

View File

@@ -25,7 +25,8 @@
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:layout_weight="3"
android:background="@drawable/custom_bg_weather">
android:background="@drawable/custom_bg_weather"
android:visibility="visible">
<ImageView
android:id="@+id/iv_pic"
@@ -72,8 +73,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="位置"
android:textSize="@dimen/sp_16"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/tv_temp"
app:layout_constraintTop_toBottomOf="@+id/tv_temp" />
@@ -92,6 +93,56 @@
app:layout_constraintTop_toTopOf="@+id/tv_location" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_activation"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="3"
android:visibility="gone"
android:background="@drawable/custom_bg_weather">
<TextView
android:id="@+id/tv_activation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:text="激活关怀系统"
android:textColor="@color/white"
android:textSize="@dimen/sp_17"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView8"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:maxLines="1"
android:text="当前系统未激活,立即激活系统"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginEnd="@dimen/dp_32"
android:src="@drawable/home_activation_icon"
app:layout_constraintEnd_toEndOf="@+id/textView8"
app:layout_constraintTop_toBottomOf="@+id/textView8" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_clean"
android:layout_width="0dp"
@@ -117,27 +168,27 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <ImageView-->
<!-- android:id="@+id/iv_head"-->
<!-- android:layout_width="@dimen/dp_68"-->
<!-- android:layout_height="@dimen/dp_68"-->
<!-- android:adjustViewBounds="true"-->
<!-- android:scaleType="fitCenter"-->
<!-- android:src="@drawable/home_clean_icon"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_head"-->
<!-- android:layout_width="@dimen/dp_68"-->
<!-- android:layout_height="@dimen/dp_68"-->
<!-- android:adjustViewBounds="true"-->
<!-- android:scaleType="fitCenter"-->
<!-- android:src="@drawable/home_clean_icon"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<com.king.view.circleprogressview.CircleProgressView
android:id="@+id/cpv"
android:layout_width="144dp"
android:layout_height="144dp"
app:cpvDuration="1000"
app:cpvLabelTextSize="26sp"
app:cpvProgressColor="#27602f"
app:cpvLabelTextColor="@color/white"
app:cpvLabelTextSize="26sp"
app:cpvNormalColor="#c1d4c4"
app:cpvProgressColor="#27602f"
app:cpvShowTick="false"
app:cpvStrokeWidth="@dimen/dp_8"
app:layout_constraintBottom_toBottomOf="parent"