pull冲突解决

WeiChat/build.gradle

@@ -17,10 +17,10 @@ android {
             keyPassword '13237658359'
         }
     }
-    
+
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
-   
+
     defaultConfig {
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
@@ -33,6 +33,10 @@ android {
         // 默认是umeng的渠道
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
+
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+        }
     }
 
     useLibrary 'org.apache.http.legacy'
@@ -82,7 +86,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     //依赖库
     testCompile deps.junit
     compile deps.appcompatV7
@@ -103,7 +107,6 @@ dependencies {
     compile deps.stickyListHeaders
     compile deps.stickyGridHeaders
     compile deps.materialDialogs
-
     androidTestCompile deps.leakcanaryNp
     debugCompile deps.leakcanary
     releaseCompile deps.leakcanaryNp

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="111"
-    android:versionName="5.8.9">
+    android:versionCode="113"
+    android:versionName="5.9.0">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -127,8 +127,9 @@
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" />
-
-         <!--启动页面 -->
+        
+        
+        <!-- 启动页面 -->
         <activity android:name=".ui.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -80,7 +80,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     private MyListView mHistoryDataLv;
     private LinearLayout mExactWholeLl;
     private LinearLayout mExactOptionLl;
-    private MyListView mExactOptionLv;
+    private ListView mExactOptionLv;
     private TextView mExactOptionCancelTv;
     private TextView mExactOptionResetTv;
     private TextView mExactOptionConfirmTv;
@@ -410,7 +410,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mHistoryDataLv = (MyListView) findViewById(R.id.data_inquiry_list_history_data_lv);
         mExactWholeLl = (LinearLayout) findViewById(R.id.data_inquiry_list_exact_ll);
         mExactOptionLl = (LinearLayout) findViewById(R.id.data_inquiry_list_option_ll);
-        mExactOptionLv = (MyListView) findViewById(R.id.data_inquiry_list_option_lv);
+        mExactOptionLv = (ListView) findViewById(R.id.data_inquiry_list_option_lv);
         mExactOptionCancelTv = (TextView) findViewById(R.id.data_inquiry_list_option_cancel_tv);
         mExactOptionResetTv = (TextView) findViewById(R.id.data_inquiry_list_option_reset_tv);
         mExactOptionConfirmTv = (TextView) findViewById(R.id.data_inquiry_list_option_confirm_tv);
@@ -495,6 +495,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     if (mHistoricalRecordAdapter.getObjects().size() > 0) {
                         if (mFuzzyWholeLl.getVisibility() == View.GONE) {
                             mFuzzyHistoryLl.startAnimation(mInAnimation);
+                            mHistoryDataLv.setEnabled(true);
                             mFuzzyWholeLl.setVisibility(View.VISIBLE);
                         }
                     }
@@ -503,6 +504,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
                     if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
                         mFuzzyWholeLl.setVisibility(View.GONE);
+                        mHistoryDataLv.setEnabled(false);
                     }
 
                 }
@@ -512,14 +514,17 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mFuzzyViewBg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mFuzzyHistoryLl.startAnimation(mOutAnimation);
+                if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
+                    mFuzzyHistoryLl.startAnimation(mOutAnimation);
+                }
             }
         });
 
         mExactViewBg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mExactOptionLl.startAnimation(mOutAnimation);
+                if (mExactWholeLl.getVisibility() == View.VISIBLE)
+                    mExactOptionLl.startAnimation(mOutAnimation);
             }
         });
 
@@ -534,6 +539,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 mSearchEditText.clearFocus();
                 mExactWholeLl.setVisibility(View.GONE);
                 mFuzzyWholeLl.setVisibility(View.GONE);
+                mHistoryDataLv.setEnabled(false);
                 CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
             }
 
@@ -546,6 +552,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mHistoryDataLv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                mFuzzyWholeLl.setVisibility(View.GONE);
+                mHistoryDataLv.setEnabled(false);
+                mSearchEditText.clearFocus();
                 HistoricalRecordBean historicalRecordBean = mHistoricalRecordAdapter.getObjects().get(position);
                 mSearchEditText.setText(historicalRecordBean.getSearchField());
                 mSearchField = historicalRecordBean.getSearchField();
