Browse Source

up-bmls:(2019-02-14)v(开发版本):新增工作区域模块,新建工作区域实体类,城市选择切换对应的区域商圈。发布,跟进接口增加字段,支持分站加盟。

dingchao 4 years ago
parent
commit
56c0177dfc

+ 10 - 0
.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+      <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+      <option name="REPORT_CONSTANT_REFERENCE_VALUES" value="false" />
+    </inspection_tool>
+  </profile>
+</component>

+ 10 - 0
.idea/libraries/Gradle__cn_sharesdk_OneKeyShare_3_7_1.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:OneKeyShare-3.7.1">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/OneKeyShare-3.7.1.aar/f9d8dcbca74a343b5a2b4d7bf9d17c44/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/OneKeyShare-3.7.1.aar/f9d8dcbca74a343b5a2b4d7bf9d17c44/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 11 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_3_7_1.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-3.7.1">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ShareSDK-3.7.1.aar/b93a3aa304ab429f09fef98250caf46d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ShareSDK-3.7.1.aar/b93a3aa304ab429f09fef98250caf46d/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ShareSDK-3.7.1.aar/b93a3aa304ab429f09fef98250caf46d/jars/libs/ShareSDK-Core-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_QQ_3_7_1_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-QQ:3.7.1@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.sharesdk/ShareSDK-QQ/3.7.1/f0c8ae9bae166e88170e312c4ae215d2713b85a8/ShareSDK-QQ-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_QQ_Core_3_7_1_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-QQ-Core:3.7.1@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.sharesdk/ShareSDK-QQ-Core/3.7.1/850675f12b3d8d9b26c6ce1875bc364747f36b79/ShareSDK-QQ-Core-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_SinaWeibo_3_7_1_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-SinaWeibo:3.7.1@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.sharesdk/ShareSDK-SinaWeibo/3.7.1/db98dd8f3728c7a035d5d85b67bb9513396b6004/ShareSDK-SinaWeibo-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_Wechat_3_7_1_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-Wechat:3.7.1@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.sharesdk/ShareSDK-Wechat/3.7.1/91ee2bf0e4f1a74062640593d383c06edd8a4949/ShareSDK-Wechat-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_Wechat_Core_3_7_1_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-Wechat-Core:3.7.1@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.sharesdk/ShareSDK-Wechat-Core/3.7.1/851d1c4c54a2e1ac384c228bd8af2c83a4356635/ShareSDK-Wechat-Core-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_Wechat_Favorite_3_7_1_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-Wechat-Favorite:3.7.1@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.sharesdk/ShareSDK-Wechat-Favorite/3.7.1/c8d798fe18b15d1bca1648e64c3ffee7be541bb2/ShareSDK-Wechat-Favorite-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__cn_sharesdk_ShareSDK_Wechat_Moments_3_7_1_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: cn.sharesdk:ShareSDK-Wechat-Moments:3.7.1@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.sharesdk/ShareSDK-Wechat-Moments/3.7.1/e60e184fa1db66c609f433b9e9a1f5c460f5fca3/ShareSDK-Wechat-Moments-3.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__com_mob_MobCommons_2020_0212_1229_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: com.mob:MobCommons:2020.0212.1229@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mob/MobCommons/2020.0212.1229/d4f8fda695d46a53c70ee859c073328fca939b3b/MobCommons-2020.0212.1229.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/Gradle__com_mob_MobTools_2020_0120_1535_jar.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: com.mob:MobTools:2020.0120.1535@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mob/MobTools/2020.0120.1535/7e5069780138c977ab8c085e7a65fc25702b4559/MobTools-2020.0120.1535.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 12 - 0
.idea/libraries/Gradle__com_zhy_okhttputils_2_4_1.xml

@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: com.zhy:okhttputils-2.4.1">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okhttputils-2.4.1.aar/cd4c96ede3655879896e0a0ae01f9d2d/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okhttputils-2.4.1.aar/cd4c96ede3655879896e0a0ae01f9d2d/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.zhy/okhttputils/2.4.1/4c8989cf46f0281461549b6c6ca4026aaa080219/okhttputils-2.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

