直接实现关机功能，而不是调用其他包的功能。

diff --git a/app/release/FactoryMode.apk b/app/release/FactoryMode.apk
index b9b31b8..deac242 100644 (file)
Binary files a/app/release/FactoryMode.apk and b/app/release/FactoryMode.apk differ

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d7258e..5c1711a 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="mobile.miki"
     android:sharedUserId="android.uid.system">
-
     <!-- android:sharedUserId="android.uid.phone" -->
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
@@ -17,8 +16,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES" />
-    <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
-    <!--<uses-permission android:name="android.permission.WAKE_LOCK" />-->
+    <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" /> <!-- <uses-permission android:name="android.permission.WAKE_LOCK" /> -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
@@ -58,90 +56,71 @@
     <uses-permission android:name="android.permission.BATTERY_STATS" />
     <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
     <uses-permission android:name="android.permission.MOVE_PACKAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />-->
-    <uses-permission android:name="android.permission.STATUS_BAR" />
-    <!--<uses-permission android:name="android.permission.CALL_PHONE" />-->
-    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
-    <!--<uses-permission android:name="android.permission.DEVICE_POWER" />-->
-    <!--<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />-->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- <uses-permission android:name="android.permission.DISABLE_KEYGUARD" /> -->
+    <uses-permission android:name="android.permission.STATUS_BAR" /> <!-- <uses-permission android:name="android.permission.CALL_PHONE" /> -->
+    <uses-permission android:name="android.permission.CALL_PRIVILEGED" /> <!-- <uses-permission android:name="android.permission.DEVICE_POWER" /> -->
+    <!-- <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" /> -->
     <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
-
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    
-    <!-- android:name=".factory.util.TestResult" -->
-    <!-- android:name=".factory.util.TestResult" -->
     <application
         android:name=".MyApplication"
         android:icon="@drawable/ic_gravity"
-        android:label="@string/app_name"
-         >
+        android:label="@string/app_name">
+        <activity android:name=".shutdown_activity"></activity>
         <activity
             android:name=".mainui.TestMainList"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.htf" />
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <!--  <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
         </activity>
         <activity
             android:name=".GravitySensorActivity"
-            android:label="@string/gravity"
-             />
+            android:label="@string/gravity" />
         <activity
             android:name=".MotorTestActivity"
-            android:label="@string/shakeTest"
-             />
+            android:label="@string/shakeTest" />
         <activity
             android:name=".KeysTestActivity"
-            android:label="@string/keysTest"
-             >
+            android:label="@string/keysTest">
             <intent-filter>
-                <action android:name="com.eqc.OffHook.START"/>
+                <action android:name="com.eqc.OffHook.START" />
             </intent-filter>
         </activity>
         <activity
             android:name=".SimDetectActivity"
-            android:label="@string/detectSim"
-             />
+            android:label="@string/detectSim" />
         <activity
             android:name=".BlooToothActivity"
-            android:label="@string/bluetooth"
-             >
-
-        </activity>
+            android:label="@string/bluetooth"></activity>
         <activity
             android:name=".WifiTestActiviy"
-            android:label="@string/wifitest"
-             />
+            android:label="@string/wifitest" />
         <activity
             android:name=".CameraPreview"
-            android:label="@string/cameraMotor"
-             />
+            android:label="@string/cameraMotor" />
         <activity
             android:name=".RingtoneActivity"
-            android:label="@string/ringtone"
-             />
+            android:label="@string/ringtone" />
         <activity
             android:name=".LCDtestAgeing"
             android:label="@string/lcdTest_lsn"
-            
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
         <activity
             android:name=".DialerTestActivity"
-            android:label="@string/call_fun"
-             />
+            android:label="@string/call_fun" />
         <activity
             android:name=".BatteryTestActivity"
-            android:label="@string/powerBatteryTest"
-             />
+            android:label="@string/powerBatteryTest" />
         <activity
             android:name=".touchscreen.TouchScreen_HandWriting"
             android:label="@string/TouchScreen" />
@@ -150,114 +129,86 @@
             android:label="@string/TouchScreen" />
         <activity
             android:name=".VersionActivity"
-            android:label="@string/deviceInfo"
-                                    
-            />
+            android:label="@string/deviceInfo" />
         <activity
             android:name=".touchscreen.SurfaceViewAcitvity"
             android:label="@string/TouchScreen"
-            
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
-
-        <!-- add by tyy 2016.9.2 -->
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> <!-- add by tyy 2016.9.2 -->
         <activity
-            android:launchMode="singleTask"
             android:name=".mainui.TestMainActivity"
+            android:launchMode="singleTask"
             android:theme="@style/AppTheme" />
         <activity
-            android:launchMode="singleTask"
             android:name=".GpsTest"
             android:label="@string/gps_test"
-             />
+            android:launchMode="singleTask" />
         <activity
             android:name=".TouchTest"
-            android:label="@string/TouchScreen"
-             />
+            android:label="@string/TouchScreen" />
         <activity
             android:name=".SystemMemory"
