处理测试反馈bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/NestingScrollview.java

@@ -1,67 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.view;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import android.widget.ScrollView;
-
-public class NestingScrollview  extends ScrollView {
-    private int downX;
-    private int downY;
-    private int mTouchSlop;
-    private boolean autoScroll = true;
-
-    /**
-     * 多层嵌套时的自动滚动
-     * @param autoScroll
-     */
-    public void setAutoScroll(boolean autoScroll) {
-        this.autoScroll = autoScroll;
-    }
-
-    /**
-     * 防止多层嵌套时候的自动滚动
-     * @param rect
-     * @return
-     */
-    @Override
-    protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
-            return autoScroll?super.computeScrollDeltaToGetChildRectOnScreen(rect):0;
-    }
-
-
-    public NestingScrollview(Context context) {
-        super(context);
-        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
-    }
-
-    public NestingScrollview(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
-    }
-
-    public NestingScrollview(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent e) {
-        int action = e.getAction();
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-                downX = (int) e.getRawX();
-                downY = (int) e.getRawY();
-                break;
-            case MotionEvent.ACTION_MOVE:
-                int moveY = (int) e.getRawY();
-                if (Math.abs(moveY - downY) > mTouchSlop) {
-                    return true;
-                }
-        }
-        return super.onInterceptTouchEvent(e);
-    }
-
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/OAHttpUtil.java