BIN
apk/release/cbmls-v开发版-youpu.apk


+ 553 - 0
app/src/main/java/com/up/upcbmls/view/activity/WorkAreaActivity.java

@@ -0,0 +1,553 @@
+package com.up.upcbmls.view.activity;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.alibaba.fastjson.JSONObject;
+import com.up.upcbmls.R;
+import com.up.upcbmls.adapter.PopAreasOneAdapter;
+import com.up.upcbmls.adapter.PopAreasTwoAdapter;
+import com.up.upcbmls.adapter.PopCityAdapter;
+import com.up.upcbmls.adapter.PopLxAdapter;
+import com.up.upcbmls.adapter.PopWorkAreasOneAdapter;
+import com.up.upcbmls.adapter.PopWorkAreasTwoAdapter;
+import com.up.upcbmls.adapter.PopWylxAdapter;
+import com.up.upcbmls.base.BaseActivity;
+import com.up.upcbmls.entity.ReleaseShopDictionaryEntity;
+import com.up.upcbmls.entity.ReleaseShopDictionaryEntity.ShopTypeBean;
+import com.up.upcbmls.entity.SelectCityListEntity;
+import com.up.upcbmls.entity.WorkAreaEntity;
+import com.up.upcbmls.entity.WorkAreaSqEntity;
+import com.up.upcbmls.presenter.impl.WorkAreaAPresenterImpl;
+import com.up.upcbmls.presenter.inter.IWorkAreaAPresenter;
+import com.up.upcbmls.util.DialogUtil;
+import com.up.upcbmls.util.Tool;
+import com.up.upcbmls.view.diy.popup.CommonPopupWindow;
+import com.up.upcbmls.view.inter.IWorkAreaAView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * @ClassName: WorkAreaActivity
+ * @Description:
+ * @Author: dingchao
+ * @Date: 2020/1/7 17:05
+ */
+public class WorkAreaActivity extends BaseActivity implements OnClickListener, IWorkAreaAView {
+    @BindView(R.id.tv_app_title_title)
+    TextView tv_app_title_title;
+    @BindView(R.id.rl_app_title_return)
+    RelativeLayout rl_app_title_return;
+    private IWorkAreaAPresenter mIWorkAreaAPresenter;
+
+    @BindView(R.id.tv_activity_work_area_dqgzcs)
+    TextView tv_activity_work_area_dqgzcs;
+    @BindView(R.id.tv_activity_work_area_qy)
+    TextView tv_activity_work_area_qy;
+    @BindView(R.id.tv_activity_work_area_sq)
+    TextView tv_activity_work_area_sq;
+    @BindView(R.id.tv_activity_work_area_gzdwylx)
+    TextView tv_activity_work_area_gzdwylx;
+
+    @BindView(R.id.rl_activity_work_area_dqgzcs)
+    RelativeLayout rl_activity_work_area_dqgzcs;
+    @BindView(R.id.rl_activity_work_area_qy)
+    RelativeLayout rl_activity_work_area_qy;
+    @BindView(R.id.rl_activity_work_area_gzdwylx)
+    RelativeLayout rl_activity_work_area_gzdwylx;
+
+    Dialog mDialog;
+    Dialog mDialog2;
+    Dialog mDialog3;
+    Dialog mDialog4;
+
+    private String cityIdStr = "1";//默认为1
+    private String cityIdStrV = "1";//后台传值城市
+    private String QSStrV = "1";//后台传值区域商圈
+    private String areasOneV = "";//区域一级id
+    private String areasTwoV = "";//区域二级id
+    private String wylxV = "";//区域二级id
+
+    //城市
+    CommonPopupWindow window_city;
+    PopupWindow win_city;
+    ListView lv_areas_one_fkfs;
+    ListView lv_areas_two_fkfs;
+    PopCityAdapter popFkfsAdapter;
+    SelectCityListEntity selectCityListEntity;
+    @BindView(R.id.activity_popup)
+    LinearLayout activity_popup;
+
+
+    //区域商圈
+    //位置,区域 2
+    CommonPopupWindow window_wz;
+    PopupWindow win_wz;
+    PopWorkAreasOneAdapter popAreasOneAdapter;
+    PopWorkAreasTwoAdapter popAreasTwoAdapter;
+    //用来拼接区域展示的文字
+    String areasOne = "";
+    String areasTwo = "";
+    ListView lv_areas_one;
+    ListView lv_areas_two;
+    List<WorkAreaSqEntity.ListBean.BusinessCirclesBean> childListBeanXList = new ArrayList<>();
+
+
+    //物业类型
+    CommonPopupWindow window_wylx;
+    PopupWindow win_wylx;
+    ListView lv_areas_one_wylx;
+    ListView lv_areas_two_wylx;
+    PopWylxAdapter popWylxAdapter;
+
+
+    @BindView(R.id.btn_activity_update)
+    Button btn_activity_update;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.rl_app_title_return:
+                finish();
+                break;
+            case R.id.rl_activity_work_area_dqgzcs:
+                openCityPop();
+                break;
+            case R.id.rl_activity_work_area_qy://区域商圈
+                openAreasPop();
+                break;
+            case R.id.rl_activity_work_area_gzdwylx://关注的物业类型
+                openWylxPop();
+                break;
+            case R.id.btn_activity_update://确认修改
+                updateDataCommit();
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * 数据提交
+     */
+    private void updateDataCommit() {
+
+        if (TextUtils.isEmpty(areasOneV) || TextUtils.isEmpty(areasTwoV)) {
+            Toast.makeText(mContext, "请选择区域商圈", Toast.LENGTH_SHORT).show();
+        } else if (TextUtils.isEmpty(wylxV)) {
+            Toast.makeText(mContext, "请选择关注的物业类型", Toast.LENGTH_SHORT).show();
+        } else {
+            /*
+id:当前登录用户id
+cityId:城市id
+areaId:区域id
+businessId:商圈id
+wyType:物业类型
+
+http://localhost:8200/userWorkCity/saveUserWorkCity
+?id=1&cityId=1&areaId=4&businessId=1&wyType=1*/
+            mDialog4 = DialogUtil.createLoadingDialog(mContext, "加载中...");
+            mIWorkAreaAPresenter.commitData(Tool.getUser(mContext).getData().getId()
+                    , cityIdStrV, areasOneV, areasTwoV, wylxV);
+        }
+    }
+
+    @Override
+    protected int getLayout() {
+        return R.layout.activity_work_area;
+    }
+
+    @Override
+    protected void initEvent() {
+        tv_app_title_title.setText("工作区域");
+        rl_app_title_return.setOnClickListener(this);
+
+        mIWorkAreaAPresenter = new WorkAreaAPresenterImpl(this);
+        initListener();
+
+        //首先进行数据回显数据展示
+        mDialog = DialogUtil.createLoadingDialog(mContext, "加载中...");
+        mIWorkAreaAPresenter.findEntityById(Tool.getUser(mContext).getData().getId());
+        //获取城市数据列表
+        mIWorkAreaAPresenter.getOpenedCityList();
+    }
+
+    private void initListener() {
+        rl_activity_work_area_dqgzcs.setOnClickListener(this);
+        rl_activity_work_area_qy.setOnClickListener(this);
+        rl_activity_work_area_gzdwylx.setOnClickListener(this);
+        btn_activity_update.setOnClickListener(this);
+
+    }
+
+    @Override
+    public <T> T request(int requestFlag) {
+        return null;
+    }
+
+    @Override
+    public <T> void response(T response, int responseFlag) {
+        switch (responseFlag) {
+            case 1://工作管理数据回显绑定
+                String str = (String) response;
+                WorkAreaEntity workAreaEntity = JSONObject.parseObject(str, WorkAreaEntity.class);
+                initDataViewBind(workAreaEntity);
+                break;
+            case 2://获取开通城市数据信息,底部弹窗数据绑定
+                selectCityListEntity = (SelectCityListEntity) response;
+                initCityData(selectCityListEntity.getData());
+                break;
+            case 3://区域商圈数据加载绑定
+                String str2 = (String) response;
+                WorkAreaSqEntity workAreaSqEntity = JSONObject.parseObject(str2, WorkAreaSqEntity.class);
+                initSqLxDataViewBind(workAreaSqEntity);
+                break;
+            case 4://保存成功
+                if (mDialog4 != null) {
+                    DialogUtil.closeDialog(mDialog4);
+                }
+                Toast.makeText(mContext, "信息保存成功~", Toast.LENGTH_SHORT).show();
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * 区域商圈,物业类型数据绑定
+     *
+     * @param workAreaSqEntity
+     */
+    private void initSqLxDataViewBind(WorkAreaSqEntity workAreaSqEntity) {
+        //区域商圈数据绑定
+        initAreasDataBind(workAreaSqEntity.getList());
+        //类型绑定
+        initWylxData(workAreaSqEntity.getWyTypeList());
+        if (mDialog2 != null) {
+            DialogUtil.closeDialog(mDialog2);
+        }
+        if (mDialog3 != null) {
+            DialogUtil.closeDialog(mDialog3);
+        }
+    }
+
+    /**
+     * 区域商圈赋值
+     *
+     * @param shopAreas
+     */
+    private void initAreasDataBind(List<WorkAreaSqEntity.ListBean> shopAreas) {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        int screenHeight = metrics.heightPixels;
+        window_wz = new CommonPopupWindow(mContext, R.layout.pop_arease, ViewGroup.LayoutParams.MATCH_PARENT, (int) (screenHeight * 0.5)) {
+            @Override
+            protected void initView() {
+                View view = getContentView();
+                lv_areas_one = view.findViewById(R.id.lv_item_double_list_1);
+                lv_areas_two = view.findViewById(R.id.lv_item_double_list_2);
+
+                //赋值操作
+                //区域
+                popAreasOneAdapter = new PopWorkAreasOneAdapter(mContext, shopAreas);
+                lv_areas_one.setAdapter(popAreasOneAdapter);
+
+                //商圈
+                popAreasTwoAdapter = new PopWorkAreasTwoAdapter(mContext, shopAreas.get(0).getBusinessCircles());
+                lv_areas_two.setAdapter(popAreasTwoAdapter);
+            }
+
+            @Override
+            protected void initEvent() {
+
+                //设置点击事件
+                lv_areas_one.setOnItemClickListener((parent, view, position, id) -> {
+                    //改变选中的字体颜色
+                    popAreasOneAdapter.setCheckItem(position);
+                    //点击赋值操作
+                    areasOne = shopAreas.get(position).getName();
+                    areasOneV = shopAreas.get(position).getId();
+
+                    //重新给二级赋值
+                    childListBeanXList = shopAreas.get(position).getBusinessCircles();
+                    popAreasTwoAdapter = new PopWorkAreasTwoAdapter(mContext, childListBeanXList);
+                    lv_areas_two.setAdapter(popAreasTwoAdapter);
+                    //二级点击事件
+                    lv_areas_two.setOnItemClickListener((parent1, view1, position1, id1) -> {
+                        popAreasTwoAdapter.setCheckItem(position1);
+                        areasTwo = childListBeanXList.get(position1).getName();
+                        areasTwoV = childListBeanXList.get(position1).getId();
+                        //页面选择之后展示
+                        if (areasOne.equals("请选择") && areasTwo.equals("请选择")) {
+                            tv_activity_work_area_qy.setText("请选择区域商圈");
+                        } else {
+                            tv_activity_work_area_qy.setText(areasOne + "-" + areasTwo);
+                        }
+                        window_wz.dismisss();
+                    });
+                });
+
+                //如果没有点击第一个列表直接点击二级,默认父级为一级
+                lv_areas_two.setOnItemClickListener((parent, view, position, id) -> {
+                    popAreasTwoAdapter.setCheckItem(position);
+                    if (position == 0) {
+                        tv_activity_work_area_qy.setText("请选择区域上去按");
+                    } else {
+                        tv_activity_work_area_qy.setText(shopAreas.get(0).getName()
+                                + "-" + shopAreas.get(0).getBusinessCircles().get(position).getName());
+                    }
+                    areasOneV = shopAreas.get(0).getId();
+                    areasTwoV = shopAreas.get(0).getBusinessCircles().get(position).getId();
+                    window_wz.dismisss();
+                });
+            }
+
+            @Override
+            protected void initWindow() {
+                super.initWindow();
+                PopupWindow instance = getPopupWindow();
+                instance.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        WindowManager.LayoutParams lp = getWindow().getAttributes();
+                        lp.alpha = 1.0f;
+                        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                        getWindow().setAttributes(lp);
+                    }
+                });
+            }
+        };
+    }
+
+    private void initDataViewBind(WorkAreaEntity workAreaEntity) {
+        cityIdStr = workAreaEntity.getData().getCityId();
+        cityIdStrV = workAreaEntity.getData().getCityId();
+
+        areasOneV = workAreaEntity.getData().getAreaId();
+        areasTwoV = workAreaEntity.getData().getBusinessId();
+
+        wylxV = workAreaEntity.getData().getWyType();
+
+        //知道当前城市获取当前的区域内容
+        mIWorkAreaAPresenter.findAreaBusinessList(cityIdStr);
+        //先判断当前用户是否保存过工作区域,如果有true展示保存内容,否则默认值处理
+        tv_activity_work_area_dqgzcs.setText(workAreaEntity.getData().getCityName());
+        //
+        if (workAreaEntity.isFlag()) {//保存过工作区域
+            tv_activity_work_area_qy.setText(workAreaEntity.getData().getAreaName() + "-" + workAreaEntity.getData().getBusinessName());
+            tv_activity_work_area_gzdwylx.setText(workAreaEntity.getData().getWyName());
+
+        } else {
+            tv_activity_work_area_qy.setText("请选择区域商圈");
+            tv_activity_work_area_gzdwylx.setText("请选择关注的物业类型");
+        }
+
+        if (mDialog != null) {
+            DialogUtil.closeDialog(mDialog);
+        }
+    }
+
+
+    /**
+     * 城市底部弹窗框
+     *
+     * @param payMethodList
+     */
+    private void initCityData(List<SelectCityListEntity.DataBean> payMethodList) {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        int screenHeight = metrics.heightPixels;
+        window_city = new CommonPopupWindow(mContext, R.layout.pop_arease, ViewGroup.LayoutParams.MATCH_PARENT, (int) (screenHeight * 0.4)) {
+            @Override
+            protected void initView() {
+                View view = getContentView();
+                lv_areas_one_fkfs = view.findViewById(R.id.lv_item_double_list_1);
+                lv_areas_two_fkfs = view.findViewById(R.id.lv_item_double_list_2);
+
+                lv_areas_two_fkfs.setVisibility(View.GONE);
+                //赋值操作
+                //区域
+                popFkfsAdapter = new PopCityAdapter(mContext, payMethodList);
+                lv_areas_one_fkfs.setAdapter(popFkfsAdapter);
+            }
+
+            @Override
+            protected void initEvent() {
+                //设置点击事件
+                lv_areas_one_fkfs.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                        //改变选中的字体颜色
+                        popFkfsAdapter.setCheckItem(position);
+                        //点击赋值操作
+                        cityIdStrV = payMethodList.get(position).getId();
+                        cityIdStr = payMethodList.get(position).getId();
+                        tv_activity_work_area_dqgzcs.setText(payMethodList.get(position).getName());
+                        window_city.dismisss();
+                        getQsData(cityIdStr);
+                        //
+                    }
+                });
+            }
+
+            @Override
+            protected void initWindow() {
+                super.initWindow();
+                PopupWindow instance = getPopupWindow();
+                instance.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        WindowManager.LayoutParams lp = getWindow().getAttributes();
+                        lp.alpha = 1.0f;
+                        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                        getWindow().setAttributes(lp);
+                    }
+                });
+            }
+        };
+
+
+        if (mDialog3 != null) {
+            DialogUtil.closeDialog(mDialog3);
+        }
+    }
+
+    /**
+     * 物业类型
+     *
+     * @param payMethodList
+     */
+    private void initWylxData(List<WorkAreaSqEntity.WyTypeListBean> payMethodList) {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        int screenHeight = metrics.heightPixels;
+        window_wylx = new CommonPopupWindow(mContext, R.layout.pop_arease, ViewGroup.LayoutParams.MATCH_PARENT, (int) (screenHeight * 0.4)) {
+            @Override
+            protected void initView() {
+                View view = getContentView();
+                lv_areas_one_wylx = view.findViewById(R.id.lv_item_double_list_1);
+                lv_areas_two_wylx = view.findViewById(R.id.lv_item_double_list_2);
+
+                lv_areas_two_wylx.setVisibility(View.GONE);
+                //赋值操作
+                //区域
+                popWylxAdapter = new PopWylxAdapter(mContext, payMethodList);
+                lv_areas_one_wylx.setAdapter(popWylxAdapter);
+            }
+
+            @Override
+            protected void initEvent() {
+                //设置点击事件
+                lv_areas_one_wylx.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                        //改变选中的字体颜色
+                        popWylxAdapter.setCheckItem(position);
+                        //点击赋值操作
+                        wylxV = payMethodList.get(position).getD_value();
+                        tv_activity_work_area_gzdwylx.setText(payMethodList.get(position).getD_name());
+                        window_wylx.dismisss();
+                    }
+                });
+            }
+
+            @Override
+            protected void initWindow() {
+                super.initWindow();
+                PopupWindow instance = getPopupWindow();
+                instance.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        WindowManager.LayoutParams lp = getWindow().getAttributes();
+                        lp.alpha = 1.0f;
+                        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                        getWindow().setAttributes(lp);
+                    }
+                });
+            }
+        };
+
+    }
+
+
+    private void getQsData(String cityid) {
+        //http://localhost:8200/userWorkCity/findAreaBusinessList?
+        tv_activity_work_area_qy.setText("请选择区域商圈");
+        mDialog2 = DialogUtil.createLoadingDialog(mContext, "加载中...");
+        mIWorkAreaAPresenter.findAreaBusinessList(cityid);
+    }
+
+
+    /**
+     * 城市弹窗打开
+     */
+    private void openCityPop() {
+        Tool.hideKeyboard(WorkAreaActivity.this, activity_popup);
+        win_city = window_city.getPopupWindow();
+        win_city.setAnimationStyle(R.style.animTranslate);
+
+        window_city.showAtLocation(activity_popup, Gravity.BOTTOM, 0, 0);
+        WindowManager.LayoutParams lp = getWindow().getAttributes();
+        lp.alpha = 0.3f;
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+//        lp.width=activityPopup.getWidth()* 9 / 10; // 设置宽度
+        getWindow().setAttributes(lp);
+    }
+
+    /**
+     * 区域商圈打开
+     */
+    private void openAreasPop() {
+        Tool.hideKeyboard(WorkAreaActivity.this, activity_popup);
+        win_wz = window_wz.getPopupWindow();
+        win_wz.setAnimationStyle(R.style.animTranslate);
+
+        window_wz.showAtLocation(activity_popup, Gravity.BOTTOM, 0, 0);
+        WindowManager.LayoutParams lp = getWindow().getAttributes();
+        lp.alpha = 0.3f;
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+//        lp.width=activityPopup.getWidth()* 9 / 10; // 设置宽度
+        getWindow().setAttributes(lp);
+    }
+
+    /**
+     * 城市弹窗打开
+     */
+    private void openWylxPop() {
+        Tool.hideKeyboard(WorkAreaActivity.this, activity_popup);
+        win_wylx = window_wylx.getPopupWindow();
+        win_wylx.setAnimationStyle(R.style.animTranslate);
+
+        window_wylx.showAtLocation(activity_popup, Gravity.BOTTOM, 0, 0);
+        WindowManager.LayoutParams lp = getWindow().getAttributes();
+        lp.alpha = 0.3f;
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+//        lp.width=activityPopup.getWidth()* 9 / 10; // 设置宽度
+        getWindow().setAttributes(lp);
+    }
+}

+ 123 - 0
app/src/main/java/com/up/upcbmls/view/test/PopShare.java

@@ -0,0 +1,123 @@
+package com.up.upcbmls.view.test;
+
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+
+import com.mob.MobSDK;
+import com.up.upcbmls.R;
+import com.up.upcbmls.base.BaseActivity;
+import com.up.upcbmls.view.diy.popup.CommonPopupWindow;
+
+import cn.sharesdk.onekeyshare.OnekeyShare;
+import cn.sharesdk.wechat.favorite.WechatFavorite;
+import cn.sharesdk.wechat.friends.Wechat;
+
+/**
+ * @ClassName: PopShare
+ * @Description:分享自定义样式
+ * @Author: dingchao
+ * @Date: 2019/10/21 16:51
+ */
+public class PopShare extends BaseActivity implements View.OnClickListener {
+    CommonPopupWindow window_wz;
+    PopupWindow win_wz;
+    LinearLayout wx, wxpyq;
+
+    private void initAreasDataBind() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        int screenHeight = metrics.heightPixels;
+        new CommonPopupWindow(mContext, R.layout.pop_share, ViewGroup.LayoutParams.MATCH_PARENT, (int) (screenHeight * 0.3)) {
+            @Override
+            protected void initView() {
+                //View 设置区域
+                View view = getContentView();
+                wx = view.findViewById(R.id.ll_pop_share_wx);
+                wxpyq = view.findViewById(R.id.ll_pop_share_wxpyq);
+            }
+
+            @Override
+            protected void initEvent() {
+                wx.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        //微信分享
+                        showShare(Wechat.NAME);
+                        window_wz.dismisss();
+                    }
+                });
+                wxpyq.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        showShare(WechatFavorite.NAME);
+                        window_wz.dismisss();
+                    }
+                });
+            }
+
+            @Override
+            protected void initWindow() {
+                super.initWindow();
+                PopupWindow instance = getPopupWindow();
+                instance.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        WindowManager.LayoutParams lp = getWindow().getAttributes();
+                        lp.alpha = 1.0f;
+                        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                        getWindow().setAttributes(lp);
+                    }
+                });
+            }
+        };
+    }
+
+    private void showShare(String platform) {
+        OnekeyShare oks = new OnekeyShare();
+        //指定分享的平台,如果为空,还是会调用九宫格的平台列表界面
+        if (platform != null) {
+            oks.setPlatform(platform);
+        }
+        // title标题,印象笔记、邮箱、信息、微信、人人网和QQ空间使用
+        oks.setTitle("标题");
+        // titleUrl是标题的网络链接,仅在Linked-in,QQ和QQ空间使用
+        oks.setTitleUrl("http://sharesdk.cn");
+        // text是分享文本,所有平台都需要这个字段
+        oks.setText("我是分享文本");
+        //分享网络图片,新浪微博分享网络图片需要通过审核后申请高级写入接口,否则请注释掉测试新浪微博
+        oks.setImageUrl("http://f1.sharesdk.cn/imgs/2014/02/26/owWpLZo_638x960.jpg");
+        // url仅在微信(包括好友和朋友圈)中使用
+        oks.setUrl("http://sharesdk.cn");
+        //启动分享
+        oks.show(MobSDK.getContext());
+    }
+
+    @Override
+    public void onClick(View v) {
+
+        //在需要分享的地方
+//        win_wz = window_wz.getPopupWindow();
+//        win_wz.setAnimationStyle(R.style.animTranslate);
+//
+//        window_wz.showAtLocation(activity_popup, Gravity.BOTTOM, 0, 0);
+//        WindowManager.LayoutParams lp = getActivity().getWindow().getAttributes();
+//        lp.alpha = 0.3f;
+//        getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+//        getActivity().getWindow().setAttributes(lp);
+    }
+
+    @Override
+    protected int getLayout() {
+        return 0;
+    }
+
+    @Override
+    protected void initEvent() {
+
+    }
+}

+ 163 - 0
app/src/main/res/layout/activity_work_area.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/activity_popup"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+    <!--工作区域-->
+    <include layout="@layout/include_app_title" />
+
+    <!--当前工作城市-->
+    <RelativeLayout
+        android:id="@+id/rl_activity_work_area_dqgzcs"
+        android:layout_width="match_parent"
+        android:layout_height="58dp"
+        android:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="19dp"
+            android:text="当前工作区域"
+            android:textColor="@color/color_333333"
+            android:textSize="15dp" />
+
+        <TextView
+            android:id="@+id/tv_activity_work_area_dqgzcs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="30dp"
+            android:text="北京"
+            android:textColor="@color/color_9f9f8a"
+            android:textSize="14dp" />
+
+        <ImageView
+            style="@style/style_fragment_me_dx_linear_go"
+            android:layout_marginRight="19dp" />
+    </RelativeLayout>
+
+    <include layout="@layout/include_app_line_margin" />
+    <!--区域-->
+    <RelativeLayout
+        android:id="@+id/rl_activity_work_area_qy"
+        android:layout_width="match_parent"
+        android:layout_height="58dp"
+        android:visibility="visible">
+
+        <TextView
+            android:id="@+id/tv_activity_work_area_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="19dp"
+            android:text="区域-商圈"
+            android:textColor="@color/color_333333"
+            android:textSize="15dp" />
+
+        <TextView
+            android:id="@+id/tv_activity_work_area_qy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="30dp"
+            android:layout_toRightOf="@+id/tv_activity_work_area_text"
+            android:gravity="right"
+            android:text="朝阳区-永安里"
+            android:textColor="@color/color_9f9f8a"
+            android:textSize="14dp" />
+
+        <ImageView
+            style="@style/style_fragment_me_dx_linear_go"
+            android:layout_marginRight="19dp" />
+    </RelativeLayout>
+
+    <include layout="@layout/include_app_line_margin" />
+    <!--商圈-->
+    <RelativeLayout
+        android:id="@+id/rl_activity_work_area_sq"
+        android:layout_width="match_parent"
+        android:layout_height="58dp"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="19dp"
+            android:text="商圈"
+            android:textColor="@color/color_333333"
+            android:textSize="15dp" />
+
+        <TextView
+            android:id="@+id/tv_activity_work_area_sq"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="30dp"
+            android:text="永安里"
+            android:textColor="@color/color_9f9f8a"
+            android:textSize="14dp" />
+
+        <ImageView
+            style="@style/style_fragment_me_dx_linear_go"
+            android:layout_marginRight="19dp" />
+    </RelativeLayout>
+
+    <!--<include layout="@layout/include_app_line_margin" />-->
+    <!--关注的物业类型-->
+    <RelativeLayout
+        android:id="@+id/rl_activity_work_area_gzdwylx"
+        android:layout_width="match_parent"
+        android:layout_height="58dp"
+        android:visibility="visible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="19dp"
+            android:text="关注的物业类型"
+            android:textColor="@color/color_333333"
+            android:textSize="15dp" />
+
+        <TextView
+            android:id="@+id/tv_activity_work_area_gzdwylx"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="30dp"
+            android:text="住宅"
+            android:textColor="@color/color_9f9f8a"
+            android:textSize="14dp" />
+
+        <ImageView
+            style="@style/style_fragment_me_dx_linear_go"
+            android:layout_marginRight="19dp" />
+    </RelativeLayout>
+
+    <include layout="@layout/include_app_line_margin" />
+
+
+    <!--确认提交按钮-->
+    <!--按钮区域-->
+    <Button
+        android:id="@+id/btn_activity_update"
+        android:layout_width="match_parent"
+        android:layout_height="43dp"
+        android:layout_below="@+id/rl_activity_login_pwd"
+        android:layout_marginLeft="26dp"
+        android:layout_marginRight="26dp"
+        android:layout_marginTop="25dp"
+        android:background="@drawable/shape_activity_login_btn_bg"
+        android:text="确认修改"
+        android:textColor="@color/color_white"
+        android:textSize="15dp" />
+</LinearLayout>