@@ -37,7 +37,7 @@  | 
            ||
| 37 | 37 | 
                <ConfirmationsSetting value="0" id="Add" />  | 
            
| 38 | 38 | 
                <ConfirmationsSetting value="0" id="Remove" />  | 
            
| 39 | 39 | 
                </component>  | 
            
| 40 | 
                - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">  | 
            |
| 40 | 
                + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">  | 
            |
| 41 | 41 | 
                <output url="file://$PROJECT_DIR$/build/classes" />  | 
            
| 42 | 42 | 
                </component>  | 
            
| 43 | 43 | 
                <component name="ProjectType">  | 
            
                @@ -128,7 +128,7 @@ public class CameraService extends Service {
               | 
            ||
| 128 | 128 | 
                bundle.putInt(EXTRA_STATUS_PART,MSG_CAMERA_INIT_SUCCESS);  | 
            
| 129 | 129 | 
                sendCameraIntent(bundle);  | 
            
| 130 | 130 | 
                             }else{
               | 
            
| 131 | 
                -                LogHelper.d("czy","CameraService 相机初始化失败,杀掉进程");
               | 
            |
| 131 | 
                +                LogHelper.d("czy","CameraService 相机初始化失败,杀掉进程,返回值是"+result);
               | 
            |
| 132 | 132 | 
                Bundle bundle = new Bundle();  | 
            
| 133 | 133 | 
                bundle.putInt(EXTRA_STATUS_PART, MSG_CAMERA_CONN_ERROR);  | 
            
| 134 | 134 | 
                sendCameraIntent(bundle);  |