diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_todo.xml b/app/src/main/res/layout/fragment_package_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_todo.xml b/app/src/main/res/layout/fragment_package_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case.xml b/app/src/main/res/layout/fragment_urgent_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_urgent_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_todo.xml b/app/src/main/res/layout/fragment_package_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case.xml b/app/src/main/res/layout/fragment_urgent_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_urgent_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_handled.xml b/app/src/main/res/layout/fragment_urgent_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_todo.xml b/app/src/main/res/layout/fragment_package_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case.xml b/app/src/main/res/layout/fragment_urgent_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_urgent_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_handled.xml b/app/src/main/res/layout/fragment_urgent_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_todo.xml b/app/src/main/res/layout/fragment_urgent_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_todo.xml b/app/src/main/res/layout/fragment_package_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case.xml b/app/src/main/res/layout/fragment_urgent_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_urgent_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_handled.xml b/app/src/main/res/layout/fragment_urgent_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_todo.xml b/app/src/main/res/layout/fragment_urgent_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_verify_case.xml b/app/src/main/res/layout/fragment_verify_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_verify_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_todo.xml b/app/src/main/res/layout/fragment_package_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case.xml b/app/src/main/res/layout/fragment_urgent_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_urgent_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_handled.xml b/app/src/main/res/layout/fragment_urgent_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_todo.xml b/app/src/main/res/layout/fragment_urgent_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_verify_case.xml b/app/src/main/res/layout/fragment_verify_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_verify_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_verify_case_verifid.xml b/app/src/main/res/layout/fragment_verify_case_verifid.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_verify_case_verifid.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b420c07..5db1e96 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,6 +86,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/base/BaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseActivity.java index 2ca87fe..a9b9d5d 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseActivity.java @@ -9,6 +9,9 @@ import butterknife.ButterKnife; +/** + * 用于有多页Fragment情况下 + * */ public abstract class BaseActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java index 9e9d317..e4113b0 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/base/BaseCaseActivity.java @@ -12,6 +12,9 @@ import butterknife.BindView; +/** + * 用于详情页情况下 + */ public abstract class BaseCaseActivity extends BaseActivity { @BindView(R.id.leftBackView) diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index c4ac9dd..5325319 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -157,6 +157,7 @@ arcGISMap.getOperationalLayers().add(pointLayer); break; case "三包上报": + case "商铺变更": //门前三包 (ID: 1) ServiceFeatureTable packageFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); packageFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index f10e763..e99d075 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -45,8 +45,8 @@ import butterknife.BindView; import butterknife.OnClick; -public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, IShopChangeView { +public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, + IShopChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; @@ -73,7 +73,7 @@ private ImageRecycleViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; - private ArrayList realPaths = new ArrayList<>();//真是图片路径 + private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @Override @@ -111,8 +111,7 @@ switch (v.getId()) { case R.id.shopLayout: Intent intent = new Intent(this, ArcGISMapActivity.class); - //因为商铺变更和三包上报需要的属性一致，所以传相同的字段到地图模块，获取相同的属性 - intent.putExtra("type", "三包上报"); + intent.putExtra("type", "商铺变更"); startActivityForResult(intent, Constant.REQUEST_MAP_CODE); break; case R.id.addImageView: diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java new file mode 100644 index 0000000..ed148f2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -0,0 +1,80 @@ +package com.casic.dcms.ui; + +import android.content.Context; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.ui.fragment.dept.DeptAdjustFragment; +import com.casic.dcms.ui.fragment.dept.DeptAuthorizeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; +import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; +import com.casic.dcms.utils.Constant; +import com.google.android.material.tabs.TabLayout; +import com.qmuiteam.qmui.widget.QMUITopBarLayout; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptHandleActivity extends BaseActivity { + + @BindView(R.id.topLayout) + QMUITopBarLayout topLayout; + @BindView(R.id.tabLayout) + TabLayout tabLayout; + @BindView(R.id.viewPager) + ViewPager viewPager; + + private Context context = this; + + @Override + public int initLayoutView() { + return R.layout.activity_dept_handle; + } + + @Override + protected void setupTopBarLayout() { + topLayout.setTitle("部门处置").setTextColor(ContextCompat.getColor(this, R.color.white)); + topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + @Override + public void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptAuthorizeFragment());//部门授权 + fragmentList.add(new DeptAdjustFragment());//部门调整 + fragmentList.add(new DeptCasePostponeFragment());//二级缓办 + fragmentList.add(new DeptCaseDelayedFragment());//二级延期 + fragmentList.add(new DeptCaseHandledFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.DEPT_PAGE_TITLES, fragmentList); + viewPager.setOffscreenPageLimit(2); + viewPager.setAdapter(adapter); + //绑定TabLayout + tabLayout.setupWithViewPager(viewPager); + LinearLayout linearLayout = (LinearLayout) tabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(context, R.drawable.layout_divider_vertical)); + } + + @Override + public void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index da95e27..03438b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -28,6 +28,7 @@ import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; import com.casic.dcms.ui.DataAnalysisActivity; +import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; import com.casic.dcms.ui.PackageHandleActivity; import com.casic.dcms.ui.PersonOnlineActivity; @@ -157,6 +158,9 @@ case "商铺变更": intent.setClass(context, ChangeShopInfoActivity.class); break; + case "部门处置": + intent.setClass(context, DeptHandleActivity.class); + break; default: break; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index d7f3565..e2488fc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -28,6 +28,8 @@ import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction; import com.qmuiteam.qmui.recyclerView.QMUISwipeAction; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; @@ -150,15 +152,20 @@ } @Override - public void handleMessage(Message msg) { - NoticePageFragment noticePageFragment = reference.get(); - List noticeBeans = noticePageFragment.noticeBeans; - if (msg.what == Constant.PUSH_MESSAGE_DATA) { - NoticeBean noticeBean = (NoticeBean) msg.obj; - Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); - noticeBeans.add(0, noticeBean);//新消息永远放到第一个 - //更新数据 - noticePageFragment.swipeViewAdapter.setData(noticeBeans); + public void handleMessage(@NotNull Message msg) { + NoticePageFragment noticePageFragment; + try { + noticePageFragment = reference.get(); + List noticeBeans = noticePageFragment.noticeBeans; + if (msg.what == Constant.PUSH_MESSAGE_DATA) { + NoticeBean noticeBean = (NoticeBean) msg.obj; + Log.d(TAG, "收到推送消息，更新列表: " + noticeBean.getCaseId()); + noticeBeans.add(0, noticeBean);//新消息永远放到第一个 + //更新数据 + noticePageFragment.swipeViewAdapter.setData(noticeBeans); + } + } catch (NullPointerException e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 8a2376a..1657341 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -104,6 +104,10 @@ //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter); + //默认展开数据 + for (int i = 0; i < expandableAdapter.getGroupCount(); i++) { + deptTreeView.expandGroup(i); + } deptTreeView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index ae2a1a5..e9f9f9d 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_check; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index b01fc84..4bab3fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_check_case_checked; + return R.layout.fragment_check_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java new file mode 100644 index 0000000..2c6f32e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAdjustFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAdjustFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java new file mode 100644 index 0000000..48c1356 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptAuthorizeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptAuthorizeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java new file mode 100644 index 0000000..598a548 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseDelayedFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseDelayedFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java new file mode 100644 index 0000000..a9dd513 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseHandledFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java new file mode 100644 index 0000000..95ed227 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCasePostponeFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCasePostponeFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java new file mode 100644 index 0000000..1196e06 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -0,0 +1,26 @@ +package com.casic.dcms.ui.fragment.dept; + +import com.casic.dcms.R; +import com.casic.dcms.base.BaseFragment; + +public class DeptCaseTodoFragment extends BaseFragment { + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initEvent() { + + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index d84b4ca..2dfb996 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_handled; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 4bf5491..d8cadcb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_todo; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8e81bee..87d6d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_overtime; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java index 24cc15a..1d60f38 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_handle_case_urgent; + return R.layout.fragment_handle_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index 8986954..fb54226 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_handled; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index db01e7d..c0ffa22 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_overtime_case_todo; + return R.layout.fragment_overtime_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index f9244ae..b804659 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { private Context context; @@ -53,7 +50,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_done; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 2a15e22..56e1f61 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -31,9 +31,6 @@ import butterknife.BindView; -/** - * TODO 仅搭建界面，数据还未完全绑定 - */ public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { private static final String TAG = "PackageTodoFragment"; @@ -54,7 +51,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_package_todo; + return R.layout.fragment_package_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index 4701761..ae4e3e5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_handled; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 7cc98ca..2f49ad7 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -53,7 +53,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_urgent_case_todo; + return R.layout.fragment_urgent_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index af00601..d755dd9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verifid; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 72d6f9c..ff8b27e 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -55,7 +55,7 @@ @Override protected int initLayoutView() { - return R.layout.fragment_verify_case_verify; + return R.layout.fragment_verify_case; } @Override diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 1b99038..e664e81 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,6 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index f857ebb..6bea75a 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -248,6 +248,8 @@ return R.drawable.ic_sanbao; case "商铺变更": return R.drawable.ic_shangpu; + case "部门处置": + return R.drawable.ic_dept; default: return R.mipmap.app_logo; } diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml new file mode 100644 index 0000000..dd4ac71 --- /dev/null +++ b/app/src/main/res/drawable/ic_dept.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml index 3846f25..820b406 100644 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ b/app/src/main/res/drawable/ic_sanbao.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml new file mode 100644 index 0000000..af293cb --- /dev/null +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case.xml b/app/src/main/res/layout/fragment_check_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_check_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_check.xml b/app/src/main/res/layout/fragment_check_case_check.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_check.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_check_case_checked.xml b/app/src/main/res/layout/fragment_check_case_checked.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_check_case_checked.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case.xml b/app/src/main/res/layout/fragment_handle_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_handle_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_handled.xml b/app/src/main/res/layout/fragment_handle_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_overtime.xml b/app/src/main/res/layout/fragment_handle_case_overtime.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_overtime.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_todo.xml b/app/src/main/res/layout/fragment_handle_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_handle_case_urgent.xml b/app/src/main/res/layout/fragment_handle_case_urgent.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_handle_case_urgent.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case.xml b/app/src/main/res/layout/fragment_overtime_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_overtime_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_handled.xml b/app/src/main/res/layout/fragment_overtime_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overtime_case_todo.xml b/app/src/main/res/layout/fragment_overtime_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_overtime_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_case.xml b/app/src/main/res/layout/fragment_package_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_package_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_done.xml b/app/src/main/res/layout/fragment_package_done.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_done.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_package_todo.xml b/app/src/main/res/layout/fragment_package_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_package_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case.xml b/app/src/main/res/layout/fragment_urgent_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_urgent_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_handled.xml b/app/src/main/res/layout/fragment_urgent_case_handled.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_handled.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_urgent_case_todo.xml b/app/src/main/res/layout/fragment_urgent_case_todo.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_urgent_case_todo.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_verify_case.xml b/app/src/main/res/layout/fragment_verify_case.xml new file mode 100644 index 0000000..84ebd81 --- /dev/null +++ b/app/src/main/res/layout/fragment_verify_case.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_verify_case_verifid.xml b/app/src/main/res/layout/fragment_verify_case_verifid.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_verify_case_verifid.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_verify_case_verify.xml b/app/src/main/res/layout/fragment_verify_case_verify.xml deleted file mode 100644 index 84ebd81..0000000 --- a/app/src/main/res/layout/fragment_verify_case_verify.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file