@@ -70,7 +70,7 @@ public class OAHttpUtil {
             //录入时间作为选择时间，如果没有录入，使用实际到达时间或是预计到达时间或开始时间
             model.setRecorddate(getTimeMillis(o, "recorddate", "vr_recorddate", "vr_date", "mpd_arrivedate", "startdate", "mpd_actdate"));
             model.setTitle(JSONUtil.getText(o, "mpd_company", "name", "vr_cuname", "taskname", "custname"));
-            model.setRemark(JSONUtil.getText(o, "mpd_remark", "vr_detail", "detail", "description"));
+            model.setRemark(JSONUtil.getText(o, "mpd_remark", "vr_nichestep","vr_detail", "detail", "description"));
             model.setAddress(JSONUtil.getText(o, "vr_cuaddress", "mpd_address", "address"));
             model.setRecorder(JSONUtil.getText(o, "vr_emname", "recorder", "mp_recorder"));
             //外勤计划的实行人就是录入人

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

@@ -283,7 +283,6 @@ public class CommonInterface implements OnHttpResultListener {
         param.put("ct_cucode", cucode);//客户编号
         param.put("ct_address", address);//客户地址
         param.put("ct_job", job);      //岗位
-
         return param;
     }
 

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

@@ -37,6 +37,7 @@
             android:background="@color/white"
             android:layout_height="30dp">
             <TextView
+                android:id="@+id/detailsTV"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="bottom"

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/MessageWebActivity.java

@@ -18,8 +18,6 @@ import com.common.system.SystemUtil;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.IntentUtils;
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshWebView;
 import com.modular.appmessages.R;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -28,7 +26,7 @@ import com.umeng.socialize.media.UMImage;
 public class MessageWebActivity extends BaseActivity {
 
 
-    private PullToRefreshWebView webViewRefresh;
+    private WebView webViewRefresh;
     private ProgressBar progressBar;
     private String url;
 
@@ -36,7 +34,7 @@ public class MessageWebActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_message_web);
-        webViewRefresh = (PullToRefreshWebView) findViewById(R.id.webViewRefresh);
+        webViewRefresh = (WebView) findViewById(R.id.webView);
         progressBar = (ProgressBar) findViewById(R.id.progressBar);
         initView();
         initData();
@@ -85,17 +83,17 @@ public class MessageWebActivity extends BaseActivity {
     }
 
     private void initView() {
-        webViewRefresh.getRefreshableView().getSettings().setJavaScriptEnabled(true);
-        webViewRefresh.getRefreshableView().getSettings().setSupportZoom(true);
-        webViewRefresh.getRefreshableView().getSettings().setBuiltInZoomControls(true);
-        webViewRefresh.getRefreshableView().getSettings().setUseWideViewPort(true);
-        webViewRefresh.getRefreshableView().getSettings().setDomStorageEnabled(true);
-        webViewRefresh.getRefreshableView().getSettings().setLoadWithOverviewMode(true);
-        webViewRefresh.getRefreshableView().getSettings().setDefaultTextEncodingName("utf-8");
-        webViewRefresh.getRefreshableView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
-        webViewRefresh.getRefreshableView().clearCache(true);
-        webViewRefresh.getRefreshableView().clearHistory();
-        webViewRefresh.getRefreshableView().setWebViewClient(new WebViewClient() {
+        webViewRefresh.getSettings().setJavaScriptEnabled(true);
+        webViewRefresh.getSettings().setSupportZoom(true);
+        webViewRefresh.getSettings().setBuiltInZoomControls(true);
+        webViewRefresh.getSettings().setUseWideViewPort(true);
+        webViewRefresh.getSettings().setDomStorageEnabled(true);
+        webViewRefresh.getSettings().setLoadWithOverviewMode(true);
+        webViewRefresh.getSettings().setDefaultTextEncodingName("utf-8");
+        webViewRefresh.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+        webViewRefresh.clearCache(true);
+        webViewRefresh.clearHistory();
+        webViewRefresh.setWebViewClient(new WebViewClient() {
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 view.loadUrl(url);
                 return true;
@@ -120,24 +118,23 @@ public class MessageWebActivity extends BaseActivity {
                 handler.proceed();
             }
         });
-        webViewRefresh.getRefreshableView().setWebChromeClient(new WebChromeClient() {
+        webViewRefresh.setWebChromeClient(new WebChromeClient() {
             @Override
             public void onProgressChanged(WebView view, int newProgress) {
                 progressBar.setProgress(newProgress);
                 if (newProgress == 100) {
                     progressBar.setProgress(newProgress);
                     progressBar.setVisibility(View.GONE);
-                    webViewRefresh.onRefreshComplete();
                 }
                 super.onProgressChanged(view, newProgress);
             }
         });
-        webViewRefresh.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<WebView>() {
-            @Override
-            public void onRefresh(PullToRefreshBase<WebView> refreshView) {
-                loadData();
-            }
-        });
+//        webViewRefresh.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<WebView>() {
+//            @Override
+//            public void onRefresh(PullToRefreshBase<WebView> refreshView) {
+//                loadData();
+//            }
+//        });
     }
 
     private void initData() {
@@ -154,7 +151,7 @@ public class MessageWebActivity extends BaseActivity {
 
     private void loadData() {
         if (url != null) {
-            webViewRefresh.getRefreshableView().loadUrl(url);
+            webViewRefresh.loadUrl(url);
         }
 
     }

app_modular/appmessages/src/main/res/layout/activity_message_web.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -17,12 +16,40 @@
         android:indeterminateDuration="500"
         android:indeterminateOnly="false"
         android:max="100"
-        android:progressDrawable="@drawable/webview_progress_bar"/>
+        android:progressDrawable="@drawable/webview_progress_bar" />
 
-    <com.handmark.pulltorefresh.library.PullToRefreshWebView
-        android:id="@+id/webViewRefresh"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/progressBar"
-        android:background="@color/linen"/>
+        android:layout_below="@id/progressBar">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#38373e">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="10dp"
+                android:text="此网页由www.ubtob.com 提供"
+                android:textColor="@color/ivory"
+                android:textSize="@dimen/text_main" />
+        </RelativeLayout>
+
+        <com.module.recyclerlibrary.ui.refresh.webempty.EmptyRefreshLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:fectiveScroll="0dp">
+
+            <WebView
+                android:id="@+id/webView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.module.recyclerlibrary.ui.refresh.webempty.EmptyRefreshLayout>
+
+    </FrameLayout>
+
+
 </RelativeLayout>

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessStateActivity.java

@@ -479,12 +479,12 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                     int countb = JSONUtil.getInt(object, "countb");
                     int countc = JSONUtil.getInt(object, "countc");
                     int countd = ListUtils.getSize(arrayd);
-                    if (page > 1) {
-                        counta += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_unmanger), 0);
-                        countb += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_manged), 0);
-                        countc += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_timeout), 0);
-                        countd += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_transtered), 0);
-                    }
+//                    if (page > 1) {
+//                        counta += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_unmanger), 0);
+//                        countb += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_manged), 0);
+//                        countc += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_timeout), 0);
+//                        countd += StringUtil.getFirstInt(StringUtil.getTextRexHttp(tv_transtered), 0);
+//                    }
                     CommonUtil.textSpanForStyle(tv_unmanger, counta + getString(R.string.Unscheduled_schedule), String.valueOf(counta), ct.getResources().getColor(R.color.yellow_home));
                     CommonUtil.textSpanForStyle(tv_manged, countb + getString(R.string.Has_been_scheduled), String.valueOf(countb), ct.getResources().getColor(R.color.yellow_home));
                     CommonUtil.textSpanForStyle(tv_timeout, countc + getString(R.string.Will_time_out), String.valueOf(countc), ct.getResources().getColor(R.color.yellow_home));

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/TaskAddErpActivity.java

