Showing
8 changed files
with
55 additions
and
29 deletions
... | ... | @@ -10,9 +10,9 @@ |
10 | 10 | { |
11 | 11 | "type": "SINGLE", |
12 | 12 | "filters": [], |
13 | - "versionCode": 205, | |
14 | - "versionName": "2.0.5", | |
15 | - "outputFile": "StudyMachine_v2.0.5_release_0913.apk" | |
13 | + "versionCode": 207, | |
14 | + "versionName": "2.0.7", | |
15 | + "outputFile": "StudyMachine_v2.0.7_release_0913.apk" | |
16 | 16 | } |
17 | 17 | ] |
18 | 18 | } |
\ No newline at end of file | ... | ... |
... | ... | @@ -16,6 +16,7 @@ import android.view.View; |
16 | 16 | import android.view.WindowManager; |
17 | 17 | import android.widget.Button; |
18 | 18 | import android.widget.ImageView; |
19 | +import android.widget.LinearLayout; | |
19 | 20 | |
20 | 21 | import androidx.annotation.NonNull; |
21 | 22 | import androidx.annotation.Nullable; |
... | ... | @@ -70,8 +71,8 @@ public abstract class AppActivity extends BaseActivity |
70 | 71 | * 加载对话框 |
71 | 72 | */ |
72 | 73 | private BaseDialog mDialog; |
73 | - public Button mControlBack; | |
74 | - public Button mControlChange; | |
74 | + public LinearLayout mControlBack; | |
75 | + public LinearLayout mControlChange; | |
75 | 76 | public Button mControlMode; |
76 | 77 | public ImageView mControlLine; |
77 | 78 | /** | ... | ... |
1.56 KB
1.39 MB
1.12 KB
1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | 2 | <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" |
3 | 3 | xmlns:tools="http://schemas.android.com/tools" |
4 | - android:layout_width="match_parent" | |
5 | - android:layout_height="match_parent"> | |
4 | + android:layout_width="fill_parent" | |
5 | + android:background="@drawable/consol_bg" | |
6 | + android:layout_height="fill_parent"> | |
6 | 7 | <RelativeLayout |
7 | 8 | android:id="@+id/controller_frame" |
8 | 9 | android:layout_width="match_parent" |
9 | 10 | android:layout_height="match_parent" |
10 | - android:background="@color/black" | |
11 | 11 | > |
12 | - <Button | |
13 | - android:id="@+id/control_back" | |
12 | + | |
13 | + <LinearLayout | |
14 | 14 | android:layout_width="wrap_content" |
15 | - android:layout_height="wrap_content" | |
15 | + android:orientation="horizontal" | |
16 | 16 | android:layout_alignParentLeft="true" |
17 | - android:background="@color/white" | |
18 | - android:text="后退" | |
19 | - android:textSize="@dimen/sp_16" | |
17 | + android:id="@+id/control_back" | |
20 | 18 | android:visibility="gone" |
21 | - android:layout_marginLeft="@dimen/dp_15" | |
22 | - android:textColor="@color/black" | |
23 | - /> | |
24 | - | |
25 | - <Button | |
19 | + android:layout_marginLeft="@dimen/dp_30" | |
20 | + android:layout_height="@dimen/dp_50"> | |
21 | + <ImageView | |
22 | + android:layout_width="@dimen/dp_30" | |
23 | + android:layout_height="@dimen/dp_20" | |
24 | + android:layout_gravity="center" | |
25 | + android:background="@drawable/consol_back" | |
26 | + /> | |
27 | + <TextView | |
28 | + android:layout_width="wrap_content" | |
29 | + android:layout_height="wrap_content" | |
30 | + android:layout_gravity="center" | |
31 | + android:textSize="@dimen/sp_14" | |
32 | + android:layout_marginLeft="@dimen/dp_5" | |
33 | + android:textColor="@color/white" | |
34 | + android:text="后退" | |
35 | + /> | |
36 | + </LinearLayout> | |
37 | + <LinearLayout | |
26 | 38 | android:id="@+id/control_change" |
27 | 39 | android:layout_width="wrap_content" |
28 | - android:layout_height="wrap_content" | |
29 | 40 | android:layout_toRightOf="@id/control_back" |
30 | - android:layout_marginLeft="@dimen/dp_15" | |
31 | - android:text="版本切换" | |
41 | + android:layout_marginLeft="@dimen/dp_30" | |
42 | + android:orientation="horizontal" | |
32 | 43 | android:visibility="gone" |
33 | - android:background="@color/white" | |
34 | - android:textColor="@color/black" | |
35 | - android:textSize="@dimen/sp_16" /> | |
44 | + android:layout_height="@dimen/dp_50"> | |
45 | + <ImageView | |
46 | + android:layout_width="@dimen/dp_30" | |
47 | + android:layout_height="@dimen/dp_20" | |
48 | + android:layout_gravity="center" | |
49 | + android:background="@drawable/consol_change" /> | |
50 | + <TextView | |
51 | + android:layout_width="wrap_content" | |
52 | + android:layout_height="wrap_content" | |
53 | + android:layout_gravity="center" | |
54 | + android:textColor="@color/white" | |
55 | + android:layout_marginLeft="@dimen/dp_5" | |
56 | + android:textSize="@dimen/sp_14" | |
57 | + android:text="版本切换" | |
58 | + /> | |
59 | + </LinearLayout> | |
36 | 60 | |
37 | 61 | <Button |
38 | 62 | android:id="@+id/control_mode" |
... | ... | @@ -49,7 +73,8 @@ |
49 | 73 | android:id="@+id/control_line" |
50 | 74 | android:layout_width="match_parent" |
51 | 75 | android:layout_height="@dimen/dp_1_5" |
52 | - android:background="@color/white" | |
76 | + android:visibility="invisible" | |
77 | + android:background="@color/transparent" | |
53 | 78 | android:layout_alignBottom="@id/control_back" |
54 | 79 | /> |
55 | 80 | </RelativeLayout> | ... | ... |