Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

WeiChat/build.gradle

@@ -52,9 +52,11 @@ def getVersionCode() {
 
 
 android {
+    
     def versionArray = getVersionCode()
     //====================Add below two line=============
     dexOptions {
+        incremental true
         javaMaxHeapSize "4g" //specify the heap size for the dex process
         preDexLibraries = false //delete the already predexed libraries
         //是否支持大工程模式
@@ -151,6 +153,8 @@ android {
             }
         }
     }*/
+
+  
 }
 
 repositories{

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

@@ -153,7 +153,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                 }
 
                 @Override
-                public void onLoadmore(RefreshLayout refreshlayout) {
+                public void onLoadMore(RefreshLayout refreshlayout) {
 
                 }
 
@@ -166,6 +166,11 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                     mHeaderWordImageView.setAlpha(percent > 1f ? 1f : percent);
                 }
 
+                @Override
+                public void onHeaderReleased(RefreshHeader refreshHeader, int i, int i1) {
+                    
+                }
+
                 @Override
                 public void onHeaderReleasing(RefreshHeader header, float percent, int offset, int headerHeight, int extendHeight) {
                     ViewGroup.LayoutParams layoutParams = mHeaderRelativeLayout.getLayoutParams();
@@ -191,6 +196,11 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
                 }
 
+                @Override
+                public void onFooterReleased(RefreshFooter refreshFooter, int i, int i1) {
+
+                }
+
                 @Override
                 public void onFooterReleasing(RefreshFooter footer, float percent, int offset, int footerHeight, int extendHeight) {
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Aug 14 15:20:29 CST 2018
-debugName=579
+#Fri Aug 24 14:14:30 CST 2018
+debugName=589
 versionName=640
-debugCode=579
+debugCode=589
 versionCode=182

app_core/common/src/main/res/layout/act_staff_query_list.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/com.scwang.smartrefresh.layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"

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

@@ -33,7 +33,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 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.SpanUtils;
 import com.core.utils.StatusBarUtil;
@@ -63,8 +62,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import retrofit2.http.GET;
-
 /**
  * @author RaoMeng
  * @describe 智慧产城首页
@@ -293,7 +290,8 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
 
     @Override
     protected void initData() {
-        mRefreshLayout.autoRefresh(400, 1f);
+        //
+        mRefreshLayout.autoLoadMore();
 
         initTextSwitcher();
     }

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

@@ -25,7 +25,7 @@ import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.HttpRequest;
 import com.me.network.app.http.Method;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadmoreListener;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.B2bBusinessListAdapter;
@@ -71,8 +71,8 @@ public class CompanyBusinessListActivity extends BaseMVPActivity<SimplePresenter
         mEnuu = CommonUtil.getSharedPreferences(mContext, Constants.CACHE.B2B_BUSINESS_ENUU);
         mRecyclerView = $(R.id.b2b_list_rv);
         mRefreshLayout = $(R.id.b2b_list_refreshlayout);
-        mRefreshLayout.setEnableAutoLoadmore(true);
-        mRefreshLayout.setEnableLoadmoreWhenContentNotFull(true);
+        mRefreshLayout.setEnableAutoLoadMore(true);
+        mRefreshLayout.setEnableLoadMoreWhenContentNotFull(true);
 
         mB2BBusinessListBeans = new ArrayList<>();
         mB2BBusinessListAdapter = new B2bBusinessListAdapter(mContext, mB2BBusinessListBeans);
@@ -171,15 +171,15 @@ public class CompanyBusinessListActivity extends BaseMVPActivity<SimplePresenter
             }
         });
 
-        mRefreshLayout.setOnLoadmoreListener(new OnLoadmoreListener() {
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
-            public void onLoadmore(RefreshLayout refreshLayout) {
+            public void onLoadMore(RefreshLayout refreshLayout) {
                 if (CommonUtil.isNetWorkConnected(mContext)) {
                     mPageIndex++;
                     getListData(mPageIndex, mKeyWord);
                 } else {
                     toast(R.string.networks_out);
-                    mRefreshLayout.finishLoadmore(500, false);
+                    mRefreshLayout.finishLoadMore(500, false,false);
                 }
             }
         });

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

@@ -1,6 +1,8 @@
 package com.uas.appworks.activity;
 
 import android.content.Intent;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -30,7 +32,7 @@ import com.me.network.app.http.HttpRequest;
 import com.me.network.app.http.Method;
 import com.modular.apputils.utils.RecyclerItemDecoration;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadmoreListener;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.InviteRegisterListAdapter;
@@ -87,8 +89,8 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
         mSearchEt = (ClearEditText) $(R.id.invite_register_list_search_et);
         mVoiceIv = (ImageView) $(R.id.invite_register_list_search_voice_iv);
         mRefreshLayout = (RefreshLayout) $(R.id.invite_register_list_refresh);
-        mRefreshLayout.setEnableAutoLoadmore(true);
-        mRefreshLayout.setEnableLoadmoreWhenContentNotFull(true);
+        mRefreshLayout.setEnableAutoLoadMore(true);
+        mRefreshLayout.setEnableLoadMoreWhenContentNotFull(true);
 
         mRecyclerView = (RecyclerView) $(R.id.invite_register_list_rv);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
@@ -105,6 +107,7 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
         return new WorkPlatPresenter();
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.CUPCAKE)
     @Override
     protected void initEvent() {
         mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
@@ -121,12 +124,12 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
             }
         });
 
-        mRefreshLayout.setOnLoadmoreListener(new OnLoadmoreListener() {
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
-            public void onLoadmore(RefreshLayout refreshLayout) {
+            public void onLoadMore(RefreshLayout refreshLayout) {
                 if (!CommonUtil.isNetWorkConnected(mContext)) {
                     toast(R.string.networks_out);
-                    mRefreshLayout.finishLoadmore(500, false);
+                    mRefreshLayout.finishLoadMore();
                 } else {
                     mPageIndex++;
                     requestList();
@@ -224,7 +227,7 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
                                 } else {
                                     progressDialog.dismiss();
                                     if (mRefreshLayout != null && mRefreshLayout.isLoading()) {
-                                        mRefreshLayout.finishLoadmoreWithNoMoreData();
+                                        mRefreshLayout.finishLoadMoreWithNoMoreData();
                                     }
                                 }
                                 return;
@@ -234,7 +237,7 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
                                 mRegisterListBeans.clear();
                             }
                             if (contentArray.size() < mPageSize && mPageIndex > 1 && mRefreshLayout != null && mRefreshLayout.isLoading()) {
-                                mRefreshLayout.finishLoadmoreWithNoMoreData();
+                                mRefreshLayout.finishLoadMoreWithNoMoreData();
                             }
                             hideLoading();
                             for (int i = 0; i < contentArray.size(); i++) {
@@ -312,7 +315,7 @@ public class InviteRegisterListActivity extends BaseMVPActivity<WorkPlatPresente
             mRefreshLayout.finishRefresh(0);
         }
         if (mRefreshLayout != null && mRefreshLayout.isLoading()) {
-            mRefreshLayout.finishLoadmore(0);
+            mRefreshLayout.finishLoadMore(0);
         }
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -25,7 +25,7 @@ import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.HttpRequest;
 import com.me.network.app.http.Method;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadmoreListener;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.appworks.OA.platform.activity.PurchaseDetailsActivity;
 import com.uas.appworks.R;
@@ -109,8 +109,8 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
         mEnuu = CommonUtil.getSharedPreferences(mContext, Constants.CACHE.B2B_BUSINESS_ENUU);
         mRecyclerView = $(R.id.b2b_list_rv);
         mRefreshLayout = $(R.id.b2b_list_refreshlayout);
-        mRefreshLayout.setEnableAutoLoadmore(true);
-        mRefreshLayout.setEnableLoadmoreWhenContentNotFull(true);
+        mRefreshLayout.setEnableAutoLoadMore(true);
+        mRefreshLayout.setEnableLoadMoreWhenContentNotFull(true);
 
         mB2BBusinessListBeans = new ArrayList<>();
         mB2BBusinessListAdapter = new B2bBusinessListAdapter(mContext, mB2BBusinessListBeans);
@@ -229,15 +229,16 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
             }
         });
 
-        mRefreshLayout.setOnLoadmoreListener(new OnLoadmoreListener() {
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
-            public void onLoadmore(RefreshLayout refreshLayout) {
+            public void onLoadMore(RefreshLayout refreshLayout) {
                 if (CommonUtil.isNetWorkConnected(mContext)) {
                     mPageIndex++;
                     getListData(mPageIndex, mKeyWord);
                 } else {
                     toast(R.string.networks_out);
-                    mRefreshLayout.finishLoadmore(500, false);
+                    //
+                    mRefreshLayout.finishLoadmore(500);
                 }
             }
         });

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

@@ -2,7 +2,7 @@
 <com.scwang.smartrefresh.layout.SmartRefreshLayout
     android:id="@+id/b2b_business_main_refreshlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/com.scwang.smartrefresh.layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"

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

@@ -2,7 +2,7 @@
 <com.scwang.smartrefresh.layout.SmartRefreshLayout
     android:id="@+id/b2b_list_refreshlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/com.scwang.smartrefresh.layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:srlFixedHeaderViewId="@+id/tab_viewpager_tab_ll">

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/com.scwang.smartrefresh.layout"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

version.gradle

@@ -47,7 +47,7 @@ ext {
             BaseRecyclerViewAdapterHelperVersion: '2.9.30',
             addSubUtilsVersion                  : '1.5.0',
             bannerVersion                       : '1.4.10',
-            smartRefreshLayoutVersion           : '1.0.4',
+            smartRefreshLayoutVersion           : '1.0.5.1',
             rxJava2Version                      : '2.0.7',
             rxAndroid2Version                   : '2.0.1',
             bottomsheetVersion                  : '1.5.3'