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

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

@@ -76,54 +76,24 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 
     @ViewInject(R.id.lv_sale_list)
     private PullToRefreshListView mlistview;
-//	@ViewInject(R.id.tv_condition)
-//	private TextView tvCondition;
-//	@ViewInject(R.id.tv_back)
-//	private TextView tvBack;
-//	@ViewInject(R.id.tv_sale_title)
-//	private TextView tv_title;
-
     @ViewInject(R.id.et_Search)
     private EditText etSearch;
-
-//	@ViewInject(R.id.bt_clear_condition)
-//	private FButton bt_clear_condition;
-//	@ViewInject(R.id.bt_sure_commit)
-//	private FButton bt_sure_commit;
-
-    //	@ViewInject(R.id.pb_refresh_top)
-//	private ProgressBar rBar;
-//	@ViewInject(R.id.cb_remember_condition)
-//	private CheckBox reConditionBox;
     private EmptyLayout mEmptyLayout;
     private EmptyLayout mEmptyMenu;
-    /**
-     * @注释：列表数据
-     */
-    private Map<String, Object> rMap = new HashMap<String, Object>();
-    ;
-    private SaleAdapter adapter;
 
-    //	@ViewInject(R.id.lv_condition)
-//	private ListView rListView;
+    private SaleAdapter adapter;
     private SimpleAdapter radapter;
-
     private StateBroadcast sBroadcast;
     private String key;// 筛选条件key
-
     @ViewInject(R.id.iv_DeleteText)
     private ImageView ivDeleteText;
     private Calendar calendar;
     private DatePickerDialog dialog;
-
     private String from;//来自具体的哪个页面
-
     private int mPreviousVisibleItem;
-    /**
-     * @注释：筛选字段
-     */
+
     private ArrayList<Map<String, Object>> rdata = new ArrayList<Map<String, Object>>();
-    ;
+    private Map<String, Object> rMap = new HashMap<String, Object>();//@注释：列表数据
 
     private int cur = 1;
     private OnClickListener mErrorClickListener = new OnClickListener() {
@@ -200,15 +170,9 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.act_sale_select_list);
-//		mDrawer = MenuDrawer.attach(this, Position.RIGHT);
-//		mDrawer.setContentView(R.layout.act_sale_select_list);
-//		mDrawer.setMenuView(R.layout.drawer_filter_list);
-//		mDrawer.setMenuSize(CommonUtil.dip2px(this, 300));
         ViewUtils.inject(this);
         mEmptyLayout = new EmptyLayout(this, mlistview.getRefreshableView());
         mEmptyLayout.setEmptyButtonClickListener(mErrorClickListener);
-
-//		mEmptyMenu = new EmptyLayout(this, rListView);
         initView();
         initData();
     }
@@ -223,18 +187,8 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
         String master = CommonUtil.getSharedPreferences(
                 SaleSelectActivity.this, "master");
         key = user + master + caller;
-
         getSupportActionBar().setTitle(intent.getStringExtra("title"));
-//		boolean isCleck = CommonUtil.getSharedPreferencesBoolean(
-//				SaleSelectActivity.this, "isCheck" + key);
-//		if (isCleck) {
-//			reConditionBox.setChecked(isCleck);
-//		} else {
-//			reConditionBox.setChecked(false);
-//			CommonUtil.clearSharedPreferences(this, key);
-//		}
         calendar = Calendar.getInstance();
-
         sBroadcast = new StateBroadcast();
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction("com.erp.sale.dataupdate");
@@ -293,19 +247,19 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
                                       int count) {
                 if (!StringUtils.isEmpty(etSearch.getText().toString())) {
                     adapter.getFilter().filter(etSearch.getText().toString());
+                }else{
+                    adapter.getFilter().filter("");
                 }
             }
 
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
                                           int after) {
-                // TODO Auto-generated method stub
 
             }
 
             @Override
             public void afterTextChanged(Editable s) {
-                // TODO Auto-generated method stub
 
             }
         });
@@ -446,59 +400,14 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
      * @注释：初始化右边菜单
      */
     public void initRightDrawer(final String res) {
-//		radapter = new SimpleAdapter(SaleSelectActivity.this, rdata,
-//				R.layout.item_scale_right_menu, new String[] { "field",
-//						"selected" }, new int[] { R.id.tv_item_field,
-//						R.id.tv_item_selected });
-//		rListView.setAdapter(radapter);
-//		/** @注释：is null */
-//		if (radapter.getCount() == 0) {
-//			mEmptyMenu.showEmpty();
-//		}
-//
-//		/** @注释：初始化 */
-//		String kValue = CommonUtil.getSharedPreferences(
-//				SaleSelectActivity.this, "kValue" + key);
-//		if (kValue != null) {
-//			Map<String, Object> kMap = FlexJsonUtil.fromJson(kValue);
-//			initRightMenuStatus(kMap);
-//			// ViewUtil.ToastMessage(SaleSelectActivity.this, kValue);
-//		}
-//
-//		rListView.setOnItemClickListener(new OnItemClickListener() {
-//
-//			@Override
-//			public void onItemClick(AdapterView<?> parent, View view,
-//					int position, long id) {
-//				/** @注释：根据map 中type值判定日期 */
-//				if (!rdata.get(position).get("type").equals("condatefield")) {
-//					Intent it = new Intent(SaleSelectActivity.this,
-//							SaleSectionListActivity.class);
-//					it.putExtra("sale_falg",
-//							FlexJsonUtil.toJson(rdata.get(position)));
-//					it.putExtra("sale_data", res);
-//					startActivity(it);
-//				} else {
-//					dialog = new DatePickerDialog(SaleSelectActivity.this,
-//							DateSet, calendar.get(Calendar.YEAR), calendar
-//									.get(Calendar.MONTH), calendar
-//									.get(Calendar.DAY_OF_MONTH));
-//					dialog.show();
-//				}
-//			}
-//		});
     }
 
