From: kfl_614 Date: Mon, 30 Nov 2020 14:21:51 +0000 (+0800) Subject: adjust shutdown page. X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9ca4848a8d91e00fd80abe77aa5ad59f729021bf;p=factoryMode.git adjust shutdown page. --- diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 402f593..e9ba7f9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,7 +70,12 @@ android:icon="@drawable/ic_gravity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:label="@string/app_name"> - + + + + + + diff --git a/app/src/main/java/mobile/miki/shutdown_activity.java b/app/src/main/java/mobile/miki/shutdown_activity.java index 478738c..1835a4f 100644 --- a/app/src/main/java/mobile/miki/shutdown_activity.java +++ b/app/src/main/java/mobile/miki/shutdown_activity.java @@ -15,7 +15,7 @@ import mobile.miki.util.FTUtils; public class shutdown_activity extends BaseActivity { - String TAG="shutdown_activity"; + String TAG = "shutdown_activity"; Button btn_yes; Button btn_no; @@ -25,28 +25,28 @@ public class shutdown_activity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_shutdown_activity); setclicklistener(true); - if(FTUtils.isA9()){ + if (FTUtils.isA9()) { btn_yes.setVisibility(View.GONE); } } - private void setclicklistener(boolean b){ - btn_yes =(Button)findViewById(R.id.btn_yes); - btn_no =(Button)findViewById(R.id.btn_no); - - if (b==true){ + private void setclicklistener(boolean b) { + btn_yes = (Button) findViewById(R.id.btn_yes); + btn_no = (Button) findViewById(R.id.btn_no); + if (b == true) { 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); //log("shutdown"); finish(); try { - //获得ServiceManager类 - Class ServiceManager = Class + Class ServiceManager = Class .forName("android.os.ServiceManager"); //获得ServiceManager的getService方法 @@ -63,9 +63,9 @@ public class shutdown_activity extends BaseActivity { //调用asInterface方法获取IPowerManager对象 Object oIPowerManager = asInterface.invoke(null, oRemoteService); //获得shutdown()方法 - Method shutdown = oIPowerManager.getClass().getMethod("shutdown",boolean.class,boolean.class); + Method shutdown = oIPowerManager.getClass().getMethod("shutdown", boolean.class, boolean.class); //调用shutdown()方法 - shutdown.invoke(oIPowerManager,false,true); + shutdown.invoke(oIPowerManager, false, true); } catch (Exception e) { Log.e(TAG, e.toString(), e); @@ -84,10 +84,11 @@ public class shutdown_activity extends BaseActivity { } }); } + //(0~20,0~20),(130~170,0~20),(130~170,120~170),(0~20,120~170) - int[][] mapx={{0,40},{130,240},{0,40},{130,240}}; - int[][] mapy={{100,240},{100,240},{0,40},{0,40}}; - int touchindex=0; + int[][] mapx = {{0, 40}, {130, 240}, {0, 40}, {130, 240}}; + int[][] mapy = {{100, 240}, {100, 240}, {0, 40}, {0, 40}}; + int touchindex = 0; @Override public boolean dispatchTouchEvent(MotionEvent ev) { @@ -99,17 +100,17 @@ public class shutdown_activity extends BaseActivity { case MotionEvent.ACTION_UP: //抬起时启动定时 float x = ev.getX(); - float y= ev.getY(); - if(FTUtils.isA9()){ - if ((x >mapx[touchindex][0] && x < mapx[touchindex][1] ) && (y > mapy[touchindex][0] && y < mapy[touchindex][1])){ + float y = ev.getY(); + if (FTUtils.isA9()) { + if ((x > mapx[touchindex][0] && x < mapx[touchindex][1]) && (y > mapy[touchindex][0] && y < mapy[touchindex][1])) { touchindex++; - if (touchindex ==4){ - touchindex=0; + if (touchindex == 4) { + touchindex = 0; btn_yes.setVisibility(View.VISIBLE); } - }else{ - touchindex=0; + } else { + touchindex = 0; } } break; diff --git a/app/src/main/res/drawable/button_no_s09.xml b/app/src/main/res/drawable/button_no_s09.xml new file mode 100644 index 0000000..72aff3f --- /dev/null +++ b/app/src/main/res/drawable/button_no_s09.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_yes_s09.xml b/app/src/main/res/drawable/button_yes_s09.xml new file mode 100644 index 0000000..0706cf9 --- /dev/null +++ b/app/src/main/res/drawable/button_yes_s09.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/no.png b/app/src/main/res/drawable/no.png new file mode 100644 index 0000000..fc3965e Binary files /dev/null and b/app/src/main/res/drawable/no.png differ diff --git a/app/src/main/res/drawable/no_pressed.png b/app/src/main/res/drawable/no_pressed.png new file mode 100644 index 0000000..1b06ae3 Binary files /dev/null and b/app/src/main/res/drawable/no_pressed.png differ diff --git a/app/src/main/res/drawable/yes.png b/app/src/main/res/drawable/yes.png new file mode 100644 index 0000000..5b7d18c Binary files /dev/null and b/app/src/main/res/drawable/yes.png differ diff --git a/app/src/main/res/drawable/yes_pressed.png b/app/src/main/res/drawable/yes_pressed.png new file mode 100644 index 0000000..e1934c3 Binary files /dev/null and b/app/src/main/res/drawable/yes_pressed.png differ diff --git a/app/src/main/res/layout/activity_shutdown_activity.xml b/app/src/main/res/layout/activity_shutdown_activity.xml index 8ca9e01..2425e9a 100644 --- a/app/src/main/res/layout/activity_shutdown_activity.xml +++ b/app/src/main/res/layout/activity_shutdown_activity.xml @@ -2,8 +2,8 @@ + android:background="@android:color/background_dark" + android:orientation="vertical"> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginLeft="2.0dip" + android:layout_marginRight="2.0dip" + android:layout_marginBottom="2.0dip"> -