备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/CaptureResultActivity.java

@@ -145,7 +145,7 @@ public class CaptureResultActivity extends Activity {
         }
         String url = null;
 //        url = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl") + "common/checkQrcodeScan.action";
-        url = "http://192.168.253.66:8080/" + "sso/qrcode/check";
+        url = "http://192.168.253.123:8889/" + "sso/qrcode/check";
         String photo = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "user_phone");
         String password = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "user_password");
         String enuu = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/DataInquiryActivity.java

@@ -336,7 +336,7 @@ public class DataInquiryActivity extends BaseActivity {
                                 for (int j = 0; j < listArray.length(); j++) {
                                     JSONObject listObject = listArray.optJSONObject(j);
                                     if (listObject != null) {
-                                        String title = optStringNotNull(listObject, "mTitle");
+                                        String title = optStringNotNull(listObject, "title");
                                         String caller = optStringNotNull(listObject, "caller");
                                         JSONArray schemeArray = listObject.optJSONArray("schemes");
                                         if (schemeArray != null) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/ReportStatisticsActivity.java

@@ -354,7 +354,7 @@ public class ReportStatisticsActivity extends BaseActivity {
                                     if (listObject != null) {
                                         GridMenuReportStatisticsBean.ListBean listBean = new GridMenuReportStatisticsBean.ListBean();
                                         String caller = optStringNotNull(listObject, "caller");
-                                        String title = optStringNotNull(listObject, "mTitle");
+                                        String title = optStringNotNull(listObject, "title");
                                         String reportName = optStringNotNull(listObject, "reportName");
 
                                         listBean.setCaller(caller);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquiryMenuGridAdapter.java

@@ -65,7 +65,9 @@ public class DataInquiryMenuGridAdapter extends BaseAdapter {
         if ("更多".equals(object.getIconText())) {
             holder.gridDataInquiryMenuIcon.setText("···");
         } else {
-            holder.gridDataInquiryMenuIcon.setText(object.getIconText().substring(0, 1));
+            if (object.getIconText().length() >= 1) {
+                holder.gridDataInquiryMenuIcon.setText(object.getIconText().substring(0, 1));
+            }
         }
         holder.gridDataInquiryMenuIcon.setMyBackgroundColor(context.getResources().getColor(object.getColor()));
 
@@ -81,6 +83,5 @@ public class DataInquiryMenuGridAdapter extends BaseAdapter {
         }
     }
 
-  
 
 }

WeiChat/src/main/res/values/styles.xml

@@ -1235,4 +1235,5 @@
         <item name="android:minHeight">20dip</item>
         <item name="android:maxHeight">20dip</item>
     </style>
+
 </resources>

app_core/common/src/main/java/com/core/app/Constants.java

@@ -13,31 +13,32 @@ public class Constants {
     //IM测试地址
     public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
 
-	public static String IM_BASE_URL() {
-		String url = "";
-		if (BaseConfig.isDebug()) {
-			url = IM_BASE_URL_TEST;
-		} else {
-			url = IM_BASE_URL;
-		}
-		return url;
-	}
-
-	public static String charitBaseUrl() {
-		return "http://192.168.253.227:8084/";
-	}
-
-	//通讯录表
-	public static final String TABLE_CONTANCTS = "CREATE TABLE  tbl_contacts " +
-			"(id integer primary key autoincrement,"
-			+ "tf_name varchar(50),"
-			+ "tf_whichSys varchar(50),"
-			+ "tf_company varchar(50),"
-			+ "tf_phone varchar(50) ,"
-			+ "tf_email varchar(50),"
-			+ "tf_type integer,"
-			+ "tf_ownerId varchar(50),"
-			+ "tf_imId varchar(50) default '0')";
+    public static String IM_BASE_URL() {
+        String url = "";
+        if (BaseConfig.isDebug()) {
+            url = IM_BASE_URL_TEST;
+            url = IM_BASE_URL;
+        } else {
+            url = IM_BASE_URL;
+        }
+        return url;
+    }
+
+    public static String charitBaseUrl() {
+        return "http://192.168.253.227:8084/";
+    }
+
+    //通讯录表
+    public static final String TABLE_CONTANCTS = "CREATE TABLE  tbl_contacts " +
+            "(id integer primary key autoincrement,"
+            + "tf_name varchar(50),"
+            + "tf_whichSys varchar(50),"
+            + "tf_company varchar(50),"
+            + "tf_phone varchar(50) ,"
+            + "tf_email varchar(50),"
+            + "tf_type integer,"
+            + "tf_ownerId varchar(50),"
+            + "tf_imId varchar(50) default '0')";
 
     //组织架构 员工信息
     public static final String SQL_EMPLOYEES_CREATETABLE = "CREATE TABLE EMPLOYEES "
@@ -443,4 +444,6 @@ public class Constants {
     public static final int WORK_MODULE_SORT_REQUEST = 0x11;
     public static final int WORK_FUNC_SET = 0x03;
 
+    public static final String B2B_UID_CACHE = "b2b_uid_cache";
+    public static final String B2B_SESSION_CACHE = "b2b_session_cache";
 }

app_core/common/src/main/java/com/core/net/http/HttpClient.java

@@ -8,8 +8,11 @@ import com.common.hmac.HmacUtils;
 import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
+import com.core.utils.CommonUtil;
 
+import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.CookieStore;
@@ -37,9 +40,10 @@ import java.util.Set;
 
 @Deprecated
 public class HttpClient {
-    
+
     /**
      * 发送GET请求
+     *
      * @param url
      * @param params
      * @return
@@ -48,7 +52,8 @@ public class HttpClient {
     public String sendGetRequest(String url, Map<String, String> params)
             throws Exception {
         String result = null;
-        DefaultHttpClient httpclient = MyHttpClient.getNewHttpClient();  ;
+        DefaultHttpClient httpclient = MyHttpClient.getNewHttpClient();
+        ;
         boolean sign = true;
         StringBuilder buf = new StringBuilder(url);
         Set<Entry<String, String>> entrys = null;
@@ -73,7 +78,11 @@ public class HttpClient {
         HttpGet httpGet = new HttpGet(buf.toString());
         httpclient.getParams().setParameter(
                 CoreProtocolPNames.HTTP_CONTENT_CHARSET, "UTF-8");
-        httpGet.setHeader("Cookie", "JSESSIONID=" + params.get("sessionId"));
+        if ("city_service".equals(params.get("from"))) {
+            httpGet.setHeader("Cookie", params.get("sessionId"));
+        } else {
+            httpGet.setHeader("Cookie", "JSESSIONID=" + params.get("sessionId"));
+        }
 //        if (!TextUtils.isEmpty(MyApplication.getInstance().getJSESSION_B2B())) {
 //            httpGet.addHeader("Cookie", "JSESSIONID=" + MyApplication.getInstance().getJSESSION_B2B());
 //        }
@@ -82,6 +91,24 @@ public class HttpClient {
         HttpResponse response = httpclient.execute(httpGet);
         if (response.getStatusLine().getStatusCode() == 200) {
             String temp = EntityUtils.toString(response.getEntity());
+            if ("b2b".equals(params.get("appId"))) {
+                Header[] headers = response.getHeaders("Set-Cookie");
+                if (headers != null && headers.length > 0) {
+                    for (Header header : headers) {
+                        String value = header.getValue();
+                        if (value != null) {
+                            if (value.contains("uid")) {
+                                CommonUtil.setSharedPreferences(
+                                        MyApplication.getInstance().getApplicationContext(), Constants.B2B_UID_CACHE, value);
+                            }
+                            if (value.contains("JSESSIONID")) {
+                                CommonUtil.setSharedPreferences(
+                                        MyApplication.getInstance().getApplicationContext(), Constants.B2B_SESSION_CACHE, value);
+                            }
+                        }
+                    }
+                }
+            }
             if (temp.length() > 0) {
                 result = temp.trim().toString();
             } else {
@@ -94,14 +121,14 @@ public class HttpClient {
     }
 
 
-
     public String sendPostRequest(String url, Map<String, String> params)
             throws IOException {
-       // SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
+        // SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
         Log.i("HTTP", "post url=" + url);
         String result = null;
         HttpResponse response = null;
-        DefaultHttpClient httpclient = MyHttpClient.getNewHttpClient();  ;
+        DefaultHttpClient httpclient = MyHttpClient.getNewHttpClient();
+        ;
         boolean sign = true;
         if (sign) {
             url += (url.indexOf("?") == -1 ? "?" : "&") + "_timestamp="
@@ -121,18 +148,39 @@ public class HttpClient {
             httpPost.setEntity(new UrlEncodedFormEntity(nvps, HTTP.UTF_8));
             httpPost.setHeader("Content-Type",
                     "application/x-www-form-urlencoded; charset=utf-8");
-            httpPost.setHeader("Cookie",
-                    "JSESSIONID=" + params.get("sessionId"));
+            if ("city_service".equals(params.get("from"))) {
+                httpPost.setHeader("Cookie", params.get("sessionId"));
+            } else {
+                httpPost.setHeader("Cookie", "JSESSIONID=" + params.get("sessionId"));
+            }
 //            httpPost.addHeader("Cookie", "JSESSIONID="
 //                    + MyApplication.getInstance().getJSESSION_B2B());
             response = httpclient.execute(httpPost);
         } catch (IOException e) {
             e.printStackTrace();
         }
-       
+
         if (response.getStatusLine().getStatusCode() == 200
                 || response.getStatusLine().getStatusCode() == 207) {
             String temp = EntityUtils.toString(response.getEntity());
+            if ("b2b".equals(params.get("appId"))) {
+                Header[] headers = response.getHeaders("Set-Cookie");
+                if (headers != null && headers.length > 0) {
+                    for (Header header : headers) {
+                        String value = header.getValue();
+                        if (value != null) {
+                            if (value.contains("uid")) {
+                                CommonUtil.setSharedPreferences(
+                                        MyApplication.getInstance().getApplicationContext(), Constants.B2B_UID_CACHE, value);
+                            }
+                            if (value.contains("JSESSIONID")) {
+                                CommonUtil.setSharedPreferences(
+                                        MyApplication.getInstance().getApplicationContext(), Constants.B2B_SESSION_CACHE, value);
+                            }
+                        }
+                    }
+                }
+            }
             if (temp.length() > 0) {
                 result = temp.trim().toString();
             } else {
@@ -141,17 +189,17 @@ public class HttpClient {
             //b2b cookie save
             if (StringUtil.isEmpty(url)) return null;
             try {
-                if (url.contains(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().login)){
-                    String b2bCookie= response.getHeaders("Set-Cookie")[0].getValue()+";"+response.getHeaders("Set-Cookie")[1].getValue();
-                    LogUtil.d("HttpClient","B2B Cookie:"+b2bCookie);
+                if (url.contains(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().login)) {
+                    String b2bCookie = response.getHeaders("Set-Cookie")[0].getValue() + ";" + response.getHeaders("Set-Cookie")[1].getValue();
+                    LogUtil.d("HttpClient", "B2B Cookie:" + b2bCookie);
                     ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().setCookie(b2bCookie);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            CookieStore cookieStore =  httpclient.getCookieStore();
+            CookieStore cookieStore = httpclient.getCookieStore();
             for (int i = 0; i < cookieStore.getCookies().size(); i++) {
-               if ("218.17.158.219".equals(cookieStore.getCookies().get(i)
+                if ("218.17.158.219".equals(cookieStore.getCookies().get(i)
                         .getDomain())) {
                     PreferenceUtils.putLong(MyApplication.getInstance(), "WebViewCommActivity_time", System.currentTimeMillis());
                     MyApplication.cookieERP = cookieStore.getCookies().get(i);

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -40,6 +40,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.dao.DBManager;
@@ -114,7 +115,36 @@ public class CommonUtil {
         if (ct == null) {
             return "";
         }
-        return "https://admin-city.ubtob.com/";
+//        return "https://admin-city.ubtob.com/";
+//        return "https://city-service.ubtob.com/city/thxz/";
+        return "http://192.168.253.31:8687/city/thxz/";
+//        return "http://192.168.253.200:8080/Chapter/";
+    }
+
+    /**
+     * B2B身份uid
+     *
+     * @param ct
+     * @return
+     */
+    public static String getB2BUid(Context ct) {
+        if (ct == null) {
+            return "";
+        }
+        return getSharedPreferences(ct, Constants.B2B_UID_CACHE) == null ? "" : getSharedPreferences(ct, Constants.B2B_UID_CACHE);
+    }
+
+    /**
+     * B2B身份session
+     *
+     * @param ct
+     * @return
+     */
+    public static String getB2BSession(Context ct) {
+        if (ct == null) {
+            return "";
+        }
+        return getSharedPreferences(ct, Constants.B2B_SESSION_CACHE) == null ? "" : getSharedPreferences(ct, Constants.B2B_SESSION_CACHE);
     }
 
     /**

app_core/common/src/main/java/com/core/utils/NoticeView.java

@@ -1,4 +1,4 @@
-package com.base.adev.view;
+package com.core.utils;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -16,7 +16,7 @@ import android.widget.TextSwitcher;
 import android.widget.TextView;
 import android.widget.ViewSwitcher;
 
-import com.base.adev.R;
+import com.core.app.R;
 
 import java.util.ArrayList;
 import java.util.Timer;
@@ -135,8 +135,8 @@ public class NoticeView extends TextSwitcher implements ViewSwitcher.ViewFactory
     public void startRolling() {
         if (timer == null) {
             this.setFactory(this);
-            this.setInAnimation(getContext(), R.anim.m_switcher_vertical_in);
-            this.setOutAnimation(getContext(), R.anim.m_switcher_vertical_out);
+            this.setInAnimation(getContext(), R.anim.announce_enter_bottom);
+            this.setOutAnimation(getContext(), R.anim.announce_leave_top);
             timer = new Timer();
             timerTask = new TimerTask() {
                 @Override

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

@@ -255,4 +255,11 @@
         <attr name="backgroundColor" format="reference|color" />
         <attr name="isFillColor" format="boolean" />
     </declare-styleable>
+
+    <!--广告条控件属性-->
+    <declare-styleable name="NoticeView">
+        <attr name="noticeTextColor" format="reference|color" />
+        <attr name="noticeTextSize" format="dimension" />
+        <attr name="noticeRollingTime" format="integer" />
+    </declare-styleable>
 </resources>

app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java

@@ -14,6 +14,9 @@ import com.me.network.app.http.ssl.TrustAllHostnameVerifier;
 
 import java.io.File;
 import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
@@ -21,6 +24,9 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 
 import okhttp3.Cache;
+import okhttp3.Cookie;
+import okhttp3.CookieJar;
+import okhttp3.HttpUrl;
 import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.OkHttpClient.Builder;
@@ -43,6 +49,8 @@ public class RetrofitImpl extends HttpBase {
     public Retrofit retrofit;
     public ParamService paramService;
     private static RetrofitImpl instance;
+    private OkHttpClient mOkHttpClient;
+    private Builder mOkBuilder;
 
 
     public static RetrofitImpl getInstance() {
@@ -59,26 +67,40 @@ public class RetrofitImpl extends HttpBase {
 
     @Override
     public void initClient() {
-
-        Builder okBuilder = new Builder()
+        // 信任所有证书
+        mOkBuilder = new Builder()
                 .connectTimeout(mbuilder.getConnectTimeout(), TimeUnit.SECONDS)
                 .readTimeout(mbuilder.getReadTimeout(), TimeUnit.SECONDS)
                 .writeTimeout(mbuilder.getWriteTimeout(), TimeUnit.SECONDS)
                 .sslSocketFactory(createSSLSocketFactory(), new TrustAllCerts())// 信任所有证书
-                .hostnameVerifier(new TrustAllHostnameVerifier());
+                .hostnameVerifier(new TrustAllHostnameVerifier())
+                .cookieJar(new CookieJar() {
+                    private final HashMap<String, List<Cookie>> cookieStore = new HashMap<>();
+
+                    @Override
+                    public void saveFromResponse(HttpUrl httpUrl, List<Cookie> list) {
+                        cookieStore.put(httpUrl.host(), list);
+                    }
+
+                    @Override
+                    public List<Cookie> loadForRequest(HttpUrl httpUrl) {
+                        List<Cookie> cookies = cookieStore.get(httpUrl.host());
+                        return cookies != null ? cookies : new ArrayList<Cookie>();
+                    }
+                });
 
         LogInterceptor logInterceptor = new LogInterceptor();
         logInterceptor.setBuilder(mbuilder);
-        okBuilder.addInterceptor(logInterceptor);
+        mOkBuilder.addInterceptor(logInterceptor);
         if (mbuilder.getCacheFileSize() != 0) {
-            okBuilder.cache(new Cache(mbuilder.getCacheFile(), mbuilder.getCacheFileSize()));
-            okBuilder.addInterceptor(
+            mOkBuilder.cache(new Cache(mbuilder.getCacheFile(), mbuilder.getCacheFileSize()));
+            mOkBuilder.addInterceptor(
                     new CacheInterceptor(String.valueOf(mbuilder.getCacheTime()), mbuilder.getCacheType()));
         }
 
+        mOkHttpClient = mOkBuilder.build();
 
-        OkHttpClient client = okBuilder.build();
-        retrofit = new Retrofit.Builder().client(client)
+        retrofit = new Retrofit.Builder().client(mOkHttpClient)
                 .baseUrl(mbuilder.getBaseUrl())
                 .addConverterFactory(StringConverterFactory.create())
                 .addConverterFactory(GsonConverterFactory.create(new Gson()))

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

@@ -73,8 +73,6 @@ public class CityIndustryFuncSetActivity extends BaseMVPActivity<WorkPlatPresent
     private void obtainCityIndustryService() {
         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"));
@@ -86,26 +84,7 @@ public class CityIndustryFuncSetActivity extends BaseMVPActivity<WorkPlatPresent
                 .setParam(params)
                 .setMode(Request.Mode.GET)
                 .bulid();
-        mPresenter.uasRequest(this, request);
-    }
-
-    private void obtainCityIndustryConfig() {
-        Map<String, Object> params = new HashMap<>();
-        params.put("serve_id", "52");
-//        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()
-                .setWhat(OBTAIN_CITY_INDUSTRY_CONFIG)
-                .setUrl("api/serve/config.action")
-                .setHeaders(header)
-                .setParam(params)
-                .setMode(Request.Mode.GET)
-                .bulid();
-        mPresenter.uasRequest(this, request);
+        mPresenter.cityRequest(this, request);
     }
 
     @Override

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

@@ -18,24 +18,28 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextSwitcher;
 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.app.Constants;
 import com.core.base.activity.BaseMVPActivity;
+import com.core.net.http.ViewUtil;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.core.utils.SpanUtils;
 import com.core.utils.StatusBarUtil;
 import com.core.widget.RecycleViewDivider;
+import com.me.imageloader.ImageLoaderUtil;
 import com.scwang.smartrefresh.layout.api.RefreshHeader;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
@@ -52,7 +56,6 @@ import com.youth.banner.Banner;
 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;
@@ -67,6 +70,7 @@ import java.util.Map;
 public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPresenter> implements WorkPlatView {
     private final int ANNOUNCE_LOOP_FLAG = 0x01;
     private final int GET_DEFAULT_SERVICE = 0x02;
+    private final int GET_LOOP_PICS = 0x03;
 
     //    private AppBarLayout mAppBarLayout;
     private RecyclerView mFuncRecyclerView, mNewsRecyclerView;
@@ -78,6 +82,9 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
     private ImageView mBackImageView;
     private FrameLayout mToastLayout;
     private View mFuncLine;
+    private LinearLayout mAreaLinearLayout;
+    private ImageView mAreaImageView;
+
     private List<CityIndustryAnnounceBean> mCityIndustryAnnounceBeans;
     private int mSwitcherCount = 0;
     private CityIndustryCircleFuncAdapter mCityIndustryFuncAdapter;
@@ -85,6 +92,8 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
     private CityIndustryNewsListAdapter mCityIndustryNewsListAdapter;
     private int mScrollY = 0;
     private SpanUtils mSpanUtils;
+    private boolean isAreaSpread = false, isLoopPicsFinish = false, isServiceFinish = false;
+    private Animation mSpreadAnimation, mFoldAnimation;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -104,11 +113,47 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
                     }
                     mHandler.sendEmptyMessageDelayed(ANNOUNCE_LOOP_FLAG, 3000);
                     break;
+                case GET_DEFAULT_SERVICE:
+                    String result = msg.getData().getString("result");
+                    analyzeDefaultSerivce(result);
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    result = msg.getData().getString("result");
+                    if (JSONUtil.validate(result)) {
+                        ToastMessage(JSON.parseObject(result).getString("exceptionInfo"));
+                    } else {
+                        ToastMessage(result);
+                    }
+                    break;
+                default:
+                    break;
             }
 
         }
     };
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mBanner.startAutoPlay();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mBanner.stopAutoPlay();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
     @Override
     protected int getLayout() {
         return R.layout.activity_main_city_industry_service;
@@ -122,7 +167,6 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
         setSupportActionBar(mToolbar);
         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);
@@ -132,6 +176,12 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
         mRefreshLayout = $(R.id.city_industry_service_main_refreshlayout);
         mFuncLine = $(R.id.city_industry_service_main_func_line);
         mToastLayout = $(R.id.city_industry_service_main_toast);
+        mAreaLinearLayout = $(R.id.city_industry_service_main_area_ll);
+        mAreaImageView = $(R.id.city_industry_service_main_area_iv);
+        mSpreadAnimation = AnimationUtils.loadAnimation(ct, R.anim.anim_rotate_button_spread);
+        mFoldAnimation = AnimationUtils.loadAnimation(ct, R.anim.anim_rotate_button_fold);
+
+        mBanner.setImageLoader(new BannerImageLoader());
 
         RecyclerView.RecycledViewPool viewPool = new RecyclerView.RecycledViewPool();
         viewPool.setMaxRecycledViews(0, 10);
@@ -185,23 +235,6 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
             }
         });
 
-        /*mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                int totalScrollRange = appBarLayout.getTotalScrollRange();
-                int measuredHeight = mToolbar.getMeasuredHeight();
-                Log.d("appbarscroll", "totalScrollRange->" + totalScrollRange);
-                Log.d("appbarscroll", "verticalOffset->" + Math.abs(verticalOffset));
-                Log.d("appbarscroll", "measuredHeight->" + measuredHeight);
-                if (totalScrollRange <= ((Math.abs(verticalOffset)) + measuredHeight)) {
-                    mToolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.antionbarcolor));
-                } else {
-                    mToolbar.setBackgroundColor(Color.TRANSPARENT);
-                }
-
-            }
-        });*/
-
         mRefreshLayout.setOnMultiPurposeListener(new SimpleMultiPurposeListener() {
             @Override
             public void onHeaderPulling(RefreshHeader header, float percent, int offset, int headerHeight, int extendHeight) {
@@ -219,11 +252,11 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
             public void onRefresh(final RefreshLayout refreshLayout) {
                 if (CommonUtil.isNetWorkConnected(ct)) {
                     getDefaultService();
+                    getLoopPics();
                 } else {
-                    toast(R.string.networks_out, mToastLayout);
-//                    Toast.makeText(ct, R.string.networks_out, Toast.LENGTH_LONG).show();
-                    if (refreshLayout.isRefreshing()) {
-                        mRefreshLayout.finishRefresh();
+                    defaultServiceError(getString(R.string.networks_out));
+                    if (mRefreshLayout.isRefreshing()) {
+                        mRefreshLayout.finishRefresh(0);
                     }
                 }
             }
@@ -244,32 +277,64 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
                 }
             }
         });
+
+        mAreaLinearLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (!isAreaSpread) {
+                    mAreaImageView.startAnimation(mSpreadAnimation);
+                    isAreaSpread = true;
+                } else {
+                    mAreaImageView.startAnimation(mFoldAnimation);
+                    isAreaSpread = false;
+                }
+            }
+        });
     }
 
     @Override
     protected void initData() {
-        mRefreshLayout.autoRefresh(400, 1f);
+        mRefreshLayout.autoRefresh(500, 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();
     }
 
     private void getDefaultService() {
+        String url = CommonUtil.getCityBaseUrl(ct) + "api/serve/getDefaultServices.action";
+//        String url = "http://192.168.253.200:8080/Chapter/getParam/app/json";
+
         Map<String, Object> params = new HashMap<>();
         params.put("kind", "cc");
-//        params.put("client_type", "cc");
-//        params.put("access_token", "123456");
 
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", CommonUtil.getB2BUid(this));
+
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, GET_DEFAULT_SERVICE, null, null, "get");
+
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("kind", "cc");
+//
+//        LinkedHashMap<String, Object> header = new LinkedHashMap<>();
+//        header.put("Cookie", CommonUtil.getB2BUid(this));
+//
+//        Request request = new Request.Bulider()
+//                .setUrl("api/serve/getDefaultServices.action")
+////                .setUrl("getParam/app/json")
+//                .setWhat(GET_DEFAULT_SERVICE)
+//                .setParam(params)
+//                .setHeaders(header)
+//                .setMode(Request.Mode.GET)
+//                .bulid();
+//        mPresenter.cityRequest(this, request);
+    }
+
+    private void getLoopPics() {
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
-        header.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        header.put("Cookie", CommonUtil.getB2BUid(this));
 
         Request request = new Request.Bulider()
-                .setUrl("api/serve/getDefaultServices.action")
-                .setWhat(GET_DEFAULT_SERVICE)
-                .setParam(params)
+                .setUrl("api/serve/mainPage/getRecyclePics.action")
+                .setWhat(GET_LOOP_PICS)
                 .setHeaders(header)
                 .setMode(Request.Mode.GET)
                 .bulid();
@@ -335,103 +400,120 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
 
     @Override
     public void requestSuccess(int what, Object object) {
+        Log.d("industryservice", "result->" + object.toString());
         switch (what) {
             case GET_DEFAULT_SERVICE:
-                if (mRefreshLayout.isRefreshing()) {
-                    mRefreshLayout.finishRefresh();
+                analyzeDefaultSerivce(object);
+                break;
+            case GET_LOOP_PICS:
+                isLoopPicsFinish = true;
+                if (mRefreshLayout.isRefreshing() && isServiceFinish) {
+                    mRefreshLayout.finishRefresh(0);
                 }
                 String result = object.toString();
-                Log.d("citydefaultservice", result);
                 if (JSONUtil.validate(result)) {
-                    mServesBeans.clear();
                     JSONObject resultObject = JSON.parseObject(result);
-                    JSONArray serviceArray = resultObject.getJSONArray("serves");
-                    if (serviceArray != null) {
-                        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);
+                    JSONArray serveArray = resultObject.getJSONArray("serve");
+                    if (serveArray != null) {
+                        List<String> imgList = new ArrayList<>();
+                        for (int i = 0; i < serveArray.size(); i++) {
+                            JSONObject serveObject = serveArray.getJSONObject(i);
+                            if (serveObject != null) {
+                                String url = JSONUtil.getText(serveObject, "url");
+                                imgList.add(url);
                             }
                         }
+                        mBanner.update(imgList);
+                        mBanner.start();
                     }
-
-                    CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();
-                    cityIndustryServiceBean.setSv_name("全部服务");
-                    cityIndustryServiceBean.setSv_logourl("moreMenu");
-                    mServesBeans.add(cityIndustryServiceBean);
-                }
-                if (mServesBeans.size() == 0) {
-                    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;
         }
     }
 
+    private void analyzeDefaultSerivce(Object object) {
+        isServiceFinish = true;
+        if (mRefreshLayout.isRefreshing() && isLoopPicsFinish) {
+            mRefreshLayout.finishRefresh(0);
+        }
+        String result = object.toString();
+        Log.d("citydefaultservice", result);
+        if (JSONUtil.validate(result)) {
+            mServesBeans.clear();
+            JSONObject resultObject = JSON.parseObject(result);
+            JSONArray serviceArray = resultObject.getJSONArray("serves");
+            if (serviceArray != null) {
+                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);
+        }
+        if (mServesBeans.size() == 0) {
+            CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();
+            cityIndustryServiceBean.setSv_name("全部服务");
+            cityIndustryServiceBean.setSv_logourl("moreMenu");
+            mServesBeans.add(cityIndustryServiceBean);
+        }
+
+        mFuncRecyclerView.setVisibility(View.VISIBLE);
+        mFuncLine.setVisibility(View.VISIBLE);
+        mCityIndustryFuncAdapter.notifyDataSetChanged();
+    }
+
     @Override
     public void requestError(int what, String errorMsg) {
         switch (what) {
             case GET_DEFAULT_SERVICE:
-                mServesBeans.clear();
-                if (mRefreshLayout.isRefreshing()) {
-                    mRefreshLayout.finishRefresh();
+                isServiceFinish = true;
+                if (mRefreshLayout.isRefreshing() && isLoopPicsFinish) {
+                    mRefreshLayout.finishRefresh(0);
+                }
+                defaultServiceError(errorMsg);
+                break;
+            case GET_LOOP_PICS:
+                isLoopPicsFinish = true;
+                if (mRefreshLayout.isRefreshing() && isServiceFinish) {
+                    mRefreshLayout.finishRefresh(0);
                 }
-                CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();
-                cityIndustryServiceBean.setSv_name("全部服务");
-                cityIndustryServiceBean.setSv_logourl("moreMenu");
-                mServesBeans.add(cityIndustryServiceBean);
-
-                mFuncRecyclerView.setVisibility(View.VISIBLE);
-                mFuncLine.setVisibility(View.VISIBLE);
-                mCityIndustryFuncAdapter.notifyDataSetChanged();
-                Toast.makeText(this, errorMsg, Toast.LENGTH_SHORT).show();
                 break;
             default:
                 break;
         }
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        mBanner.startAutoPlay();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mBanner.stopAutoPlay();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
+    private void defaultServiceError(String errorMsg) {
+        mServesBeans.clear();
+        CityIndustryServiceBean cityIndustryServiceBean = new CityIndustryServiceBean();
+        cityIndustryServiceBean.setSv_name("全部服务");
+        cityIndustryServiceBean.setSv_logourl("moreMenu");
+        mServesBeans.add(cityIndustryServiceBean);
+
+        mFuncRecyclerView.setVisibility(View.VISIBLE);
+        mFuncLine.setVisibility(View.VISIBLE);
+        mCityIndustryFuncAdapter.notifyDataSetChanged();
+        toast(errorMsg, mToastLayout);
     }
 
     private class BannerImageLoader extends ImageLoader {
         @Override
         public void displayImage(Context context, Object path, ImageView imageView) {
-//            ImageLoaderUtil.getInstance().loadImage(path.toString(), imageView);
             imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-            imageView.setImageResource((Integer) path);
+            ImageLoaderUtil.getInstance().loadImage(path.toString(), imageView);
         }
     }
 }

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

@@ -190,10 +190,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         mEnclosureItemAdapter.setOnEnclosureItemClickListener(new EnclosureItemAdapter.OnEnclosureItemClickListener() {
             @Override
             public void onEnclosureClick(View view, int position) {
-                String url = CommonUtil.getAppBaseUrl(mContext) + "/common/download.action?"
-                        + "?master="
-                        + CommonUtil.getSharedPreferences(mContext, "erp_master")
-                        + "&sessionUser="
+                String url = CommonUtil.getCityBaseUrl(mContext) + "api/serve/mainPage/download.action?"
+                        + "?sessionUser="
                         + CommonUtil.getSharedPreferences(mContext, "erp_username")
                         + "&sessionId="
                         + CommonUtil.getSharedPreferences(mContext, "sessionId")
@@ -243,15 +241,13 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         }
         //请求获取单据提交内容数据
         progressDialog.show();
-        String docmsg_url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "api/serve/config.action";
+        String docmsg_url = CommonUtil.getCityBaseUrl(getApplicationContext()) + "api/serve/config.action";
         Map<String, Object> param_am = new HashMap<>();
         param_am.put("serve_id", mServiceId);
-//        param_am.put("client_type", "cc");
-//        param_am.put("access_token", "111111");
         param_am.put("id", mkeyValue);
         LinkedHashMap headers_am = new LinkedHashMap();
-        headers_am.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
-        ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, mHandler, headers_am, COMMON_DOC_MSG_REQUEST, null, null, "post");
+        headers_am.put("Cookie", CommonUtil.getB2BUid(this));
+        ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, mHandler, headers_am, COMMON_DOC_MSG_REQUEST, null, null, "get");
 
     }
 
@@ -443,6 +439,7 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
                     Toast.makeText(CommonCityIndustryDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
                     if (!TextUtils.isEmpty(real_status) && real_status.equals("已审核")) {
                         commondoc_sv.setVisibility(View.VISIBLE);
@@ -486,6 +483,7 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     public void AMshow(String msg_result) {
         mFormconfigsBean.clear();
         mGridconfigsBean.clear();
+        Log.d("cityindustrydetail", "result->" + msg_result);
         try {
             JSONObject amresultJsonObject = JSON.parseObject(msg_result);
             JSONObject dataObjecty = amresultJsonObject.getJSONObject("datas");
@@ -501,23 +499,26 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
                     JSONObject formconfigsObject = formconfigsArray.getJSONObject(i);
                     String fd_caption = JSONUtil.getText(formconfigsObject, "FD_CAPTION");
                     if ("附件".equals(fd_caption)) {
-                        filesExist = true;
                         fd_field = JSONUtil.getText(formconfigsObject, "FD_FIELD");
+                        filesExist = true;
                         break;
                     }
                 }
 
                 if (filesExist) {
                     String caption_id = JSONUtil.getText(formdataArray.getJSONObject(0), fd_field);
-                    progressDialog.show();
-                    String docmsg_url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "common/getFilePaths.action";
-                    Map<String, Object> param_am = new HashMap<>();
-                    param_am.put("field", "fb_attach");
-                    param_am.put("id", caption_id);
-                    LinkedHashMap headers_am = new LinkedHashMap();
-                    headers_am.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
-                    ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, mHandler, headers_am, GET_CAPTION_PATH, null, null, "get");
-
+                    if (!TextUtils.isEmpty(caption_id)) {
+                        progressDialog.show();
+                        String docmsg_url = CommonUtil.getCityBaseUrl(getApplicationContext()) + "api/serve/getFilePaths.action";
+                        Map<String, Object> param_am = new HashMap<>();
+                        param_am.put("field", "fb_attach");
+                        param_am.put("id", caption_id);
+                        LinkedHashMap headers_am = new LinkedHashMap();
+                        headers_am.put("Cookie", CommonUtil.getB2BUid(this));
+                        ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, mHandler, headers_am, GET_CAPTION_PATH, null, null, "get");
+                    } else {
+                        mFilesLinearLayout.setVisibility(View.GONE);
+                    }
                 } else {
                     mFilesLinearLayout.setVisibility(View.GONE);
                 }
@@ -607,13 +608,12 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         }
 
         //请求获取单据审批流数据
-        String url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
+        String url = CommonUtil.getCityBaseUrl(getApplicationContext()) + "api/serve/getProcesses.action";
         Map<String, Object> param = new HashMap<>();
-        param.put("caller", "RepairApply");
-        param.put("keyValue", mkeyValue);
-        param.put("_noc", mNoc);
+        param.put("serve_id", mServiceId);
+        param.put("id", mkeyValue);
         LinkedHashMap headers = new LinkedHashMap();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+        headers.put("Cookie", CommonUtil.getB2BUid(mContext));
         ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, COMMON_DOC_AF_REQUEST, null, null, "post");
 
     }
@@ -658,8 +658,11 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
 
     public void AFshow(String af_result) {
         try {
+            if (af_result == null || !JSONUtil.validate(af_result)) {
+                appflow_lv.setVisibility(View.GONE);
+                return;
+            }
             JSONObject resultJsonObject = JSON.parseObject(af_result);
-            //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
             if (resultJsonObject == null) {
                 appflow_lv.setVisibility(View.GONE);
             } else {

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

@@ -40,7 +40,6 @@ import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.ui.CameraUtil;
 import com.common.ui.ImageUtil;
-import com.core.api.wxapi.ApiBase;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
@@ -865,15 +864,15 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         if (caller == null) {
             caller = "Ask4Leave";
         }
-        String url = CommonUtil.getAppBaseUrl(ct) + "api/serve/config.action";
+        String url = CommonUtil.getCityBaseUrl(ct) + "api/serve/config.action";
 
         Map<String, Object> params = new HashMap<>();
         params.put("serve_id", mServeId);
 //        params.put("client_type", "cc");
 //        params.put("access_token", "123456");
-        params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+//        params.put("sessionId", CommonUtil.getB2BUid(this));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        headers.put("Cookie", CommonUtil.getB2BUid(this));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, load_success, null, null, "get");
     }
 
@@ -882,8 +881,9 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         if (v.getId() == R.id.ll_item_add) {
             addGridItemData();
         } else if (v.getId() == R.id.click_btn) {
-            if (formid == 0)
+            if (formid == 0) {
                 commit();
+            }
         } else if (v.getId() == R.id.btn_update) {
             updata();
         }
@@ -2066,7 +2066,6 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
     }
 
     private void commitForm() {
-        //Lg.d("提交操作：" + JSON.toJSONString(mDatas));
         StringBuffer forStore = new StringBuffer("{");
         StringBuffer gridStore = new StringBuffer("[");
         mDatas = mAdapter.getmListData();
@@ -2090,6 +2089,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     if (StringUtil.isEmpty(value)) value = "";
                     if (("F".equals(item.getReadonly()) && StringUtil.isEmpty(value))
                             || ("necessaryField".equals(item.getReadonly()) && StringUtil.isEmpty(value))) {
+                        progressDialog.dismiss();
                         ToastMessage(item.getName() + "不能为空！");
                         return;
                     }
@@ -2106,6 +2106,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             //判断日期
                             if (!StringUtil.isEmpty(start) && !StringUtil.isEmpty(end)) {
                                 if (end.compareTo(start) <= 0) {
+                                    progressDialog.dismiss();
                                     ToastMessage(item.getName() + "不能小于或等于" + startName);
                                     return;
                                 }
@@ -2146,6 +2147,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                         if (StringUtil.isEmpty(value)) value = "";
                         if (("F".equals(item.getReadonly()) && StringUtil.isEmpty(value))
                                 || ("necessaryField".equals(item.getReadonly()) && StringUtil.isEmpty(value))) {
+                            progressDialog.dismiss();
                             ToastMessage(item.getName() + "不能为空！");
                             return;
                         }
@@ -2161,6 +2163,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                                 //判断日期
                                 if (!StringUtil.isEmpty(d_start) && !StringUtil.isEmpty(d_end)) {
                                     if (d_end.compareTo(d_start) <= 0) {
+                                        progressDialog.dismiss();
                                         ToastMessage(item.getName() + "不能小于或等于" + startName);
                                         return;
                                     }
@@ -2208,6 +2211,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     if (StringUtil.isEmpty(value)) value = "";
                     if (("F".equals(item.getReadonly()) && StringUtil.isEmpty(value))
                             || ("necessaryField".equals(item.getReadonly()) && StringUtil.isEmpty(value))) {
+                        progressDialog.dismiss();
                         ToastMessage(item.getName() + "不能为空！");
                         return;
                     }
@@ -2278,18 +2282,12 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         progressDialog.show();
         click_btn.setEnabled(false);
         //  api/serve/save.action?data=?&operate_id=?&access_token=?
-        String url = null;
-//        if ("ExtraWork$".equals(caller)) {
-//            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkSaveAndSubmit.action";
-//        } else {
-        url = CommonUtil.getAppBaseUrl(ct) + "/api/serve/save.action";
-//        }
+        String url = CommonUtil.getCityBaseUrl(ct) + "api/serve/save.action";
         Map<String, Object> params = new HashMap<>();
-//        params.put("caller", caller);
         params.put("data", formStore);
         params.put("operate_id", mOperateId);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        headers.put("Cookie", CommonUtil.getB2BUid(this));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
     }
 
@@ -2540,12 +2538,12 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
 
     private void judgeApprovers(int id) {
         LogUtil.d("id:" + id + "  caller:" + caller);
-        String url = CommonUtil.getAppBaseUrl(mContext) + "common/getMultiNodeAssigns.action";
+        String url = CommonUtil.getCityBaseUrl(mContext) + "api/serve/getMultiNodeAssigns.action";
         Map<String, Object> param = new HashMap<>();
         param.put("caller", "RepairApply");
         param.put("id", id);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        headers.put("Cookie", CommonUtil.getB2BUid(mContext));
         ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, 0x14, null, null, "post");
     }
 
@@ -2559,7 +2557,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                 click_btn.setEnabled(false);
             }
         }, 50);
-        String url = CommonUtil.getAppBaseUrl(mContext) + "common/takeOverTask.action";
+        String url = CommonUtil.getAppBaseUrl(mContext) + "api/serve/takeOverTask.action";
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
         params.put("em_code", emName);
@@ -2567,7 +2565,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         param.put("_noc", 1);
         param.put("params", JSONUtil.map2JSON(params));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        headers.put("Cookie", CommonUtil.getB2BUid(mContext));
         ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, 0x16, null, null, "post");
     }
 
