智慧产城首页默认服务

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

@@ -413,7 +413,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 } else {
                     ViewUtil.ToastMessage(OAActivity.this, getString(R.string.common_notlinknet), Style.holoRedLight, 2000);
                     if (mPullToRefreshScrollView.isRefreshing()) {
-//                        loadSuccess();
+//                        requestSuccess();
                         mPullToRefreshScrollView.onRefreshComplete(1000);
                     }
                 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -181,7 +181,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     }
 
     @Override
-    public void loadSuccess(int what, Object object) {
+    public void requestSuccess(int what, Object object) {
         if (what == Constants.LOAD_WORK_MENU_CACHE) {
             mCacheMenuTypeBeans = (List<WorkMenuBean>) object;
             mWorkMenuBeans.clear();
@@ -358,7 +358,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
     }
 
     @Override
-    public void showError(String errorMsg) {
+    public void requestError(int what, String errorMsg) {
         toast(errorMsg);
     }
 }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sun Nov 26 17:38:26 CST 2017
+#Mon Nov 27 11:51:42 CST 2017
 debugName=1
-versionName=618
+versionName=619
 debugCode=90
-versionCode=118
+versionCode=119

app_core/common/src/main/res/values/styles.xml

@@ -43,7 +43,7 @@
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
     </style>
 
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+    <style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">
 
     </style>
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryFuncSetActivity.java

@@ -119,7 +119,7 @@ public class CityIndustryFuncSetActivity extends BaseMVPActivity<WorkPlatPresent
     }
 
     @Override
-    public void loadSuccess(int what, Object object) {
+    public void requestSuccess(int what, Object object) {
         if (what == OBTAIN_CITY_INDUSTRY_SERVICE) {
             if (object != null) {
                 Log.e("CityIndustryActivity", "service_success = " + object.toString());
@@ -147,7 +147,7 @@ public class CityIndustryFuncSetActivity extends BaseMVPActivity<WorkPlatPresent
     }
 
     @Override
-    public void showError(String errorMsg) {
+    public void requestError(int what, String errorMsg) {
         Log.e("CityIndustryActivity", "error = " + errorMsg);
         toast(errorMsg);
     }

app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryServiceMainActivity.java

@@ -12,6 +12,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,7 +24,13 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewSwitcher;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.common.data.JSONUtil;
 import com.core.base.activity.BaseMVPActivity;
+import com.core.net.http.http.Request;
+import com.core.utils.CommonUtil;
 import com.core.utils.StatusBarUtil;
 import com.core.widget.RecycleViewDivider;
 import com.scwang.smartrefresh.layout.api.RefreshHeader;
@@ -34,7 +41,7 @@ import com.uas.appworks.R;
 import com.uas.appworks.adapter.CityIndustryCircleFuncAdapter;
 import com.uas.appworks.adapter.CityIndustryNewsListAdapter;
 import com.uas.appworks.model.bean.CityIndustryAnnounceBean;
-import com.uas.appworks.model.bean.CityIndustryMenuBean;
+import com.uas.appworks.model.bean.CityIndustryServiceBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
 import com.uas.appworks.view.WorkPlatView;
 import com.youth.banner.Banner;
@@ -42,7 +49,10 @@ import com.youth.banner.loader.ImageLoader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author RaoMeng
@@ -52,6 +62,7 @@ import java.util.List;
 
 public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPresenter> implements WorkPlatView {
     private final int ANNOUNCE_LOOP_FLAG = 0x01;
+    private final int GET_DEFAULT_SERVICE = 0x02;
 
     private AppBarLayout mAppBarLayout;
     private RecyclerView mFuncRecyclerView, mNewsRecyclerView;
@@ -59,10 +70,12 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
     private TextSwitcher mAnnounceTextSwitcher;
     private Banner mBanner;
     private RefreshLayout mRefreshLayout;
+    private ImageView mBackImageView;
+    private View mFuncLine;
     private List<CityIndustryAnnounceBean> mCityIndustryAnnounceBeans;
     private int mSwitcherCount = 0;
     private CityIndustryCircleFuncAdapter mCityIndustryFuncAdapter;
-    private List<CityIndustryMenuBean.ServesBean> mServesBeans;
+    private List<CityIndustryServiceBean> mServesBeans;
     private CityIndustryNewsListAdapter mCityIndustryNewsListAdapter;
 
     private Handler mHandler = new Handler() {
@@ -100,11 +113,13 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
         StatusBarUtil.setPaddingSmart(this, mToolbar);
 
         mAppBarLayout = $(R.id.city_industry_service_main_appbar);
+        mBackImageView = $(R.id.city_industry_service_main_back_iv);
         mFuncRecyclerView = $(R.id.city_industry_service_main_func_rv);
         mNewsRecyclerView = $(R.id.city_industry_service_main_news_rv);
         mAnnounceTextSwitcher = $(R.id.city_industry_service_main_announce_ts);
         mBanner = $(R.id.city_industry_service_main_banner);
         mRefreshLayout = $(R.id.city_industry_service_main_refreshlayout);
+        mFuncLine = $(R.id.city_industry_service_main_func_line);
 
         RecyclerView.RecycledViewPool viewPool = new RecyclerView.RecycledViewPool();
         viewPool.setMaxRecycledViews(0, 10);
@@ -136,6 +151,13 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
 
     @Override
     protected void initEvent() {
+        mBackImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+        });
+
         mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
             @Override
             public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
@@ -165,13 +187,7 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
         mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(final RefreshLayout refreshLayout) {
-                refreshLayout.getLayout().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(CityIndustryServiceMainActivity.this, "刷新成功", Toast.LENGTH_SHORT).show();
-                        refreshLayout.finishRefresh();
-                    }
-                }, 2000);
+                getDefaultService();
             }
         });
 
@@ -183,7 +199,10 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
                     intent.setClass(CityIndustryServiceMainActivity.this, CityIndustryFuncSetActivity.class);
                     startActivity(intent);
                 } else {
-                    toast(mServesBeans.get(position).getSv_name());
+                    Intent intent = new Intent("com.modular.work.CommonDataFormActivity");
+                    intent.putExtra("serve_id", mServesBeans.get(position).getSv_id() + "");
+                    intent.putExtra("mTitle", mServesBeans.get(position).getSv_name() + "");
+                    mContext.startActivity(intent);
                 }
             }
         });
