Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

zhujie

9 天以前 acb5be78c07b8499d0a38515b05a4982207c1c9a

 app/src/main/res/layout/activity_setting.xml

@@ -35,7 +35,7 @@
        </androidx.appcompat.widget.Toolbar>

        <LinearLayout
            android:id="@+id/about_company"
            android:id="@+id/notification_permission"
            android:layout_width="match_parent"
            android:layout_height="50dp"
            android:gravity="center"
@@ -48,6 +48,24 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:padding="5dp"
                android:text="开启通知权限"
                android:textColor="#000000" />
        </LinearLayout>

        <LinearLayout
            android:id="@+id/about_company"
            android:layout_width="match_parent"
            android:layout_height="50dp"
            android:gravity="center"
            android:orientation="vertical"
            android:background="#F9F9F9"
            android:layout_marginTop="1dp"
            >

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:padding="5dp"
                android:text="关于我们"
                android:textColor="#000000" />
        </LinearLayout>