@@ -563,8 +572,6 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     Log.d("fuzzyCondition", mCondition);
 
                     mPageIndex = 1;
-                    mSearchEditText.clearFocus();
-                    mFuzzyWholeLl.setVisibility(View.GONE);
                     progressDialog.show();
                     getSchemeData();
                 }
@@ -579,6 +586,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 //                CommonUtil.closeKeybord(mSearchEditText, this);
                 if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
                     mFuzzyWholeLl.setVisibility(View.GONE);
+                    mHistoryDataLv.setEnabled(false);
                 }
                 mSearchEditText.clearFocus();
                 mSearchField = "";
@@ -586,6 +594,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     if (mExactWholeLl.getVisibility() == View.VISIBLE) {
                         mExactOptionLl.startAnimation(mOutAnimation);
                     } else {
+                        mDataInquirySchemeConditionAdapter.resetTouchPosition();
                         mExactOptionLl.startAnimation(mInAnimation);
                         mExactWholeLl.setVisibility(View.VISIBLE);
                     }
@@ -734,6 +743,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             mSearchField = searchField;
             mSearchEditText.clearFocus();
             mFuzzyWholeLl.setVisibility(View.GONE);
+            mHistoryDataLv.setEnabled(false);
             progressDialog.show();
             getSchemeData();
             return true;

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