-    /**
-     *
-     */
     private void initData() {
         if (CommonUtil.isNetWorkConnected(this)) {
             mEmptyLayout.showLoading();
             CommonUtil.clearSharedPreferences(SaleSelectActivity.this, "where");
             String condition = CommonUtil.getSharedPreferences(
                     SaleSelectActivity.this, key);
-            // ViewUtil.ToastMessage(this, condition);
             if (condition != null) {
                 new Thread(new GetSaleData("1", "30", condition)).start();
             } else {
@@ -778,6 +687,10 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
                         Map<String, Object> teMap = new HashMap<String, Object>();
                         List<?> columns = (List<?>) dMap.get("columns");
                         teMap.put("columns", dMap.get("columns"));
+                        String keyField = (String) dMap.get("keyField");
+                        String pfField = (String) dMap.get("pfField");
+                        teMap.put("keyField",keyField);
+                        teMap.put("pfField",pfField);
                         ArrayList<String> searchkey = new ArrayList<String>();
                         if (columns != null) {
                             for (int i = 0; i < columns.size(); i++) {
@@ -819,6 +732,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
                 protected void publishResults(CharSequence constraint,
                                               FilterResults results) {
                     data = (Map<String, Object>) results.values;
+                    rMap=data;
                     if (adapter.getCount() == 0) {
                         mEmptyLayout.showEmpty();
                     }
@@ -832,43 +746,6 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-//		case R.id.tv_condition:
-//			if (!mDrawer.isMenuVisible()) {
-//				InputMethodManager imm = (InputMethodManager) v.getContext()
-//						.getSystemService(Context.INPUT_METHOD_SERVICE);
-//				if (imm.isActive()) {
-//					imm.hideSoftInputFromWindow(v.getApplicationWindowToken(),
-//							0);
-//				}
-//				if (rdata.isEmpty()) {
-//					mEmptyMenu.showLoading();
-//					new Thread(new GetConditionThread()).start();
-//				}
-//				mDrawer.openMenu();
-//			}
-//			break;
-//		case R.id.bt_clear_condition:
-//			clearRightMenuStatus();
-//			break;
-//		case R.id.bt_sure_commit:
-//			/** @注释： */
-//			String sBuffer = getConditionForMap();
-//			CommonUtil.setSharedPreferences(SaleSelectActivity.this, "where",
-//					sBuffer);
-//			//mDrawer.closeMenu();
-//			rMap.clear();
-//			if (adapter != null) {
-//				adapter.notifyDataSetChanged();
-//			}
-//			cur = 1;
-//			isCheckedRightMenu(reConditionBox.isChecked());
-//			new Thread(new GetSaleData(String.valueOf(cur), "30", sBuffer))
-//					.start();
-//			break;
-            default:
-                break;
-        }
     }
 
     @SuppressWarnings("unchecked")
@@ -1077,37 +954,6 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 
     @SuppressWarnings("unchecked")
     public void getConditionData() {
-//		HttpClient client = new HttpClient();
-//		SharedPreferences sPreferences = getSharedPreferences("setting",
-//				MODE_PRIVATE);
-//		String username = sPreferences.getString("erp_username", null);
-//		String master = sPreferences.getString("erp_master", null);
-//		String sessionId = CommonUtil.getSharedPreferences(this, "sessionId");
-//		Map<String, String> params = new HashMap<String, String>();
-//		params.put("caller", caller);
-//		params.put("emcode", username);
-//		params.put("currentMaster", master);
-//		params.put("sessionId", sessionId);
-//		String result = null;
-//		try {
-//			result = client.sendGetRequest(Constants.getAppBaseUrl(this)
-//					+ "mobile/common/listconditions.action", params);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-//		if (result != null) {
-//			Map<String, Object> rMap = FlexJsonUtil.fromJson(result);
-//			ArrayList<Object> pareList = (ArrayList<Object>) rMap
-//					.get("conditions");
-//			Bundle bundle = new Bundle();
-//			bundle.putParcelableArrayList("pareList",
-//					(ArrayList<? extends Parcelable>) pareList);
-//			bundle.putString("result", result);
-//			Message message = new Message();
-//			message.setData(bundle);
-//			message.what = 3;
-//			handler.sendMessage(message);
-//		}
     }
 
     public class StateBroadcast extends BroadcastReceiver {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -13,7 +13,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 25;//数据库版本号
+    private static final int DATABASE_VERSION = 34;//数据库版本号
     public static String dataBaseName = "erp.db";//数据库名称
     public Context context;
 
@@ -38,6 +38,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         db.execSQL("DROP TABLE IF EXISTS HRORGS");
         db.execSQL("DROP TABLE IF EXISTS EMPLOYEES");
+        db.execSQL("DROP TABLE IF EXISTS empdate");
         onCreate(db);
     }