@@ -54,6 +54,8 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     private EditText et_task_detail;
     private TagGroup et_task_people;
     private ImageView iv_find;
+    private TextView tv_title;
+    private TextView detailsTV;
     private TextView et_startime;
     private TextView et_endtime;
     private ImageView voice_search_iv;
@@ -74,6 +76,8 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     private void initIDS() {
 
         voice_search_iv = (ImageView) findViewById(R.id.voice_search_iv);
+        tv_title = (TextView) findViewById(R.id.tv_title);
+        detailsTV = (TextView) findViewById(R.id.detailsTV);
         et_endtime = (TextView) findViewById(R.id.et_endtime);
         et_title = (EditText) findViewById(R.id.et_title);
         et_task_detail = (EditText) findViewById(R.id.et_task_detail);
@@ -97,6 +101,8 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             switch (type) {
                 case 1:
                     title = R.string.oacreat_calender;
+                    tv_title.setText("日程标题");
+                    detailsTV.setText("任务详情");
                     break;
                 case 2:
                     title = R.string.create_meet_task;

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/SelectAimAdapter.java

@@ -90,9 +90,26 @@ public class SelectAimAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
     private void bindLoadView(LoadViewHolder holder, SelectAimModel model) throws Exception {
         holder.title_tv.setText(getNull(model.getName()));
         holder.sub_tv.setText(getNull(model.getAddress()));
-        holder.time_tv.setText(MyApplication.getInstance().getString(R.string.last_visit)+" " + getNull(model.getTime()));
-        holder.times_tv.setText(MyApplication.getInstance().getString(R.string.visit_num)+" "  + getNull(model.getTimes() + MyApplication.getInstance().getString(R.string.sign_Times)));
-        holder.distance_tv.setText(getKm(BaiduMapUtil.getInstence().getDistance(model.getLatLng())));
+
+        if (model.getLatLng()==null){
+            holder.distance_tv.setVisibility(View.GONE);
+        }else{
+            holder.distance_tv.setVisibility(View.VISIBLE);
+            holder.distance_tv.setText(getKm(BaiduMapUtil.getInstence().getDistance(model.getLatLng())));
+        }
+        if (model.getTimes()==-1){
+            holder.times_tv.setVisibility(View.GONE);
+        }else{
+            holder.times_tv.setVisibility(View.VISIBLE);
+            holder.times_tv.setText(MyApplication.getInstance().getString(R.string.visit_num)+" "  + getNull(model.getTimes() + MyApplication.getInstance().getString(R.string.sign_Times)));
+        }
+        if (StringUtil.isEmpty(model.getTime())){
+            holder.time_tv.setVisibility(View.GONE);
+        }else{
+            holder.time_tv.setVisibility(View.VISIBLE);
+            holder.time_tv.setText(MyApplication.getInstance().getString(R.string.last_visit)+" " + getNull(model.getTime()));
+        }
+
         holder.tag_tv.setVisibility(model.isFirst() ? View.VISIBLE : View.GONE);
         holder.tag_view.setVisibility(model.isFirst() ? View.VISIBLE : View.GONE);
     }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/presenter/SelectAimPresenter.java

@@ -126,13 +126,13 @@ public class SelectAimPresenter implements OnHttpResultListener {
         param.put("condition", "1=1");
         param.put(isB2b ? "pageNumber" : "pageIndex", 1);
         param.put("pageSize", 1000);
-        String url =isB2b? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutAddress: "mobile/getOutAddressDate.action";
-        Request request=new Request.Bulider()
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutAddress : "mobile/getOutAddressDate.action";
+        Request request = new Request.Bulider()
                 .setMode(Request.Mode.GET)
                 .setUrl(url)
                 .setWhat(LOAD)
                 .setParam(param).bulid();
-        OAHttpHelper.getInstance().requestHttp(request,this);
+        OAHttpHelper.getInstance().requestHttp(request, this);
 
     }
 
@@ -153,13 +153,13 @@ public class SelectAimPresenter implements OnHttpResultListener {
         //获取网络数据
         Map<String, Object> param = new HashMap<>();
         param.put("sellercode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
-        String url ="mobile/crm/getCustomerbySeller.action";
-        Request request=new Request.Bulider()
+        String url = "mobile/crm/getCustomerbySeller.action";
+        Request request = new Request.Bulider()
                 .setMode(Request.Mode.GET)
                 .setUrl(url)
                 .setWhat(LOAD_CUSTOMER)
                 .setParam(param).bulid();
-        OAHttpHelper.getInstance().requestHttp(request,this);
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     //下载附近数据
@@ -248,7 +248,7 @@ public class SelectAimPresenter implements OnHttpResultListener {
     }
 
     @Override
-    public void error(int what,  String message, Bundle bundle) {
+    public void error(int what, String message, Bundle bundle) {
         if (iSelectAim != null)
             iSelectAim.dimssLoading();
     }
@@ -321,6 +321,7 @@ public class SelectAimPresenter implements OnHttpResultListener {
                 // model.setTimes(object.getInteger("MD_VISITCOUNT"));
                 model.setName(object.getString("CU_NAME"));
                 model.setObject(JSON.toJSONString(object));
+                model.setTimes(-1);
                 //TODO id先不要
 //                model.seti(object.getInteger("MD_ID"));
                 model.setType(2);

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

@@ -85,6 +85,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     } else {
                         ToastUtil.showToast(ct, "获取id错误");
                     }
+                    submiting = false;
                     break;
                 case whatSignin:
                     JSONObject json = parseObject(message);
@@ -142,6 +143,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     ToastUtil.showToast(ct, message == null ? "" : StringUtil.getChinese(message));
                     break;
             }
+
         }
     };
 
@@ -199,7 +201,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         end_tv = (TextView) findViewById(R.id.end_tv);
         users_tv = (TextView) findViewById(R.id.users_tv);
         location_et = (TextView) findViewById(R.id.location_et);
-        name_et= (EditText) findViewById(R.id.name_et);
+        name_et = (EditText) findViewById(R.id.name_et);
         about_et = (EditText) findViewById(R.id.about_et);
         tag_et = (TextView) findViewById(R.id.tag_et);
         user_tv = (TextView) findViewById(R.id.user_tv);
@@ -224,11 +226,11 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     @Override
     public void onClick(View view) {
         Intent intent = null;
-        if (view.getId() == R.id.start_rl){
+        if (view.getId() == R.id.start_rl) {
             turn2SelectCalendar();
-        }else if (view.getId() ==  R.id.end_rl){
+        } else if (view.getId() == R.id.end_rl) {
             turn2SelectCalendar();
-        }else if (view.getId() == R.id.users_rl){
+        } else if (view.getId() == R.id.users_rl) {
             intent = new Intent("com.modular.main.SelectCollisionActivity");
             SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
                     .setSureText(getString(R.string.common_sure))
@@ -237,18 +239,18 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     .setSelectCode(getSelectCode());
             intent.putExtra(OAConfig.MODEL_DATA, bean);
             startActivityForResult(intent, 0x21);
-        }else if (view.getId() == R.id.tag_rl){
+        } else if (view.getId() == R.id.tag_rl) {
             getMeetTag();
-        }else if (view.getId() == R.id.location_rl){
+        } else if (view.getId() == R.id.location_rl) {
             getMeetRoom();
-        }else if (view.getId() == R.id.voice_name_iv){
+        } else if (view.getId() == R.id.voice_name_iv) {
             voice_type = 1;
             RecognizerDialog dialog = new RecognizerDialog(this, null);
             dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
             dialog.setParameter(SpeechConstant.ACCENT, "mandarin");
             dialog.setListener(this);
             dialog.show();
-        }else if (view.getId() == R.id.voice_introduce_iv){
+        } else if (view.getId() == R.id.voice_introduce_iv) {
             voice_type = 2;
             RecognizerDialog dialog = new RecognizerDialog(this, null);
             dialog = new RecognizerDialog(this, null);
@@ -256,17 +258,24 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             dialog.setParameter(SpeechConstant.ACCENT, "mandarin");
             dialog.setListener(this);
             dialog.show();
-        }else if (view.getId() == R.id.bt_save){
-            CommonInterface.getInstance().getCodeByNet("Meetingroomapply", new CommonInterface.OnResultListener() {
-                @Override
-                public void result(boolean isOk, int what, String message) {
-                    ma_code = message;
-                    getIdByNet();
-                }
-            });
+        } else if (view.getId() == R.id.bt_save) {
+            if (submiting) {
+
+            } else {
+                CommonInterface.getInstance().getCodeByNet("Meetingroomapply", new CommonInterface.OnResultListener() {
+                    @Override
+                    public void result(boolean isOk, int what, String message) {
+                        ma_code = message;
+                        getIdByNet();
+                    }
+                });
+                submiting = true;
+            }
         }
     }
 
+    private boolean submiting = false;
+
     private void endOfActivity() {
 //        Intent intent = new Intent();
 //        intent.putExtra("data", "data");
@@ -341,7 +350,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
-                if (tv.getId() == R.id.start_tv){
+                if (tv.getId() == R.id.start_tv) {
                     if (!StringUtil.isEmpty(end_tv.getText().toString())) {
                         if (end_tv.getText().toString().compareTo(time) < 0) {
                             ToastUtil.showToast(ct, R.string.not_time_start_biger_end);
@@ -351,7 +360,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     } else {
                         start_tv.setText(time);
                     }
-                }else if (tv.getId() == R.id.end_tv){
+                } else if (tv.getId() == R.id.end_tv) {
                     if (time.compareTo(start_tv.getText().toString()) <= 0) {
                         ToastUtil.showToast(ct, R.string.not_time_start_biger_end);
                     } else {
@@ -606,8 +615,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         } else if (requestCode == 0x30 && resultCode == 0x11) {
             String startDate = data.getStringExtra("startDate");
             String endDate = data.getStringExtra("endDate");
-            start_tv.setText(StringUtil.getMessage(startDate)+":00");
-            end_tv.setText(StringUtil.getMessage(endDate)+":00");
+            start_tv.setText(StringUtil.getMessage(startDate) + ":00");
+            end_tv.setText(StringUtil.getMessage(endDate) + ":00");
         }
     }
 

app_third/recyclerlibrary/src/main/java/com/module/recyclerlibrary/adapter/BaseRecycAdapter.java

@@ -14,7 +14,7 @@ import java.util.List;
  * Created by Bitliker on 2017/9/19.
  */
 
-public abstract class BaseRecycAdapter<T> extends RecyclerView.Adapter<BaseViewHolder> {
+public abstract class BaseRecycAdapter<T> extends RecyclerView.Adapter<BaseRecycAdapter.ViewHodler> {
 
     protected Context ct;
     protected List<BaseModel<T>> datas;
@@ -32,7 +32,7 @@ public abstract class BaseRecycAdapter<T> extends RecyclerView.Adapter<BaseViewH
     }
 
     @Override
-    public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public ViewHodler onCreateViewHolder(ViewGroup parent, int viewType) {
         return null;
     }
 
@@ -42,7 +42,7 @@ public abstract class BaseRecycAdapter<T> extends RecyclerView.Adapter<BaseViewH
         return datas == null ? 0 : datas.size();
     }
 
-    public abstract void onBindViewHolder(BaseViewHolder holder, int position);
+    public abstract void onBindViewHolder(ViewHodler holder, int position);
 
     public abstract void onCreateViewHolder(View view, int viewType);
 

app_third/recyclerlibrary/src/main/java/com/module/recyclerlibrary/ui/refresh/BaseRefreshLayout.java

@@ -12,6 +12,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 import android.widget.AdapterView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
@@ -47,7 +48,7 @@ public abstract class BaseRefreshLayout extends ViewGroup {
             mEnablePullUp = array.getBoolean(R.styleable.BaseRefreshLayout_enablePullUp, true);
             mPullBgDrawable = array.getDrawable(R.styleable.BaseRefreshLayout_pullBackground);
             mEffectiveScroll = (int) array.getDimension(R.styleable.BaseRefreshLayout_fectiveScroll, dip2px(context, -1));
-            if (mEffectiveScroll <= 0) {
+            if (mEffectiveScroll < 0) {
                 mEffectiveScroll = (int) context.getResources().getDimension(R.dimen.refresh_item_height);
             }
         } finally {
@@ -181,6 +182,8 @@ public abstract class BaseRefreshLayout extends ViewGroup {
                         intercept = svPullDownIntercept(child);
                     } else if (child instanceof RecyclerView) {
                         intercept = rvPullDownIntercept(child);
+                    } else if (child instanceof WebView) {
+                        intercept = webViewPullDownIntercept(child);
                     }
                 } else if (y < mLastYIntercept) { // 上拉操作
                     // 获取最底部的子视图
@@ -251,6 +254,15 @@ public abstract class BaseRefreshLayout extends ViewGroup {
         return intercept;
     }
 
+    private boolean webViewPullDownIntercept(View child) {
+        boolean intercept = false;
+        WebView recyclerChild = (WebView) child;
+        if (recyclerChild.getScrollY() == 0) {
+            intercept = true;
+        }
+        return intercept;
+    }
+
     private boolean rvPullDownIntercept(View child) {
         boolean intercept = false;
 

app_third/recyclerlibrary/src/main/java/com/module/recyclerlibrary/ui/refresh/simlpe/SimpleRefreshHeader.java

@@ -25,6 +25,10 @@ public class SimpleRefreshHeader extends BaseRefreshView {
         statusTV = (TextView) findViewById(R.id.statusTV);
 
     }
+    public void hintAll(){
+        statusImg.setVisibility(GONE);
+        statusTV.setVisibility(GONE);
+    }
 
 
     @Override

app_third/recyclerlibrary/src/main/java/com/module/recyclerlibrary/ui/refresh/webempty/EmptyRefreshLayout.java

@@ -0,0 +1,33 @@
+package com.module.recyclerlibrary.ui.refresh.webempty;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+
+import com.module.recyclerlibrary.ui.refresh.BaseRefreshLayout;
+import com.module.recyclerlibrary.ui.refresh.BaseRefreshView;
+import com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshFooter;
+import com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshHeader;
+
+/**
+ * Created by Bitliker on 2017/9/19.
+ */
+
+public class EmptyRefreshLayout extends BaseRefreshLayout {
+
+    public EmptyRefreshLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected BaseRefreshView getHeader(LayoutInflater mInflater) {
+        SimpleRefreshHeader baseRefreshView = new SimpleRefreshHeader(getContext(), mInflater);
+        baseRefreshView.hintAll();
+        return baseRefreshView;
+    }
+
+    @Override
+    protected BaseRefreshView getFooter(LayoutInflater mInflater) {
+        return new SimpleRefreshFooter(getContext(), mInflater);
+    }
+}