@@ -16,6 +16,7 @@ import java.util.List;
 
 /**
  * Created by RaoMeng on 2017/8/14.
+ * 数据查询九宫格更多菜单页面
  */
 public class DataInquiryMoreMenuActivity extends BaseActivity implements AdapterView.OnItemClickListener {
     private ListView mMenuListView;

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

@@ -12,6 +12,7 @@ import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
@@ -24,7 +25,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.util.PermissionUtil;
-import com.xzjmyk.pm.activity.view.MyListView;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -43,11 +43,12 @@ import java.util.Map;
 
 /**
  * Created by RaoMeng on 2017/8/16.
+ * 报表统计查询页面
  */
 public class ReportQueryCriteriaActivity extends BaseActivity implements View.OnClickListener {
     private final int REQUEST_WRITE_EXTERNAL_STORAGE = 0X22;
     private final int GET_OPTION_DATA = 0X11;
-    private MyListView mOptionListView;
+    private ListView mOptionListView;
     private TextView mCancelTextView, mResetTextView, mConfirmTextView;
     private GridMenuReportStatisticsBean.ListBean mReportInfo;
     private String mCondition = "";
@@ -163,7 +164,7 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
     private void initViews() {
         getSupportActionBar().setTitle(R.string.report_query);
 
-        mOptionListView = (MyListView) findViewById(R.id.report_query_criteria_lv);
+        mOptionListView = (ListView) findViewById(R.id.report_query_criteria_lv);
         mCancelTextView = (TextView) findViewById(R.id.report_query_criteria_cancel_btn);
         mResetTextView = (TextView) findViewById(R.id.report_query_criteria_reset_btn);
         mConfirmTextView = (TextView) findViewById(R.id.report_query_criteria_confirm_btn);

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

@@ -16,6 +16,7 @@ import java.util.List;
 
 /**
  * Created by RaoMeng on 2017/8/14.
+ * 报表统计九宫格更多菜单页面
  */
 public class ReportStatisticsMoreMenuActivity extends BaseActivity implements AdapterView.OnItemClickListener {
     private ListView mMenuListView;

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

@@ -14,6 +14,10 @@ import com.xzjmyk.pm.activity.view.MyListView;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 数据查询列表伸缩菜单适配器
+ */
 public class DataInquiryFlexAdapter extends BaseAdapter {
 
     private List<DataInquiryFlexBean> objects = new ArrayList<DataInquiryFlexBean>();

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

@@ -14,6 +14,10 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryFlexBe
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 数据查询列表伸缩菜单子适配器
+ */
 public class DataInquiryFlexChildAdapter extends BaseAdapter {
 
     private List<DataInquiryFlexBean.RowBean> objects = new ArrayList<DataInquiryFlexBean.RowBean>();

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

@@ -14,6 +14,10 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryGirdIt
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 数据查询九宫格菜单子项适配器
+ */
 public class DataInquiryMenuGridAdapter extends BaseAdapter {
 
     private List<DataInquiryGirdItemBean> objects = new ArrayList<DataInquiryGirdItemBean>();

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

@@ -20,6 +20,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 数据查询九宫格菜单适配器
+ */
 public class DataInquiryMenuListAdapter extends BaseAdapter {
 
     private List<GridMenuDataInquiryBean> objects = new ArrayList<GridMenuDataInquiryBean>();

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

@@ -13,6 +13,10 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.CircleTextView;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 数据查询九宫格【更多】菜单适配器
+ */
 public class DataInquiryMoreMenuAdapter extends BaseAdapter {
     private List<String> objects = new ArrayList<String>();
 

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

@@ -25,12 +25,17 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 数据查询列表页面高级查询配置选项适配器
+ */
 public class DataInquirySchemeConditionAdapter extends BaseAdapter {
     private List<SchemeConditionBean> objects = new ArrayList<SchemeConditionBean>();
 
     private Context context;
     private LayoutInflater layoutInflater;
     private boolean strChanged = true, numChanged1 = true, numChanged2 = true;
+    private int mTouchPosition = -1, mTouchIndex = -1;
 
     public DataInquirySchemeConditionAdapter(Context context, List<SchemeConditionBean> objects) {
         this.context = context;
@@ -38,6 +43,11 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
         this.objects = objects;
     }
 
+    public void resetTouchPosition() {
+        mTouchPosition = -1;
+        mTouchIndex = -1;
+    }
+
     @Override
     public int getCount() {
         return objects.size();
@@ -59,12 +69,18 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
         convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_exact_query, null);
         convertView.setTag(new ViewHolder(convertView));
 //        }
-        initializeViews((SchemeConditionBean) getItem(position), (ViewHolder) convertView.getTag());
+        initializeViews((SchemeConditionBean) getItem(position), (ViewHolder) convertView.getTag(), position);
         return convertView;
     }
 
-    private void initializeViews(final SchemeConditionBean object, final ViewHolder holder) {
+    private void initializeViews(final SchemeConditionBean object, final ViewHolder holder, int position) {
         holder.captionTv.setText(object.getCaption());
+        holder.captionTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
 
         switch (object.getType()) {
 
@@ -75,6 +91,9 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                 holder.gridview.setVisibility(View.GONE);
                 List<SchemeConditionBean.Property> mProperties = object.getProperties();
 
+                holder.numEdittext1.setTag(position);
+                holder.numEdittext2.setTag(position);
+
                 holder.numEdittext1.addTextChangedListener(new TextWatcher() {
                     @Override
                     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -115,6 +134,44 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                     }
                 });
 
+                /*holder.numEdittext1.setOnTouchListener(new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        mTouchPosition = (int) holder.numEdittext1.getTag();
+                        mTouchIndex = 1;
+                        return false;
+                    }
+                });
+
+                holder.numEdittext2.setOnTouchListener(new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        mTouchPosition = (int) holder.numEdittext2.getTag();
+                        mTouchIndex = 2;
+                        return false;
+                    }
+                });*/
+
+                holder.numEdittext1.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View v, boolean hasFocus) {
+                        if (hasFocus) {
+                            mTouchPosition = (int) holder.numEdittext1.getTag();
+                            mTouchIndex = 1;
+                        }
+                    }
+                });
+
+                holder.numEdittext2.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View v, boolean hasFocus) {
+                        if (hasFocus) {
+                            mTouchPosition = (int) holder.numEdittext2.getTag();
+                            mTouchIndex = 2;
+                        }
+                    }
+                });
+
                 numChanged1 = true;
                 numChanged2 = true;
                 if (mProperties != null && mProperties.size() == 2) {
@@ -124,6 +181,22 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                     holder.numEdittext2.setText(mProperties.get(1).getDisplay());
                     numChanged2 = false;
                 }
+
+                if (mTouchPosition == position) {
+                    if (mTouchIndex == 1) {
+                        holder.numEdittext1.requestFocus();
+                        holder.numEdittext1.setSelection(holder.numEdittext1.getText().length());
+                    } else if (mTouchIndex == 2) {
+                        holder.numEdittext2.requestFocus();
+                        holder.numEdittext2.setSelection(holder.numEdittext2.getText().length());
+                    } else {
+                        holder.numEdittext1.clearFocus();
+                        holder.numEdittext2.clearFocus();
+                    }
+                } else {
+                    holder.numEdittext1.clearFocus();
+                    holder.numEdittext2.clearFocus();
+                }
                 break;
             case "D":
             case "CD":
@@ -142,20 +215,6 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
 
                 mProperties = object.getProperties();
 
-                holder.textview1.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-
-                    }
-                });
-
-                holder.textview2.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-
-                    }
-                });
-
                 holder.calendar1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -249,6 +308,8 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                 holder.gridview.setVisibility(View.GONE);
                 mProperties = object.getProperties();
 
