From: TrillGates Date: Wed, 26 May 2021 09:30:10 +0000 (+0800) Subject: completed shutdown page of fzd. X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=f1b9f856fc18867c52af802975f60ae56a1a2bec;p=factoryMode.git completed shutdown page of fzd. --- diff --git a/app/src/main/java/mobile/miki/shutdown_activity.java b/app/src/main/java/mobile/miki/shutdown_activity.java index 70acc20..e4df103 100644 --- a/app/src/main/java/mobile/miki/shutdown_activity.java +++ b/app/src/main/java/mobile/miki/shutdown_activity.java @@ -3,6 +3,7 @@ package mobile.miki; import android.content.Context; import android.os.Build; import android.os.Bundle; +import android.os.SystemProperties; import android.util.Log; import android.view.MotionEvent; import android.view.View; @@ -17,14 +18,20 @@ import mobile.miki.util.FTUtils; public class shutdown_activity extends BaseActivity { String TAG = "shutdown_activity"; - ImageButton btn_yes; - ImageButton btn_no; + Button btn_yes; + Button btn_no; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_shutdown_activity); + //判断是不是fzd的,如果是fzd的,那么显示防走丢的关机界面 + String protocolNum = SystemProperties.get("persist.sys.protocol_no"); + if ("3".equals(protocolNum)) { + setContentView(R.layout.activity_fzd_shutdown); + } else { + setContentView(R.layout.activity_shutdown_activity); + } setclicklistener(true); if (FTUtils.isA9()) { btn_yes.setVisibility(View.GONE); @@ -33,16 +40,22 @@ public class shutdown_activity extends BaseActivity { } private void setclicklistener(boolean b) { - btn_yes = (ImageButton) findViewById(R.id.btn_yes); - btn_no = (ImageButton) findViewById(R.id.btn_no); + btn_yes = (Button) findViewById(R.id.btn_yes); + btn_no = (Button) findViewById(R.id.btn_no); if (b) { btn_yes.setClickable(true); btn_yes.setEnabled(true); btn_yes.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - findViewById(R.id.bottom_tbn_container).setVisibility(View.GONE); - findViewById(R.id.shutdownText).setVisibility(View.GONE); + View viewById = findViewById(R.id.bottom_tbn_container); + if (viewById != null) { + viewById.setVisibility(View.GONE); + } + View viewById1 = findViewById(R.id.shutdownText); + if (viewById1 != null) { + viewById1.setVisibility(View.GONE); + } //log("shutdown"); finish(); try { diff --git a/app/src/main/res/drawable-hdpi/fzd_cancel_normal.png b/app/src/main/res/drawable-hdpi/fzd_cancel_normal.png new file mode 100644 index 0000000..bb0d2fe Binary files /dev/null and b/app/src/main/res/drawable-hdpi/fzd_cancel_normal.png differ diff --git a/app/src/main/res/drawable-hdpi/fzd_cancel_press.png b/app/src/main/res/drawable-hdpi/fzd_cancel_press.png new file mode 100644 index 0000000..98748cd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/fzd_cancel_press.png differ diff --git a/app/src/main/res/drawable-hdpi/fzd_save_mode_normal.png b/app/src/main/res/drawable-hdpi/fzd_save_mode_normal.png new file mode 100644 index 0000000..aa652f0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/fzd_save_mode_normal.png differ diff --git a/app/src/main/res/drawable-hdpi/fzd_save_mode_press.png b/app/src/main/res/drawable-hdpi/fzd_save_mode_press.png new file mode 100644 index 0000000..836970f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/fzd_save_mode_press.png differ diff --git a/app/src/main/res/drawable-hdpi/fzd_shutdown_normal.png b/app/src/main/res/drawable-hdpi/fzd_shutdown_normal.png new file mode 100644 index 0000000..2c549cd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/fzd_shutdown_normal.png differ diff --git a/app/src/main/res/drawable-hdpi/fzd_shutdown_press.png b/app/src/main/res/drawable-hdpi/fzd_shutdown_press.png new file mode 100644 index 0000000..28e7298 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/fzd_shutdown_press.png differ diff --git a/app/src/main/res/drawable/fzd_cancel_selector.xml b/app/src/main/res/drawable/fzd_cancel_selector.xml new file mode 100644 index 0000000..0f16349 --- /dev/null +++ b/app/src/main/res/drawable/fzd_cancel_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/fzd_save_mode_selector.xml b/app/src/main/res/drawable/fzd_save_mode_selector.xml new file mode 100644 index 0000000..f26e694 --- /dev/null +++ b/app/src/main/res/drawable/fzd_save_mode_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/fzd_shutdown_selector.xml b/app/src/main/res/drawable/fzd_shutdown_selector.xml new file mode 100644 index 0000000..b9a9feb --- /dev/null +++ b/app/src/main/res/drawable/fzd_shutdown_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_fzd_shutdown.xml b/app/src/main/res/layout/activity_fzd_shutdown.xml new file mode 100644 index 0000000..124ec49 --- /dev/null +++ b/app/src/main/res/layout/activity_fzd_shutdown.xml @@ -0,0 +1,45 @@ + + + + + +