@@ -191,32 +210,36 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
 
     @Override
     protected void initData() {
+        mRefreshLayout.autoRefresh(200, 1f);
+
         initTextSwitcher();
 
         mBanner.setImageLoader(new BannerImageLoader());
         mBanner.setImages(Arrays.asList(R.drawable.ic_city_industry_loop1, R.drawable.ic_city_industry_loop2, R.drawable.ic_city_industry_loop3));
         mBanner.start();
 
-        mRefreshLayout.autoRefresh(200, 1f);
-
-        for (int i = 1; i <= 9; i++) {
-            CityIndustryMenuBean.ServesBean servesBean = new CityIndustryMenuBean.ServesBean();
-            servesBean.setSv_name("服务" + i);
-            CityIndustryMenuBean.ServesBean.SvLogourlBean svLogourlBean = new CityIndustryMenuBean.ServesBean.SvLogourlBean();
-            svLogourlBean.setMobile("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1511716062774&di=155838f806a1eda977ea2ecd71050b1f&imgtype=0&src=http%3A%2F%2Fpic1.cxtuku.com%2F00%2F13%2F05%2Fb894360c182e.jpg");
-            servesBean.setSv_logourl(svLogourlBean);
-            mServesBeans.add(servesBean);
-        }
-        CityIndustryMenuBean.ServesBean servesBean = new CityIndustryMenuBean.ServesBean();
-        servesBean.setSv_name("全部服务");
-        CityIndustryMenuBean.ServesBean.SvLogourlBean svLogourlBean = new CityIndustryMenuBean.ServesBean.SvLogourlBean();
-        svLogourlBean.setMobile("http://www.iconpng.com/download/png/67384");
-        servesBean.setSv_logourl(svLogourlBean);
-        mServesBeans.add(servesBean);
-
         mCityIndustryFuncAdapter.notifyDataSetChanged();
     }
 