+                holder.stringEdittext.setTag(position);
+
                 holder.stringEdittext.addTextChangedListener(new TextWatcher() {
                     @Override
                     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -269,11 +330,34 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                     }
                 });
 
+                /*holder.stringEdittext.setOnTouchListener(new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        mTouchPosition = (int) v.getTag();
+                        return false;
+                    }
+                });*/
+
+                holder.stringEdittext.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View v, boolean hasFocus) {
+                        if (hasFocus)
+                            mTouchPosition = (int) v.getTag();
+                    }
+                });
+
                 strChanged = true;
                 if (mProperties != null && object.getProperties().size() == 1) {
                     holder.stringEdittext.setText(mProperties.get(0).getDisplay());
                     strChanged = false;
                 }
+
+                if (mTouchPosition == position) {
+                    holder.stringEdittext.requestFocus();
+                    holder.stringEdittext.setSelection(holder.stringEdittext.getText().length());
+                } else {
+                    holder.stringEdittext.clearFocus();
+                }
                 break;
         }
     }

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

@@ -13,6 +13,10 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database.HistoricalRec
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 数据查询历史记录列表适配器
+ */
 public class HistoricalRecordAdapter extends BaseAdapter {
 
     private List<HistoricalRecordBean> objects = new ArrayList<HistoricalRecordBean>();

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

@@ -25,12 +25,17 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 报表统计高级查询配置选项适配器
+ */
 public class ReportQueryConditionAdapter extends BaseAdapter {
     private List<ReportConditionBean> objects = new ArrayList<ReportConditionBean>();
 
     private Context context;
     private LayoutInflater layoutInflater;
     private boolean strChanged = true, numChanged1 = true, numChanged2 = true;
+    private int mTouchPosition = -1, mTouchIndex = -1;
 
     public ReportQueryConditionAdapter(Context context, List<ReportConditionBean> objects) {
         this.context = context;
@@ -59,12 +64,18 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
         convertView = layoutInflater.inflate(R.layout.item_list_data_inquiry_exact_query, null);
         convertView.setTag(new ViewHolder(convertView));
 //        }
-        initializeViews((ReportConditionBean) getItem(position), (ViewHolder) convertView.getTag());
+        initializeViews((ReportConditionBean) getItem(position), (ViewHolder) convertView.getTag(), position);
         return convertView;
     }
 
-    private void initializeViews(final ReportConditionBean object, final ViewHolder holder) {
+    private void initializeViews(final ReportConditionBean object, final ViewHolder holder, int position) {
         holder.captionTv.setText(object.getTitle());
+        holder.captionTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
 
         switch (object.getType()) {
 
@@ -75,6 +86,9 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
                 holder.gridview.setVisibility(View.GONE);
                 List<ReportConditionBean.Property> mProperties = object.getProperties();
 
+                holder.numEdittext1.setTag(position);
+                holder.numEdittext2.setTag(position);
+
                 holder.numEdittext1.addTextChangedListener(new TextWatcher() {
                     @Override
                     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -115,6 +129,26 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
                     }
                 });
 
+                holder.numEdittext1.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View v, boolean hasFocus) {
+                        if (hasFocus) {
+                            mTouchPosition = (int) holder.numEdittext1.getTag();
+                            mTouchIndex = 1;
+                        }
+                    }
+                });
+
+                holder.numEdittext2.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View v, boolean hasFocus) {
+                        if (hasFocus) {
+                            mTouchPosition = (int) holder.numEdittext2.getTag();
+                            mTouchIndex = 2;
+                        }
+                    }
+                });
+
                 numChanged1 = true;
                 numChanged2 = true;
                 if (mProperties != null && mProperties.size() == 2) {
@@ -124,6 +158,22 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
                     holder.numEdittext2.setText(mProperties.get(1).getDisplay());
                     numChanged2 = false;
                 }