@@ -2676,9 +2674,9 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         File waterBitmapToFile = new File(path);
         File file = ImageUtil.compressBitmapToFile(path, 100, 360, 480);
         RequestParams params = new RequestParams();
-        params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master"));
+//        params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master"));
 //        params.addHeader("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-        params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        params.addHeader("Cookie", CommonUtil.getB2BUid(this));
 //        params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
 //        params.addBodyParameter("sessionId", sessionId);
 //        params.addBodyParameter("sessionUser", "U0807");
@@ -2687,7 +2685,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
 //        params.addBodyParameter("type", "common");
         params.addBodyParameter("file", file == null ? waterBitmapToFile : file);
         Log.d("uploadfile", params.toString());
-        String url = CommonUtil.getAppBaseUrl(ct) + "api/serve/uploadAttach.action";
+        String url = CommonUtil.getCityBaseUrl(ct) + "api/serve/uploadAttach.action";
         final HttpUtils http = new HttpUtils();
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
             @Override
@@ -2732,7 +2730,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
 
 
     private void showPictureActionDialog(final int position) {
-        
+
 //        ToastMessage("删除的位置是：position:"+position);
         String[] items = new String[]{getString(R.string.look_over), getString(R.string.common_delete)};
         android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this).setTitle(R.string.pictures)

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

