修改拜访报告单

2.添加权限问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
@@ -8,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -16,6 +18,7 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.PersistableBundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -74,6 +77,7 @@ import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
+import com.xzjmyk.pm.activity.util.PermissionUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
@@ -228,6 +232,33 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     }
 
     int oldERPNum = 0;
+
+
+    private void initPermission() {
+        String[] permissions = {Manifest.permission.ACCESS_FINE_LOCATION,
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                Manifest.permission.CAMERA,
+                Manifest.permission.CALL_PHONE};
+        for (String permission : permissions)
+            if (PermissionUtil.lacksPermissions(this, permission)) {
+                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+            }
+
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PermissionUtil.DEFAULT_REQUEST) {
+            if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+                //TODO 没有获取到权限
+                LogUtil.i("没有获取到权限");
+            } else {
+                LogUtil.i("已经用户赋予权限获取到权限");
+            }
+        }
+    }
+
     /**
      * @desc:主页菜单入口
      * @author：Administrator on 2016/1/26 10:03
@@ -468,7 +499,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         if (isPush == 0) {
             PushManager.stopWork(this);
         }
-        startService(new Intent(this, AutoErpService.class));
         mActivityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         if (savedInstanceState != null) {
             restoreState(savedInstanceState);
@@ -930,6 +960,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     @Override
     protected void onResume() {
         super.onResume();
+        initPermission();
+        startService(new Intent(this, AutoErpService.class));
         LogUtil.d("onResume start:" + DateFormatUtil.getDateTimeStr());
         if (!AppConfig.COMPANY) return;
         isPause = false;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -60,10 +60,13 @@ public class SplashActivity extends BaseActivity {
         initConfig();// 初始化配置
     }
 
+
+
     @Override
     protected void onResume() {
         super.onResume();
         LogUtil.d("onResume()");
+
     }
 
     /**

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -321,7 +321,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 //        iv_desc_oa.setVisibility(seting ? View.GONE : View.VISIBLE);
         CommonUtil.clearSharedPreferences(ct, "seting");
         CommonUtil.clearSharedPreferences(ct, "seting_1");
-
         showInfoCode(); // TODO 触发个人信息二维码展示事件
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/video/VideoActivity.java

@@ -95,7 +95,7 @@ public class VideoActivity extends AppCompatActivity implements MediaRecorder.On
     }
 
     private boolean validatePermission() {
-        if (!PermissionUtil.lacksPermissions(this, Manifest.permission.CAMERA)) {
+        if (PermissionUtil.lacksPermissions(this, Manifest.permission.CAMERA)) {
             PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, Manifest.permission.CAMERA);
         }
         return true;

WeiChat/src/main/res/layout/activity_visit_report_add.xml

@@ -271,7 +271,6 @@
                 android:textSize="@dimen/text_main" />
 
             <TextView
-                android:id="@+id/textView1"
                 style="@style/form_relative_left_text"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id61"
@@ -279,12 +278,9 @@
                 android:textColor="@color/red"
                 android:visibility="invisible" />
 
-            <com.andreabaccega.widget.FormEditText
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_visit_type"
                 style="@style/form_relative_right_text"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="18dp"
-                android:layout_toRightOf="@+id/textView1"
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:hint="@string/common_select1"
                 editTextFormExample:testType="nocheck" />