+
+                if (mTouchPosition == position) {
+                    if (mTouchIndex == 1) {
+                        holder.numEdittext1.requestFocus();
+                        holder.numEdittext1.setSelection(holder.numEdittext1.getText().length());
+                    } else if (mTouchIndex == 2) {
+                        holder.numEdittext2.requestFocus();
+                        holder.numEdittext2.setSelection(holder.numEdittext2.getText().length());
+                    } else {
+                        holder.numEdittext1.clearFocus();
+                        holder.numEdittext2.clearFocus();
+                    }
+                } else {
+                    holder.numEdittext1.clearFocus();
+                    holder.numEdittext2.clearFocus();
+                }
                 break;
             case "D":
             case "CD":
@@ -142,20 +192,6 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
 
                 mProperties = object.getProperties();
 
-                holder.textview1.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-
-                    }
-                });
-
-                holder.textview2.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-
-                    }
-                });
-
                 holder.calendar1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -248,6 +284,8 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
                 holder.gridview.setVisibility(View.GONE);
                 mProperties = object.getProperties();
 
+                holder.stringEdittext.setTag(position);
+
                 holder.stringEdittext.addTextChangedListener(new TextWatcher() {
                     @Override
                     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -268,11 +306,26 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
                     }
                 });
 
+                holder.stringEdittext.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View v, boolean hasFocus) {
+                        if (hasFocus)
+                            mTouchPosition = (int) v.getTag();
+                    }
+                });
+
                 strChanged = true;
                 if (mProperties != null && object.getProperties().size() == 1) {
                     holder.stringEdittext.setText(mProperties.get(0).getDisplay());
                     strChanged = false;
                 }
+
+                if (mTouchPosition == position) {
+                    holder.stringEdittext.requestFocus();
+                    holder.stringEdittext.setSelection(holder.stringEdittext.getText().length());
+                } else {
+                    holder.stringEdittext.clearFocus();
+                }
                 break;
         }
     }

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