@@ -539,10 +539,11 @@ public class CommonFormListActivity extends BaseActivity implements View.OnClick
         params.put("page", page);
         params.put("pageSize", size);
         params.put("serve_id", serveId);
-        params.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
+        params.put("sessionId", CommonUtil.getB2BUid(this));
+        params.put("from", "city_service");
         String result = null;
         try {
-            result = client.sendPostRequest(CommonUtil.getAppBaseUrl(this)
+            result = client.sendPostRequest(CommonUtil.getCityBaseUrl(this)
                     + "api/serve/query.action", params);
             LogUtil.prinlnLongMsg("HttpLogs", JSON.toJSONString(params) + ":" + result);
             if (result != null && rMap != null) {

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

@@ -41,6 +41,7 @@
                     android:id="@+id/city_industry_service_main_banner"
                     android:layout_width="match_parent"
                     android:layout_height="220dp"
+                    app:banner_default_image="@drawable/ic_city_industry_loop1"
                     app:delay_time="3000"
                     app:is_auto_play="true"
                     app:layout_collapseMode="none"
@@ -154,6 +155,7 @@
                 android:src="@drawable/ic_action_back" />
 
             <LinearLayout
+                android:id="@+id/city_industry_service_main_area_ll"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -169,6 +171,7 @@
                     android:textSize="18sp" />
 
                 <ImageView
+                    android:id="@+id/city_industry_service_main_area_iv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="6dp"

version.gradle

@@ -9,10 +9,10 @@ ext {
             compileSdkVersion: 26,
             buildToolsVersion: '27.0.0',
             minSdkVersion    : 14,
-            targetSdkVersion : 26,\
+            targetSdkVersion : 26,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 130,
-            versionName      : '6.0.6',
+            versionCode      : 150,
+            versionName      : '6.1.0',
     ]
 
     depsVersion = [