Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into draft

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/erp/activity/crm/AddBusinessActivity.java

@@ -150,8 +150,11 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     }
 
     private boolean canSubmit() {
-        if (TextUtils.isEmpty(company_tv.getText())) return false;
-        if (adapter == null || ListUtils.getSize(adapter.getContacts()) <= 0) return false;
+        if (TextUtils.isEmpty(company_tv.getText())) {
+            ToastUtil.showToast(ct, getString(R.string.Company_Name) + getString(R.string.is_must_input));
+            return false;
+        }
+        if (adapter != null && ListUtils.getSize(adapter.getContacts()) <= 0) return true;
         for (EmployeesModel e : adapter.getContacts()) {
             if (!StringUtils.isEmpty(e.getEmployeeNames()) && !StringUtils.isEmpty(e.getEmployeecode()) && canSubmitPhone(e.getEmployeecode()))
                 return true;
@@ -325,6 +328,7 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
                 .setUrl(url)
                 .bulid();
         OAHttpHelper.getInstance().requestHttp(request, this);
+
     }
 
     private void saveContact(String bc_code, List<EmployeesModel> contacts) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailInfoActivity.java

@@ -338,8 +338,6 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     position = position + 1;
                     switch (position) {
                         case 1:
-//                            sendHttpResquestRelease(null, BUSINESS_RELEASE);
-                            //TODO 发布版本隐藏
                             loadNichehouse();
                             popupWindow.dismiss();
 //                            new MaterialDialog.Builder(ct).title("系统提示")
@@ -387,7 +385,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                                             .putExtra("code", bt_code)
 //
                             );
-                            finish();
+//                            finish();
                             break;
                         case 5:
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessSelectCustomerActivity.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -19,7 +20,6 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -34,9 +34,11 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -55,7 +57,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     private String code;
     @ViewInject(R.id.search_edit)
     private ClearEditText search_edit;
-    
+
     private EmptyLayout mEmptyLayout;
 
     private String cu_code;
@@ -69,13 +71,13 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         initData();
         initListener();
     }
- 
+
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("选择客户");
-        if (getIntent()!=null){
-            code=getIntent().getStringExtra("code");
-       
+        if (getIntent() != null) {
+            code = getIntent().getStringExtra("code");
+
         }
 
     }
@@ -126,15 +128,15 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         search_edit.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                
+
             }
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if(mAdapter==null){
-                    Toast.makeText(getApplication(),"网络异常，请稍后再试",Toast.LENGTH_SHORT);
-                }else{
-                    if (!StringUtils.isEmpty(search_edit.getText().toString())) {
+                if (mAdapter == null) {
+                    ToastUtil.showToast(ct, R.string.networks_out);
+                } else {
+                    if (!TextUtils.isEmpty(search_edit.getText())) {
                         mAdapter.getFilter().filter(search_edit.getText().toString());
                     } else {
                         mAdapter.getFilter().filter("");
@@ -152,7 +154,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
     private void initData() {
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, code);
-     
+
     }
 
     @Override
@@ -165,15 +167,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                if (!StringUtils.isEmpty(code)&&!StringUtils.isEmpty(cu_code)&&!StringUtils.isEmpty(cu_name))
-                {
-                    LogUtil.prinlnLongMsg("Arison",code+"|"+cu_code+"|"+cu_name);
+                if (canSave()) {
+                    LogUtil.prinlnLongMsg("Arison", code + "|" + cu_code + "|" + cu_name);
                     sendHttpResquest(2, code, cu_code, cu_name);
-                }else{
-                    ToastMessage("缺少参数 bt_code,cu_code,cu_name!");
                 }
-             
-                break; 
+                break;
             case android.R.id.home:
                 onBackPressed();
                 break;
@@ -181,7 +179,18 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         return true;
     }
 
-    public class BussinessDetailAdapter extends BaseAdapter  implements Filterable {
+    private boolean canSave() {
+        if (StringUtils.isEmpty(code)) {
+            ToastUtil.showToast(ct, R.string.error_system_findunknow_error);
+            return false;
+        } else if (StringUtils.isEmpty(cu_code) || StringUtils.isEmpty(cu_name)) {
+            ToastUtil.showToast(ct, R.string.CRM_pleasePickClientFirst);
+            return false;
+        }
+        return true;
+    }
+
+    public class BussinessDetailAdapter extends BaseAdapter implements Filterable {
         private Context ct;
         private ArrayList<Business> mdata = new ArrayList<>();
         private LayoutInflater inflater;
@@ -199,7 +208,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
         @Override
         public int getCount() {
-            return mdata.size();
+            return ListUtils.getSize(mdata);
         }
 
         @Override
@@ -225,7 +234,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             } else {
                 holder = (ViewHolder) convertView.getTag();
             }
-            
+
 //           holder.cb_left.setOnCheckedChangeListener(new SmoothCheckBox.OnCheckedChangeListener() {
 //                @Override
 //                public void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked) {
@@ -245,50 +254,50 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             holder.cb_left.setFocusable(false);
             holder.cb_left.setEnabled(false);
             holder.cb_left.setClickable(false);
-            holder.code=mdata.get(position).getCode();
+            holder.code = mdata.get(position).getCode();
             holder.cb_left.setChecked(mdata.get(position).isChecked(), mdata.get(position).isChecked());
-            
-            if (!StringUtils.isEmpty(searchkeys)){
+
+            if (!StringUtils.isEmpty(searchkeys)) {
                 holder.tv_business_name.setText(mdata.get(position).getName());
 
-                holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+                holder.tv_business_leader.setText("负责人:" + mdata.get(position).getLeader());
 //                CommonUtil.textSpanForStyle(holder.tv_business_name, mdata.get(position).getName(),
 //                        searchkeys, ct.getResources().getColor(R.color.yellow));
 //                CommonUtil.textSpanForStyle(holder.tv_business_leader, "负责人:"+mdata.get(position).getLeader(),
 //                        searchkeys, ct.getResources().getColor(R.color.yellow));
-            }else{
+            } else {
                 holder.tv_business_name.setText(mdata.get(position).getName());
 
-                holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+                holder.tv_business_leader.setText("负责人:" + mdata.get(position).getLeader());
             }
-         
+
             return convertView;
         }
 
         @Override
         public Filter getFilter() {
-          return   new Filter() {
+            return new Filter() {
                 @Override
                 protected FilterResults performFiltering(CharSequence constraint) {
                     //过滤数据
                     FilterResults searchResults = new FilterResults();
 
-                    if (constraint == null || constraint.length() == 0){
-                        
-                        searchResults.values=mData;
-                        searchResults.count=mData.size();
-                    }else{
-                        mdata=mData;
-                        ArrayList<Business> newArry=new ArrayList<Business>();
-                        for (int i=0;i<mdata.size();i++){
-                           Business model=mdata.get(i);
-                           if (model.getName().contains(constraint)||model.getLeader().contains(constraint)){
-                               newArry.add(model);
-                           }
+                    if (constraint == null || constraint.length() == 0) {
+
+                        searchResults.values = mData;
+                        searchResults.count = mData.size();
+                    } else {
+                        mdata = mData;
+                        ArrayList<Business> newArry = new ArrayList<Business>();
+                        for (int i = 0; i < mdata.size(); i++) {
+                            Business model = mdata.get(i);
+                            if (model.getName().contains(constraint) || model.getLeader().contains(constraint)) {
+                                newArry.add(model);
+                            }
                         }
 
-                        searchResults.values=newArry;
-                        searchResults.count=newArry.size();
+                        searchResults.values = newArry;
+                        searchResults.count = newArry.size();
                     }
                     return searchResults;
                 }
@@ -296,8 +305,8 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                 @Override
                 protected void publishResults(CharSequence constraint, FilterResults results) {
                     //装配数据
-                    mdata= (ArrayList<Business>) results.values;
-                    searchkeys=constraint.toString();
+                    mdata = (ArrayList<Business>) results.values;
+                    searchkeys = constraint.toString();
                     if (mAdapter.getCount() == 0) {
 
                     }
@@ -315,29 +324,29 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         }
     }
 
-    private Handler mHandler=new Handler(){
+    private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what){
+            switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    JSONArray jsonArray= JSON.parseObject(msg.getData().getString("result")).getJSONArray("customers");
-                   if (jsonArray!=null){
-                       for (int i = 0; i < jsonArray.size(); i++){
-                           JSONObject object=jsonArray.getJSONObject(i);
-                           Business model = new Business();
-                           model.setName(object.getString("CU_NAME"));
-                           model.setCode(object.getString("CU_CODE"));
-                           model.setLeader(object.getString("CU_CONTACT"));
-                           mData.add(model);
-                       }
-                   }
+                    JSONArray jsonArray = JSON.parseObject(msg.getData().getString("result")).getJSONArray("customers");
+                    if (jsonArray != null) {
+                        for (int i = 0; i < jsonArray.size(); i++) {
+                            JSONObject object = jsonArray.getJSONObject(i);
+                            Business model = new Business();
+                            model.setName(object.getString("CU_NAME"));
+                            model.setCode(object.getString("CU_CODE"));
+                            model.setLeader(object.getString("CU_CONTACT"));
+                            mData.add(model);
+                        }
+                    }
                     mAdapter = new BussinessDetailAdapter(ct, mData);
                     mlist.setAdapter(mAdapter);
-                    if (mAdapter.getCount()==0){
+                    if (mAdapter.getCount() == 0) {
                         mEmptyLayout.showEmpty();
-                        
+
                     }
                     break;
                 case 2:
@@ -350,13 +359,13 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                             jumpToStateActivity();
                             finish();
                         }
-                    },3000);
-                  
+                    }, 3000);
+
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                  //  ToastMessage(JSON.parseObject(msg.getData().getString("result")).getString("exceptionInfo"));
+                    //  ToastMessage(JSON.parseObject(msg.getData().getString("result")).getString("exceptionInfo"));
                     Crouton.makeText(BusinessSelectCustomerActivity.this, msg.getData().getString("result"), Style.ALERT).show();
                     break;
             }
@@ -369,25 +378,25 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         startActivity(intent);
     }
 
-    private void sendHttpResquest(int what,String code){
+    private void sendHttpResquest(int what, String code) {
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/getCustomerbySeller.action";
-        Map<String,Object> params=new HashMap<>();
-        params.put("sellercode", CommonUtil.getSharedPreferences(ct,"erp_username"));
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getCustomerbySeller.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("sellercode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
 
-    private void sendHttpResquest(int what,String code,String cu_code,String cu_name){
+    private void sendHttpResquest(int what, String code, String cu_code, String cu_name) {
         progressDialog.show();
-        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/updateBusinessChanceCust.action";
-        Map<String,Object> params=new HashMap<>();
-        params.put("sellercode", CommonUtil.getSharedPreferences(ct,"erp_username"));
-        params.put("bc_code",code);
-        params.put("cu_code",cu_code);
-        params.put("cu_name",cu_name);
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/updateBusinessChanceCust.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("sellercode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        params.put("bc_code", code);
+        params.put("cu_code", cu_code);
+        params.put("cu_name", cu_name);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -2,11 +2,13 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcelable;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.TextUtils;
@@ -552,7 +554,17 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 else saveVisit();
                 break;
             case R.id.delete_btn:
-                deleteVisitRecord();
+                new AlertDialog.Builder(ct).setTitle(R.string.prompt_title).setMessage(R.string.delete_prompt).setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        deleteVisitRecord();
+                    }
+                }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+
+                    }
+                }).show();
                 break;
         }
     }
@@ -840,8 +852,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     }
 
     private void updateVisitRecord() {
-        progressDialog.show();
         if (!canSubmit()) return;
+        progressDialog.show();
         String emname = CommonUtil.getName();
         String formStore = getFormStore(emname, vr_code);
         if (progressDialog != null)

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ChangeMobileActivity.java

@@ -211,7 +211,7 @@ public class ChangeMobileActivity extends BaseActivity {
             public void onClick(View view) {
                 String message = TextUtils.isEmpty(sum_tv.getText()) ? "" : sum_tv.getText().toString();
                 if (StringUtils.isEmpty(message))
-                    ToastUtil.showToast(ct,R.string.input_reason);
+                    ToastUtil.showToast(ct, R.string.input_reason);
                 else {
                     if (submiting) return;
                     message = StringUtils.string2Json(message);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OARegisterActivity.java

@@ -25,7 +25,6 @@ import java.util.Map;
 public class OARegisterActivity extends BaseActivity {
     private TabLayout tabLayout;
     private ViewPager viewPager;
-    private String[] title = {getString(R.string.signined), getString(R.string.unsignined)};
     private int ma_id;
     private String ma_code;
     private String baseUrl;
@@ -100,6 +99,8 @@ public class OARegisterActivity extends BaseActivity {
     }
 
     class ViewPagerAdapter extends FragmentPagerAdapter {
+        private String[] title = {getString(R.string.signined), getString(R.string.unsignined)};
+
         @Override
         public CharSequence getPageTitle(int position) {
             return title[position];

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/OAConfig.java

@@ -22,7 +22,7 @@ public class OAConfig {
     public static int earlyoff = 0;     //早退时间
     public static int overlatetime = 0; //严重迟到时间
     public static int latetime = 0;    //迟到时间(在该时间内不算迟到)
-    public static int nonclass = 90;     //矿工时间
+    public static int nonclass = 90;   //矿工时间
 
     /*是否显示Crm2.0功能*/
     public static boolean canShowCrm2_0() {

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" />