@@ -20,6 +20,10 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Created by RaoMeng on 2017/8/14.
+ * 报表统计九宫格【更多】菜单列表适配器
+ */
 public class ReportStatisticsMenuListAdapter extends BaseAdapter {
     private List<GridMenuReportStatisticsBean> objects = new ArrayList<GridMenuReportStatisticsBean>();
 

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

@@ -5,6 +5,7 @@ import android.database.CursorWrapper;
 
 /**
  * Created by RaoMeng on 2017/8/18.
+ * 历史记录的CursorWrapper封装类
  */
 public class HistoricalRecordCursorWrapper extends CursorWrapper {
 

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

@@ -2,7 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
 
 /**
  * Created by RaoMeng on 2017/8/14.
- * 历史记录表
+ * 数据查询历史记录表
  */
 public class HistoricalRecordSchema {
     public static final class HistoricalRecordTable {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -749,8 +749,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master")
-                .equals("USOFTSYS")) {
+        if ("USOFTSYS".equals(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master"))
+                ) {
             if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
                 menu.findItem(R.id.oa_signin_set).setVisible(true);
             } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java

@@ -364,8 +364,9 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 }
                 LogUtil.i("url=" + url);
                 String master = model.master == null ? CommonUtil.getSharedPreferences(ct, "erp_master") : model.master;
-                if (CommonUtil.isReleaseVersion()) {
-                    CommonUtil.loadWebView(ct, url, title, master, null, null);
+            
+//                if (CommonUtil.isReleaseVersion()) {
+//                    CommonUtil.loadWebView(ct, url, title, master, null, null);
 //                    Intent intent = new Intent(ct, AppWebViewActivity.class);
 //                    intent.putExtra("url", url);
 //                    intent.putExtra("p", title);
@@ -373,7 +374,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
 //                    intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
 //                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 //                    startActivity(intent);
-                } else {
+//                } else {
                     Intent intent = new Intent(ct, ApprovalActivity.class);
                     intent.putExtra("imid", d_imids);
                     intent.putExtra("title", title);
@@ -381,7 +382,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     intent.putExtra("master", master);
                     intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
                     startActivity(intent);
-                }
+//                }
             }
         });
 

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

@@ -146,13 +146,12 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
                     mPresenter.loadNextProcess();
                 }
             } else if (0x22 == requestCode) {
-                if (StringUtils.isEmpty(name)) {
-                    name = "回退给制单人";
-                }
-                if (name.equals("回退给制单人")) {
-                    name = "RECORDER";
+                if (!StringUtils.isEmpty(name)) {
+                    if (name.equals("回退给制单人")) {
+                        name = "RECORDER";
+                    }
+                    mPresenter.disAgree(OACheckUtil.getText(opinionET), name);
                 }
-                mPresenter.disAgree(OACheckUtil.getText(opinionET), name);
             }
         } else if (0x25 == requestCode && 0x25 == resultCode) {
             mPresenter.initLoad();

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

@@ -121,6 +121,8 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
         if (platform) {
             my_client_rl.setVisibility(View.GONE);
         }
+        
+
         UserRoleUtils.checkUserRole(this, getmRootView());
     }
 
@@ -185,6 +187,7 @@ public class WorksFragment extends EasyFragment implements View.OnClickListener
                 startActivity(new Intent(getActivity(), StatisticsActivity.class));
                 break;
             case R.id.work_data_inquiry_rl:
+                
                 startActivity(new Intent(ct, DataInquiryActivity.class));
                 break;
             case R.id.work_report_statistics_rl:

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XReconnectionManager.java

@@ -18,6 +18,7 @@ import org.jivesoftware.smack.AbstractConnectionListener;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException.StreamErrorException;
 import org.jivesoftware.smack.packet.StreamError;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.util.StringUtils;
 
 import java.io.DataOutputStream;
