Skip to content

M
MobileManager
Commit a5c17e75 by Baoxy
Options

fix: 完成需求

1.修改密保界面
parent 8e1d1d33
Showing with 239 additions and 85 deletions
Launcher3/res/layout/fragment_encrypted_set.xml
...@@ -19,76 +19,152 @@ ...@@ -19,76 +19,152 @@
android:textColor="#363636" android:textColor="#363636"
android:textSize="16sp" /> android:textSize="16sp" />
<EditText <View
android:id="@+id/et_question1" android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#DDDFE1" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:background="#FFFFFF" android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_question1" android:orientation="horizontal">
android:maxLength="50"
android:maxLines="1" <TextView
android:paddingLeft="16dp" android:layout_width="wrap_content"
android:paddingRight="16dp" android:layout_height="match_parent"
android:textColor="#363636" android:gravity="center_vertical"
android:textColorHint="#8D8D8D" android:paddingLeft="16dp"
android:textSize="16sp" /> android:text="问题一："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<EditText
android:id="@+id/et_question1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_question1"
android:maxLength="50"
android:maxLines="1"
android:paddingRight="16dp"
android:textColor="#363636"
android:textColorHint="#8D8D8D"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="#DDDFE1" /> android:background="#DDDFE1" />
<EditText <LinearLayout
android:id="@+id/et_answer1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:background="#FFFFFF" android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer1" android:orientation="horizontal">
android:maxLength="50"
android:maxLines="1" <TextView
android:paddingLeft="16dp" android:layout_width="wrap_content"
android:paddingRight="16dp" android:layout_height="match_parent"
android:textColor="#363636" android:gravity="center_vertical"
android:textColorHint="#8D8D8D" android:paddingLeft="16dp"
android:textSize="16sp" /> android:text="答案一："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<EditText
android:id="@+id/et_answer1"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer1"
android:maxLength="50"
android:maxLines="1"
android:paddingRight="16dp"
android:textColor="#363636"
android:textColorHint="#8D8D8D"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginBottom="5dp"
android:background="#DDDFE1" /> android:background="#DDDFE1" />
<EditText <View
android:id="@+id/et_question2" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="#DDDFE1" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:background="#FFFFFF" android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_question2" android:orientation="horizontal">
android:maxLength="50"
android:maxLines="1" <TextView
android:paddingLeft="16dp" android:layout_width="wrap_content"
android:paddingRight="16dp" android:layout_height="match_parent"
android:textColor="#363636" android:gravity="center_vertical"
android:textColorHint="#8D8D8D" android:paddingLeft="16dp"
android:textSize="16sp" /> android:text="问题二："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<EditText
android:id="@+id/et_question2"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_question2"
android:maxLength="50"
android:maxLines="1"
android:paddingRight="16dp"
android:textColor="#363636"
android:textColorHint="#8D8D8D"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="#DDDFE1" /> android:background="#DDDFE1" />
<EditText <LinearLayout
android:id="@+id/et_answer2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:background="#FFFFFF" android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer2" android:orientation="horizontal">
android:maxLength="50"
android:maxLines="1" <TextView
android:paddingLeft="16dp" android:layout_width="wrap_content"
android:paddingRight="16dp" android:layout_height="match_parent"
android:textColor="#363636" android:gravity="center_vertical"
android:textColorHint="#8D8D8D" android:paddingLeft="16dp"
android:textSize="16sp" /> android:text="答案二："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<EditText
android:id="@+id/et_answer2"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer2"
android:maxLength="50"
android:maxLines="1"
android:paddingRight="16dp"
android:textColor="#363636"
android:textColorHint="#8D8D8D"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
......
Launcher3/res/layout/fragment_encrypted_ver.xml
...@@ -19,72 +19,150 @@ ...@@ -19,72 +19,150 @@
android:textColor="#363636" android:textColor="#363636"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <View
android:id="@+id/tv_question1" android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#DDDFE1" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:drawablePadding="10dp" android:background="#FFFFFF"
android:gravity="center_vertical" android:orientation="horizontal">
android:paddingLeft="16dp"
android:paddingRight="16dp" <TextView
android:text="@string/edu_item_input_encryted_question1" android:layout_width="wrap_content"
android:textColor="#363636" android:layout_height="match_parent"
android:textSize="16sp" /> android:gravity="center_vertical"
android:paddingLeft="16dp"
android:text="问题一："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_question1"
android:layout_width="match_parent"
android:layout_height="48dp"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingRight="16dp"
android:text="@string/edu_item_input_encryted_question1"
android:textColor="#363636"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="#DDDFE1" /> android:background="#DDDFE1" />
<EditText <LinearLayout
android:id="@+id/et_answer1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:background="#FFFFFF" android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer1" android:orientation="horizontal">
android:maxLines="1"
android:maxLength="50" <TextView
android:paddingLeft="16dp" android:layout_width="wrap_content"
android:paddingRight="16dp" android:layout_height="match_parent"
android:textColor="#363636" android:gravity="center_vertical"
android:textColorHint="#8D8D8D" android:paddingLeft="16dp"
android:textSize="16sp" /> android:text="答案一："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<EditText
android:id="@+id/et_answer1"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer1"
android:maxLines="1"
android:maxLength="50"
android:paddingRight="16dp"
android:textColor="#363636"
android:textColorHint="#8D8D8D"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginBottom="5dp"
android:background="#DDDFE1" /> android:background="#DDDFE1" />
<TextView <View
android:id="@+id/tv_question2" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="#DDDFE1" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:drawablePadding="10dp" android:background="#FFFFFF"
android:gravity="center_vertical" android:orientation="horizontal">
android:paddingLeft="16dp"
android:paddingRight="16dp" <TextView
android:text="@string/edu_item_input_encryted_question1" android:layout_width="wrap_content"
android:textColor="#363636" android:layout_height="match_parent"
android:textSize="16sp" /> android:gravity="center_vertical"
android:paddingLeft="16dp"
android:text="问题二："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_question2"
android:layout_width="match_parent"
android:layout_height="48dp"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingRight="16dp"
android:text="@string/edu_item_input_encryted_question1"
android:textColor="#363636"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="#DDDFE1" /> android:background="#DDDFE1" />
<EditText <LinearLayout
android:id="@+id/et_answer2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:background="#FFFFFF" android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer2" android:orientation="horizontal">
android:maxLines="1"
android:maxLength="50" <TextView
android:paddingLeft="16dp" android:layout_width="wrap_content"
android:paddingRight="16dp" android:layout_height="match_parent"
android:textColor="#363636" android:gravity="center_vertical"
android:textColorHint="#8D8D8D" android:paddingLeft="16dp"
android:textSize="16sp" /> android:text="答案二："
android:textColor="#363636"
android:textSize="16sp"
android:textStyle="bold" />
<EditText
android:id="@+id/et_answer2"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="#FFFFFF"
android:hint="@string/edu_item_input_encryted_answer2"
android:maxLines="1"
android:maxLength="50"
android:paddingRight="16dp"
android:textColor="#363636"
android:textColorHint="#8D8D8D"
android:textSize="16sp" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
......
Launcher3/res/values/strings.xml
...@@ -363,10 +363,10 @@ ...@@ -363,10 +363,10 @@
<string name="edu_item_input_encryted_set">设置密保</string> <string name="edu_item_input_encryted_set">设置密保</string>
<string name="edu_item_input_encryted_verfiy">验证密保</string> <string name="edu_item_input_encryted_verfiy">验证密保</string>
<string name="edu_item_input_encryted_question1">问题一</string> <string name="edu_item_input_encryted_question1">请输入第一个问题</string>
<string name="edu_item_input_encryted_question2">问题二</string> <string name="edu_item_input_encryted_question2">请输入第二个问题</string>
<string name="edu_item_input_encryted_answer1">答案一</string> <string name="edu_item_input_encryted_answer1">请输入第一个答案</string>
<string name="edu_item_input_encryted_answer2">答案二</string> <string name="edu_item_input_encryted_answer2">请输入第二个答案</string>
<string name="edu_item_input_question_null">问题为空</string> <string name="edu_item_input_question_null">问题为空</string>
<string name="edu_item_input_answer_null">答案为空</string> <string name="edu_item_input_answer_null">答案为空</string>
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
<string name="edu_item_input_answer1_error">问题一答案错误</string> <string name="edu_item_input_answer1_error">问题一答案错误</string>
<string name="edu_item_input_answer2_error">问题二答案错误</string> <string name="edu_item_input_answer2_error">问题二答案错误</string>
<string name="edu_item_input_encryted_title">请输入密保答案</string> <string name="edu_item_input_encryted_title">请输入密保答案用于修改密码</string>
......
Launcher3/src/com/android/launcher3/Launcher.java
...@@ -3155,7 +3155,7 @@ public class Launcher extends BaseActivity ...@@ -3155,7 +3155,7 @@ public class Launcher extends BaseActivity
Editable editable = editText.getText(); Editable editable = editText.getText();
if (editable == null || TextUtils.isEmpty(editable.toString())) { if (editable == null || TextUtils.isEmpty(editable.toString())) {
DialogUIUtils.showToastCenter(R.string.edu_item_input_encryted_title); DialogUIUtils.showToastCenter("密保答案为空");
return; return;
} }
String answer = editable.toString(); String answer = editable.toString();
......
Launcher3/src/com/android/launcher3/ManagerAuthActivity.java
...@@ -98,7 +98,7 @@ public class ManagerAuthActivity extends BaseActivity { ...@@ -98,7 +98,7 @@ public class ManagerAuthActivity extends BaseActivity {
InputUtil.closeSoftInput(getApplicationContext(), editText); InputUtil.closeSoftInput(getApplicationContext(), editText);
Editable editable = editText.getText(); Editable editable = editText.getText();
if (editable == null || TextUtils.isEmpty(editable.toString())) { if (editable == null || TextUtils.isEmpty(editable.toString())) {
DialogUIUtils.showToastCenter(R.string.edu_item_input_encryted_title); DialogUIUtils.showToastCenter("密保答案为空");
finish(); finish();
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment