修改网格员判断条件

app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/CatalogActivity.java

@@ -145,15 +145,11 @@ public class CatalogActivity extends BaseActivity {
         mBind = ButterKnife.bind(this);
         mTvBaseTitle.setText("企业检查");
         String type = getIntent().getStringExtra("type");
-        String industryId = UserLgUtils.getIndustryId();
+        int industryId = UserLgUtils.getIndustryId();
-        if (!TextUtils.isEmpty(industryId)) {
+        if (industryId == 1) {
             mTvPublish.setVisibility(View.VISIBLE);
             mTvPublish.setText("保存");
-            mTvPublish.setOnClickListener(v -> {
+            mTvPublish.setOnClickListener(v -> buildConfirmData(mLeftAdapter.getData()));
-                //TODO 构建提交数据
-                buildConfirmData(mLeftAdapter.getData());
-//                doSubmibt(mRightAdapter.getData());
-            });
             if (!TextUtils.isEmpty(type)) {
                 mIbBack.setOnClickListener(v -> {
                     Intent intent = new Intent(mActivity, CompanyInfoEditActivity.class);
@@ -173,30 +169,13 @@ public class CatalogActivity extends BaseActivity {
             }
             String name = getIntent().getStringExtra("name");
             mTvName.setText(name);
-            getCheckOptions(industryId);
+            getCheckOptions();
-//            if (!TextUtils.isEmpty(mTaskCheckId)) {
-//                //我的任务
-//                getCompanyDetail(mCompanyId, nId);
-//            } else {
-//                //自己检查
-//                getCheckOptions(nId);
-//
-////                String id = getIntent().getStringExtra("id");
-////                if (TextUtils.isEmpty(nId)) {
-////                    getDicList(PathConfig.DIC_COMPANY_TYPE, 1);
-////                } else {
-////               mRlvCatalog.setVisibility(View.VISIBLE);
-////                    if (TextUtils.isEmpty(id)) {
-////                        id = "";
-////                    }
-////                }
-//            }
             getCompanyDetail(mCompanyId);
             mBtnUnClaim.setVisibility(View.GONE);
             initListView();
             startListenerLocation();
         } else {
-            ToastUtils.showErrorShort("你不是网格员,无法检查企业");
+            ToastUtils.showErrorShort("你不是网格员,请联系管理员");
             refreshView(STATE_LOAD_EMPTY);
         }
     }
@@ -378,7 +357,7 @@ public class CatalogActivity extends BaseActivity {
                             if (TextUtils.isEmpty(industry)) {
                                 getDicList(PathConfig.DIC_COMPANY_TYPE, 2);
                             } else {
-                                getCheckOptions(nid);
+                                getCheckOptions();
                             }
                         }
                     }
@@ -476,7 +455,7 @@ public class CatalogActivity extends BaseActivity {
                     public void onNext(SuccessBean successBean) {
                         dialog.dismiss();
                         if (type == 1) {
-                            getCheckOptions(mSelNatureId);
+                            getCheckOptions();
                         } else {
                             getCompanyDetail(mCompanyId, mSelNatureId);
                         }
@@ -779,14 +758,12 @@ public class CatalogActivity extends BaseActivity {
 
     /**
      * 获取检查项
-     *
-     * @param nId
      */
-    private void getCheckOptions(String nId) {
+    private void getCheckOptions() {
         refreshView(STATE_LOAD_LOADING);
         RetrofitManager.getInstance()
                 .create(LocationApiService.class)
-                .getCheckOptionsList( UserLgUtils.getToken())
+                .getCheckOptionsList(UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<List<CheckOptionsbean>>() {

app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/base/MainActivity.java

@@ -208,13 +208,10 @@ public class MainActivity extends BaseActivity {
                     @Override
                     public void onNext(GirdPBean girdPBean) {
                         if ("grid".equals(girdPBean.getPersonType())) {
-                            if (!TextUtils.isEmpty(girdPBean.getGridType())) {
+                            int isGridOperator = girdPBean.getIsGridOperator();
-                                UserLgUtils.setIndustryId(girdPBean.getGridType());
+                            UserLgUtils.setIndustryId(isGridOperator);
-                            } else {
-                                UserLgUtils.setIndustryId("");
-                            }
                         } else {
-                            UserLgUtils.setIndustryId("");
+                            UserLgUtils.setIndustryId(-1);
                         }
                         UserLgUtils.setPersonType(girdPBean.getPersonType());
                         String page = getIntent().getStringExtra("page");
@@ -247,7 +244,7 @@ public class MainActivity extends BaseActivity {
 
                     @Override
                     public void onError(Throwable e) {
-                        UserLgUtils.setIndustryId("");
+                        UserLgUtils.setIndustryId(-1);
                     }
 
                     @Override

app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/companylib/EnterCompanyInfoActivity.java

@@ -231,17 +231,15 @@ public class EnterCompanyInfoActivity extends BaseActivity {
 
                     @Override
                     public void onNext(GirdPBean uBean) {
-                        if (!"grid".equals(uBean.getPersonType()) || TextUtils.isEmpty(UserLgUtils.getIndustryId())) {
+                        if (uBean.getIsGridOperator() == 1) {
+                            //网格员
+                            mTvArea2.setEnabled(false);
+                            refreshView(STATE_LOAD_SUCCESS);
+                            getDefaultArea1(uBean);
+                        } else {
                             //不是网格员
                             ToastUtils.showErrorShort("您不是网格员,无法进行企业添加.");
                             refreshView(STATE_LOAD_EMPTY);
-                        } else {
-                            //网格员
-                            mTvArea2.setEnabled(false);
-//                            mTvArea3.setEnabled(false);
-//                            mTvArea4.setEnabled(false);
-                            refreshView(STATE_LOAD_SUCCESS);
-                            getDefaultArea1(uBean);
                         }
                     }
 

app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/NewCheckOptionsActivity.java

@@ -127,6 +127,7 @@ public class NewCheckOptionsActivity extends BaseActivity {
         mTvBaseTitle.setText("企业检查");
         mTvPublish.setVisibility(View.VISIBLE);
         mTvPublish.setText("确定");
+        LogUtils.e("企业检查");
         mTvPublish.setOnClickListener(v -> {
 //            Gson gson= new Gson();
 //            String s = gson.toJson(mAdapter.getData());

app/src/main/java/com/sucstepsoft/txrealtimelocation/activitys/issue/PublicReportActivity.java

@@ -192,17 +192,15 @@ public class PublicReportActivity extends BaseActivity {
 
                     @Override
                     public void onNext(GirdPBean uBean) {
-                        if (!"grid".equals(uBean.getPersonType()) || TextUtils.isEmpty(UserLgUtils.getIndustryId())) {
+                        if (UserLgUtils.getIndustryId() == 1) {
+                            //网格员
+                            mTvArea2.setEnabled(false);
+                            refreshView(STATE_LOAD_SUCCESS);
+                            getDefaultArea1(uBean);
+                        } else {
                             //不是网格员
                             ToastUtils.showErrorShort("您不是网格员,无法上报.");
                             refreshView(STATE_LOAD_EMPTY);
-                        } else {
-                            //网格员
-                            mTvArea2.setEnabled(false);
-//                            mTvArea3.setEnabled(false);
-//                            mTvArea4.setEnabled(false);
-                            refreshView(STATE_LOAD_SUCCESS);
-                            getDefaultArea1(uBean);
                         }
                     }
 

app/src/main/java/com/sucstepsoft/txrealtimelocation/beans/GirdPBean.java

@@ -18,13 +18,10 @@ public class GirdPBean {
     private String area4Name;
     private String area5;
     private String area5Name;
-    private String departmentId;
-    private String departmentName;
     private String gridPersonnelId;
     private String gridType;
     private String industryId;
-    private String leaderDepartmentId;
+    private int isGridOperator;
-    private String leaderDepartmentName;
     private String leaderUserId;
     private String leaderUserName;
     private int level;
@@ -117,22 +114,6 @@ public class GirdPBean {
         this.area5Name = area5Name;
     }
 
-    public String getDepartmentId() {
-        return departmentId;
-    }
-
-    public void setDepartmentId(String departmentId) {
-        this.departmentId = departmentId;
-    }
-
-    public String getDepartmentName() {
-        return departmentName;
-    }
-
-    public void setDepartmentName(String departmentName) {
-        this.departmentName = departmentName;
-    }
-
     public String getGridPersonnelId() {
         return gridPersonnelId;
     }
@@ -157,20 +138,12 @@ public class GirdPBean {
         this.industryId = industryId;
     }
 
-    public String getLeaderDepartmentId() {
+    public int getIsGridOperator() {
-        return leaderDepartmentId;
+        return isGridOperator;
     }
 
-    public void setLeaderDepartmentId(String leaderDepartmentId) {
+    public void setIsGridOperator(int isGridOperator) {
-        this.leaderDepartmentId = leaderDepartmentId;
+        this.isGridOperator = isGridOperator;
-    }
-
-    public String getLeaderDepartmentName() {
-        return leaderDepartmentName;
-    }
-
-    public void setLeaderDepartmentName(String leaderDepartmentName) {
-        this.leaderDepartmentName = leaderDepartmentName;
     }
 
     public String getLeaderUserId() {

cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java

@@ -132,11 +132,11 @@ public class UserLgUtils {
         return SPUtils.getInstance(SP_USER_INFO).getBoolean("rememberPwd");
     }
 
-    public static String getIndustryId() {
+    public static int getIndustryId() {
-        return SPUtils.getInstance(SP_USER_INFO).getString("nId");
+        return SPUtils.getInstance(SP_USER_INFO).getInt("nId");
     }
 
-    public static void setIndustryId(String id) {
+    public static void setIndustryId(int id) {
         SPUtils.getInstance(SP_USER_INFO).put("nId", id);
     }