+    private void getDefaultService() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("kind", "cc");
+        params.put("client_type", "cc");
+        params.put("access_token", "123456");
+
+        LinkedHashMap<String, Object> header = new LinkedHashMap<>();
+        header.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+
+        Request request = new Request.Bulider()
+                .setUrl("api/serve/getDefaultServices.action")
+                .setWhat(GET_DEFAULT_SERVICE)
+                .setParam(params)
+                .setHeaders(header)
+                .setMode(Request.Mode.GET)
+                .bulid();
+        mPresenter.cityRequest(this, request);
+    }
+
 
     private void initTextSwitcher() {
         mCityIndustryAnnounceBeans = new ArrayList<>();
@@ -274,13 +297,56 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
     }
 
     @Override
-    public void loadSuccess(int what, Object object) {
-
+    public void requestSuccess(int what, Object object) {
+        switch (what) {
+            case GET_DEFAULT_SERVICE:
+                if (mRefreshLayout.isRefreshing()) {
+                    mRefreshLayout.finishRefresh();
+                }
+                String result = object.toString();
+                Log.d("citydefaultservice", result);
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONArray serviceArray = resultObject.getJSONArray("serves");
+                if (serviceArray != null) {
+                    mServesBeans.clear();
+                    for (int i = 0; i < serviceArray.size(); i++) {
+                        JSONObject serviceObject = serviceArray.getJSONObject(i);
+                        if (serviceObject != null) {
+                            CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();
+                            cityIndustryServiceBean.setSv_id(JSONUtil.getInt(serviceObject, "sv_id"));
+                            cityIndustryServiceBean.setSv_name(JSONUtil.getText(serviceObject, "sv_name"));
+                            cityIndustryServiceBean.setSv_logourl(JSONUtil.getText(serviceObject, "sv_logourl"));
+
+                            mServesBeans.add(cityIndustryServiceBean);
+                        }
+                    }
+                }
+                CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();
+                cityIndustryServiceBean.setSv_name("全部服务");
+                cityIndustryServiceBean.setSv_logourl("moreMenu");
+                mServesBeans.add(cityIndustryServiceBean);
+
+                mFuncRecyclerView.setVisibility(View.VISIBLE);
+                mFuncLine.setVisibility(View.VISIBLE);
+                mCityIndustryFuncAdapter.notifyDataSetChanged();
+                break;
+            default:
+                break;
+        }
     }
 
     @Override
-    public void showError(String errorMsg) {
-
+    public void requestError(int what, String errorMsg) {
+        switch (what) {
+            case GET_DEFAULT_SERVICE:
+                if (mRefreshLayout.isRefreshing()) {
+                    mRefreshLayout.finishRefresh();
+                }
+                Toast.makeText(this, errorMsg, Toast.LENGTH_SHORT).show();
+                break;
+            default:
+                break;
+        }
     }
 
     @Override

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkFuncSetActivity.java

@@ -82,7 +82,7 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     }
 
     @Override
-    public void loadSuccess(int what, Object object) {
+    public void requestSuccess(int what, Object object) {
         if (what == Constants.LOAD_WORK_MENU_CACHE) {
             List<WorkMenuBean> menuTypeBeans = (List<WorkMenuBean>) object;
             mWorkMenuBeans.clear();
@@ -99,7 +99,7 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     }
 
     @Override
-    public void showError(String errorMsg) {
+    public void requestError(int what, String errorMsg) {
 
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkModuleSortActivity.java

@@ -126,7 +126,7 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
     }
 
     @Override
-    public void loadSuccess(int what, Object object) {
+    public void requestSuccess(int what, Object object) {
         if (what == Constants.LOAD_WORK_MENU_CACHE) {
             List<WorkMenuBean> menuTypeBeans = (List<WorkMenuBean>) object;
             for (int i = 0; i < menuTypeBeans.size(); i++) {
@@ -209,7 +209,7 @@ public class WorkModuleSortActivity extends BaseMVPActivity<WorkPlatPresenter> i
     }
 
     @Override
-    public void showError(String errorMsg) {
+    public void requestError(int what, String errorMsg) {
 
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/adapter/CityIndustryCircleFuncAdapter.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import com.me.imageloader.ImageLoaderUtil;
 import com.uas.appworks.R;
-import com.uas.appworks.model.bean.CityIndustryMenuBean;
+import com.uas.appworks.model.bean.CityIndustryServiceBean;
 
 import java.util.List;
 
@@ -26,11 +26,11 @@ import java.util.List;
 public class CityIndustryCircleFuncAdapter extends RecyclerView.Adapter<CityIndustryCircleFuncAdapter.MyViewholder> {
     private Context mContext;
     private LayoutInflater mInflater;
-    private List<CityIndustryMenuBean.ServesBean> mCityServiceBeans;
+    private List<CityIndustryServiceBean> mCityServiceBeans;
     private Resources mResources;
     private OnItemClickListener mOnItemClickListener;
 
-    public CityIndustryCircleFuncAdapter(Context context, List<CityIndustryMenuBean.ServesBean> cityServiceBeans) {
+    public CityIndustryCircleFuncAdapter(Context context, List<CityIndustryServiceBean> cityServiceBeans) {
         this.mContext = context;
         this.mCityServiceBeans = cityServiceBeans;
         mInflater = LayoutInflater.from(mContext);
@@ -50,10 +50,12 @@ public class CityIndustryCircleFuncAdapter extends RecyclerView.Adapter<CityIndu
     @Override
     public void onBindViewHolder(CityIndustryCircleFuncAdapter.MyViewholder holder, final int position) {
         holder.mTextView.setText(mCityServiceBeans.get(position).getSv_name());
-        if (TextUtils.isEmpty(mCityServiceBeans.get(position).getSv_logourl().getMobile())) {
+        if (TextUtils.isEmpty(mCityServiceBeans.get(position).getSv_logourl())) {
             holder.mImageView.setImageResource(R.drawable.defaultpic);
+        } else if ("moreMenu".equals(mCityServiceBeans.get(position).getSv_logourl())) {
+            holder.mImageView.setImageResource(R.drawable.ic_city_industry_more_menu);
         } else {
-            ImageLoaderUtil.getInstance().loadImage(mCityServiceBeans.get(position).getSv_logourl().getMobile(), holder.mImageView);
+            ImageLoaderUtil.getInstance().loadImage(mCityServiceBeans.get(position).getSv_logourl(), holder.mImageView);
         }
 
         holder.mWholeItem.setOnClickListener(new View.OnClickListener() {

app_modular/appworks/src/main/java/com/uas/appworks/model/WorkPlatModel.java

@@ -70,12 +70,12 @@ public class WorkPlatModel implements IWorkPlatModel {
                         .build(), new ResultSubscriber<Object>(new Result2Listener<Object>() {
                     @Override
                     public void onResponse(Object o) {
-                        workCallback.onSuccess(request.getWhat(), o.toString());
+                        workCallback.onSuccess(request.getWhat(), o == null ? "" : o.toString());
                     }
 
                     @Override
                     public void onFailure(Object t) {
-                        workCallback.onFail(request.getWhat(), t.toString());
+                        workCallback.onFail(request.getWhat(), t == null ? "" : t.toString());
                     }
                 }));
             }
@@ -95,12 +95,12 @@ public class WorkPlatModel implements IWorkPlatModel {
                 .build(), new ResultSubscriber<Object>(new Result2Listener<Object>() {
             @Override
             public void onResponse(Object o) {
-                workCallback.onSuccess(request.getWhat(), o.toString());
+                workCallback.onSuccess(request.getWhat(), o == null ? "" : o.toString());
             }
 
             @Override
             public void onFailure(Object t) {
-                workCallback.onFail(request.getWhat(), t.toString());
+                workCallback.onFail(request.getWhat(), t == null ? "" : t.toString());
             }
         }));
     }

app_modular/appworks/src/main/java/com/uas/appworks/model/bean/CityIndustryServiceBean.java

@@ -0,0 +1,44 @@
+package com.uas.appworks.model.bean;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/11/27 11:04
+ */
+
+public class CityIndustryServiceBean {
+
+    /**
+     * sv_name : 故障报修
+     * sv_id : 3000
+     * sv_logourl : https://dfs.ubtob.com/group1/M00/61/8B/CgpkyFoOyU2AWPs5AAAEH_Dv4bk206.png
+     */
+
+    private String sv_name;
+    private int sv_id;
+    private String sv_logourl;
+
+    public String getSv_name() {
+        return sv_name;
+    }
+
+    public void setSv_name(String sv_name) {
+        this.sv_name = sv_name;
+    }
+
+    public int getSv_id() {
+        return sv_id;
+    }
+
+    public void setSv_id(int sv_id) {
+        this.sv_id = sv_id;
+    }
+
+    public String getSv_logourl() {
+        return sv_logourl;
+    }
+
+    public void setSv_logourl(String sv_logourl) {
+        this.sv_logourl = sv_logourl;
+    }
+}

app_modular/appworks/src/main/java/com/uas/appworks/presenter/WorkPlatPresenter.java

@@ -53,9 +53,9 @@ public class WorkPlatPresenter implements IWorkPlatPresenter, WorkPlatCallback {
         if (mWorkView != null) {
             mWorkView.hideLoading();
             if (what == Constants.LOAD_WORK_MENU_CACHE) {
-                mWorkView.loadSuccess(what, mWorkModel.getWorkData());
+                mWorkView.requestSuccess(what, mWorkModel.getWorkData());
             } else {
-                mWorkView.loadSuccess(what, s);
+                mWorkView.requestSuccess(what, s);
             }
         }
     }
@@ -64,7 +64,7 @@ public class WorkPlatPresenter implements IWorkPlatPresenter, WorkPlatCallback {
     public void onFail(int what, String failStr) {
         if (mWorkView != null) {
             mWorkView.hideLoading();
-            mWorkView.showError(failStr);
+            mWorkView.requestError(what, failStr);
         }
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/view/WorkPlatView.java

@@ -9,7 +9,7 @@ import com.core.base.view.BaseView;
  */
 
 public interface WorkPlatView extends BaseView {
-    void loadSuccess(int what, Object object);
+    void requestSuccess(int what, Object object);
 
-    void showError(String errorMsg);
+    void requestError(int what, String errorMsg);
 }

app_modular/appworks/src/main/res/anim/enter_bottom.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fillAfter="true"
-    android:shareInterpolator="false"
-    android:zAdjustment="top"
-    >
-    <translate
-        android:duration="1000"
-        android:fromYDelta="100%p"
-        android:toYDelta="0" />
-
-    <alpha
-        android:duration="600"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"/>
-</set>

app_modular/appworks/src/main/res/anim/leave_top.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fillAfter="true"
-    android:shareInterpolator="false"
-    android:zAdjustment="top"
-    >
-    <translate
-        android:duration="1000"
-        android:fromYDelta="0"
-        android:toYDelta="-100%p" />
-
-    <alpha
-        android:duration="600"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0"/>
-</set>

app_modular/appworks/src/main/res/layout/activity_main_city_industry_service.xml

@@ -94,12 +94,15 @@
                         android:paddingBottom="6dp"
                         android:paddingTop="6dp"
                         android:scrollbars="none"
+                        android:visibility="gone"
                         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
                     <View
+                        android:id="@+id/city_industry_service_main_func_line"
                         android:layout_width="match_parent"
                         android:layout_height="6dp"
-                        android:background="@color/gray_light" />
+                        android:background="@color/gray_light"
+                        android:visibility="gone" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -143,10 +146,6 @@
             </android.support.v4.widget.NestedScrollView>
         </android.support.design.widget.CoordinatorLayout>
 
-        <com.scwang.smartrefresh.layout.footer.ClassicsFooter
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:srlAccentColor="@android:color/darker_gray" />
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
     <android.support.v7.widget.Toolbar