@@ -60,6 +61,8 @@ public class XReconnectionManager extends AbstractConnectionListener {
 	public void setNetWorkState(boolean isNetWorkActive) {
 		mIsNetWorkActive = isNetWorkActive;
 		if (mIsNetWorkActive) {// 网络状态变为可用
+			LogUtil.d("Xmpp","isReconnectionAllowed:"+isReconnectionAllowed()
+			+" user:"+mConnection.getUser());
 			if (isReconnectionAllowed()) {
 				reconnect();
 			}
@@ -85,8 +88,14 @@ public class XReconnectionManager extends AbstractConnectionListener {
 			// Since there is no thread running, creates a new one to attempt
 			// the reconnection.
 			// avoid to run duplicated reconnectionThread -- fd: 16/09/2010
-			if (mReconnectionThread != null && mReconnectionThread.isAlive())
-				return;
+			if (mReconnectionThread != null && mReconnectionThread.isAlive()){
+				LogUtil.d("Xmpp","mReconnectionThread 线程已存在");
+				return;	
+			}else{
+				LogUtil.d("Xmpp","mReconnectionThread 新线程："+mConnection.getUser());
+			
+			}
+			
 			mReconnectionThread = new Thread() {
 
 				private int mRandomBase = new Random().nextInt(11) + 5; // between 5 and 15 seconds
@@ -350,6 +359,8 @@ public class XReconnectionManager extends AbstractConnectionListener {
 
 	@Override
 	public void connectionClosedOnError(Exception e) {
+		LogUtil.d("reconnect","<<connectionClosedOnError>> mConnection:"+((XMPPTCPConnection)mConnection).getUser()
+		+" isAuthenticated():"+mConnection.isAuthenticated());
 		doReconnecting = true;
 		if (e instanceof StreamErrorException) {// 有人重复登陆
 			StreamErrorException xmppEx = (StreamErrorException) e;
@@ -372,4 +383,9 @@ public class XReconnectionManager extends AbstractConnectionListener {
 			this.reconnect();
 		}
 	}
+
+
+	public XMPPConnection getmConnection() {
+		return mConnection;
+	}
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XmppConnectionManager.java

@@ -133,6 +133,7 @@ public class XmppConnectionManager {
 						login(mLoginUserId, mLoginPassword);
 					}
 				}
+				LogUtil.d("Reconnect","mReconnectionManager connect:"+mReconnectionManager.getmConnection().getUser());
 				mReconnectionManager.setNetWorkState(mIsNetWorkActive);
 			}
 		}
@@ -200,12 +201,12 @@ public class XmppConnectionManager {
 	private boolean doLogining = false;
 
 	private boolean isLoginAllowed() {
-		LogUtil.d("Xmpp","---------isLoginAllowed()------------");
-		LogUtil.d("Xmpp","doLogining:"+doLogining);
-		LogUtil.d("Xmpp","mIsNetWorkActive:"+mIsNetWorkActive);
-		LogUtil.d("Xmpp","!mConnection.isConnected():"+!mConnection.isConnected());
-		LogUtil.d("Xmpp","!mConnection.isAuthenticated():"+!mConnection.isAuthenticated());
-		LogUtil.d("Xmpp","---------isLoginAllowed()------------");
+//		LogUtil.d("Xmpp","---------isLoginAllowed()------------");
+//		LogUtil.d("Xmpp","doLogining:"+doLogining);
+//		LogUtil.d("Xmpp","mIsNetWorkActive:"+mIsNetWorkActive);
+//		LogUtil.d("Xmpp","!mConnection.isConnected():"+!mConnection.isConnected());
+//		LogUtil.d("Xmpp","!mConnection.isAuthenticated():"+!mConnection.isAuthenticated());
+//		LogUtil.d("Xmpp","---------isLoginAllowed()------------");
 		return doLogining && mIsNetWorkActive && (!mConnection.isConnected() || !mConnection.isAuthenticated());
 	}
 

WeiChat/src/main/res/layout/activity_data_inquiry_list.xml

@@ -82,31 +82,21 @@
             android:background="@color/white"
             android:orientation="vertical">
 
-            <ScrollView
+            <ListView
+                android:id="@+id/data_inquiry_list_option_lv"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <com.xzjmyk.pm.activity.view.MyListView
-                        android:id="@+id/data_inquiry_list_option_lv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-                </LinearLayout>
-            </ScrollView>
+                android:layout_weight="1"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/background"
                 android:orientation="horizontal"
                 android:paddingBottom="20dp"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:paddingTop="10dp"
-                android:background="@color/background">
+                android:paddingTop="10dp">
 
                 <TextView
                     android:id="@+id/data_inquiry_list_option_cancel_tv"

WeiChat/src/main/res/layout/activity_report_query_criteria.xml

@@ -23,21 +23,11 @@
         android:layout_height="1dp"
         android:background="@color/gray_light"/>
 
-    <ScrollView
+    <ListView
+        android:id="@+id/report_query_criteria_lv"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <com.xzjmyk.pm.activity.view.MyListView
-                android:id="@+id/report_query_criteria_lv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
-    </ScrollView>
+        android:layout_weight="1"/>
 
     <LinearLayout
         android:layout_width="match_parent"

android-pdf-viewer/build.gradle

@@ -25,12 +25,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode 1
         versionName "2.7.0-beta.1"
     }

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 14,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 111,
-            versionName      : '5.8.9',
+            versionCode      : 112,
+            versionName      : '5.9.0',
     ]
 
     depsVersion = [