-            android:label="@string/ramromTest"
-             />
+            android:label="@string/ramromTest" />
         <activity
             android:name=".DSPActivity"
-            android:label="@string/dsp"
-            />
+            android:label="@string/dsp" />
         <activity
             android:name=".HeartRate"
-            android:label="@string/heartrate"
-            />
+            android:label="@string/heartrate" />
         <activity
             android:name=".MikeTest"
-            android:label="@string/mic_title"
-             />
+            android:label="@string/mic_title" />
         <activity
             android:name=".lcd.LcdJudgActivity"
             android:label="@string/mic_title"
-            
             android:theme="@style/AppTheme" />
         <activity
-           android:launchMode="singleTask"
             android:name=".lcd.LcdActivity"
             android:label="@string/mic_title"
-             />
-         <activity android:label="@string/fmTest" android:name=".BrightnessTest"  />
-    
+            android:launchMode="singleTask" />
+        <activity
+            android:name=".BrightnessTest"
+            android:label="@string/fmTest" />
         <activity
             android:name=".ageingmode.AgeingModeActivity"
-             
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".mainui.ModeSelectActivity"
-            
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".mainui.FlagPositionActivity"
-            
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme"
-            />
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".RecordActivity"
-             
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme"/>
-
-        <activity android:name=".flow.DownLoad"
-            
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".flow.DownLoad"
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme"/>
-
-        <activity android:name=".UltravioletMonitorActivity"
-            
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".UltravioletMonitorActivity"
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme"/>
-
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".ageingmode.AgeingRingtoneActivity"
-            
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
         <activity
             android:name=".ageingmode.AgeingLCDtest"
-            
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
         <activity
             android:name=".ageingmode.AgeingCameraPreview"
-            
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
         <activity
             android:name=".ageingmode.AgeingMikeTest"
-            
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
         <activity
             android:name=".ageingmode.AgeingMotorTestActivity"
-            
-            android:launchMode="singleTask"/>
-        
-        <service 
-            android:name=".ageingmode.AgeingService"
-            ></service>
-        
+            android:launchMode="singleTask" />
+
+        <service android:name=".ageingmode.AgeingService" />
     </application>
 
 </manifest>
\ No newline at end of file

diff --git a/app/src/main/java/mobile/miki/mainui/TestMainList.java b/app/src/main/java/mobile/miki/mainui/TestMainList.java
index 1449638..12a5e88 100644 (file)
--- a/app/src/main/java/mobile/miki/mainui/TestMainList.java
+++ b/app/src/main/java/mobile/miki/mainui/TestMainList.java
@@ -27,6 +27,7 @@ import mobile.miki.VersionActivity;
 import mobile.miki.ageingmode.AgeingModeActivity;
 import mobile.miki.flow.DownLoad;
 import mobile.miki.util.FTUtils;
+import mobile.miki.shutdown_activity;
 
 /*add tyy  程序主入口 */
 public class TestMainList extends BaseActivity implements OnClickListener {
@@ -138,9 +139,11 @@ public class TestMainList extends BaseActivity implements OnClickListener {
                        break;
 
                case R.id.shutdown_system:
-                       Intent ii = new Intent();
-                       ii.setAction("com.eqc.shutdown_sos_noneed");
-                       startActivity(ii);
+                       intent = new Intent(TestMainList.this, shutdown_activity.class);
+                       startActivity(intent);
+//                     Intent ii = new Intent();
+//                     ii.setAction("com.eqc.shutdown_sos_noneed");
+//                     startActivity(ii);
                        break;
                case R.id.Factory_test_title:
                        long secondTime = System.currentTimeMillis();

diff --git a/app/src/main/java/mobile/miki/shutdown_activity.java b/app/src/main/java/mobile/miki/shutdown_activity.java
new file mode 100644 (file)
index 0000000..1b9bf78
--- /dev/null
+++ b/app/src/main/java/mobile/miki/shutdown_activity.java
@@ -0,0 +1,53 @@
+package mobile.miki;\r
+\r
+import android.os.Build;\r
+import android.os.Bundle;\r
+import android.util.Log;\r
+import android.view.View;\r
+import android.widget.Button;\r
+\r
+public class shutdown_activity extends BaseActivity {\r
+\r
+    String a="";\r
+    Button btn_yes;\r
+    Button btn_no;\r
+    @Override\r
+    protected void onCreate(Bundle savedInstanceState) {\r
+        super.onCreate(savedInstanceState);\r
+        setContentView(R.layout.activity_shutdown_activity);\r
+        btn_yes =(Button)findViewById(R.id.btn_yes);\r
+        btn_no =(Button)findViewById(R.id.btn_no);\r
+        btn_yes.setClickable(true);\r
+        btn_no.setClickable(true);\r
+        btn_no.setEnabled(true);\r
+        btn_yes.setEnabled(true);\r
+\r
+        btn_yes.setOnClickListener(new View.OnClickListener() {\r
+            @Override\r
+            public void onClick(View v) {\r
+                //log("shutdown");\r
+\r
+                try {\r
+                    Object object = Class.forName("android.os.ServiceManager").getMethod("getService", new Class[] { String.class }).invoke(null, new Object[] { "power" });\r
+                    object = Class.forName("android.os.IPowerManager$Stub").getMethod("asInterface", new Class[] { android.os.IBinder.class }).invoke(null, new Object[] { object });\r
+                    if (Build.VERSION.RELEASE.contains("7.0")) {\r
+                        object.getClass().getMethod("shutdown", new Class[] { boolean.class, String.class, boolean.class }).invoke(object, new Object[] { Boolean.valueOf(false), null, Boolean.valueOf(true) });\r
+                        return;\r
+                    }\r
+                    object.getClass().getMethod("shutdown", new Class[] { boolean.class, boolean.class }).invoke(object, new Object[] { Boolean.valueOf(false), Boolean.valueOf(true) });\r
+                    return;\r
+                } catch (Exception exception) {\r
+                    Log.e(a, exception.toString(), exception);\r
+                    return;\r
+                }\r
+            }\r
+        });\r
+\r
+        btn_no.setOnClickListener(new View.OnClickListener() {\r
+            @Override\r
+            public void onClick(View v) {\r
+                shutdown_activity.this.finish();\r
+            }\r
+        });\r
+    }\r
+}\r

diff --git a/app/src/main/res/layout/activity_shutdown_activity.xml b/app/src/main/res/layout/activity_shutdown_activity.xml
new file mode 100644 (file)
index 0000000..a753d68
--- /dev/null
+++ b/app/src/main/res/layout/activity_shutdown_activity.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
+    android:layout_width="match_parent"\r
+    android:layout_height="match_parent"\r
+    android:orientation="vertical"\r
+    android:background="@android:color/white">\r
+\r
+    <LinearLayout\r
+        android:layout_width="match_parent"\r
+        android:layout_height="match_parent"\r
+        android:layout_centerInParent="true"\r
+        android:orientation="vertical">\r
+\r
+        <TextView\r
+            android:id="@+id/shutdownText"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="match_parent"\r
+            android:layout_gravity="center|center_horizontal|center_vertical"\r
+            android:text="@string/poweroff"\r
+            android:textAlignment="center"\r
+            android:textColor="@color/black"\r
+            android:textSize="36sp"\r
+            android:textStyle="bold" />\r
+    </LinearLayout>\r
+\r
+\r
+    <LinearLayout\r
+        android:layout_width="match_parent"\r
+        android:layout_height="wrap_content"\r
+        android:layout_alignParentBottom="true"\r
+        android:layout_centerHorizontal="true"\r
+        android:orientation="horizontal" >\r
+\r
+        <Button\r
+            android:id="@+id/btn_no"\r
+            style="@style/button_white_text"\r
+            android:layout_width="0dp"\r
+            android:layout_height="match_parent"\r
+            android:layout_weight="1"\r
+            android:background="#DA5B17"\r
+            android:text="@string/rf_no"\r
+            android:textColor="#fff"\r
+            android:visibility="visible" />\r
+\r
+        <Button\r
+            android:id="@+id/btn_yes"\r
+            style="@style/button_white_text"\r
+            android:layout_width="0dp"\r
+            android:layout_height="match_parent"\r
+            android:layout_weight="1"\r
+            android:background="#DA5B17"\r
+            android:text="@string/rf_yes"\r
+            android:textColor="#fff"\r
+            android:visibility="visible" />\r
+\r
+    </LinearLayout>\r
+</RelativeLayout>\r

diff --git a/factorymode.iml b/factorymode.iml
index 6804458..0258691 100644 (file)
--- a/factorymode.iml
+++ b/factorymode.iml
@@ -12,7 +12,6 @@
     <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />\r
-      <excludeFolder url="file://$MODULE_DIR$/build" />\r
     </content>\r
     <orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />\r
     <orderEntry type="sourceFolder" forTests="false" />\r

diff --git a/watchlibrary/watchlibrary.iml b/watchlibrary/watchlibrary.iml
index cfdf090..d91f97e 100644 (file)
--- a/watchlibrary/watchlibrary.iml
+++ b/watchlibrary/watchlibrary.iml
@@ -7,11 +7,19 @@
         <option name="BUILDABLE" value="false" />\r
       </configuration>\r
     </facet>\r
+    <facet type="android-gradle" name="Android-Gradle">\r
+      <configuration>\r
+        <option name="GRADLE_PROJECT_PATH" value=":watchlibrary" />\r
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />\r
+        <option name="LAST_KNOWN_AGP_VERSION" />\r
+      </configuration>\r
+    </facet>\r
   </component>\r
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">\r
     <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />\r
+      <excludeFolder url="file://$MODULE_DIR$/build" />\r
     </content>\r
     <orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />\r
     <orderEntry type="sourceFolder" forTests="false" />\r