Browse Source

合并提交首页头文件逻辑

Bitliker 8 years ago
parent
commit
a34b2aa67a

+ 1 - 1
app_modular/apputils/src/main/java/com/modular/apputils/utils/PopupWindowHelper.java

@@ -107,7 +107,7 @@ public class PopupWindowHelper {
 				DisplayUtil.backgroundAlpha(ct, 1f);
 			}
 		});
-		if (onFindLikerListener != null && 0 > 1) {
+		if (onFindLikerListener != null) {
 			view.findViewById(R.id.select_erp).setVisibility(View.VISIBLE);
 			view.findViewById(R.id.select_erp).setOnClickListener(new View.OnClickListener() {
 				@Override

+ 5 - 5
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MissionActivity.java

@@ -104,10 +104,10 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 				item.setVisible(false);
 			}
 		}
-		MenuItem sign = menu.getItem(1);
-		if (sign.getItemId() == R.id.sign) {
-			sign.setVisible(false);
-		}
+//		MenuItem sign = menu.getItem(1);
+//		if (sign.getItemId() == R.id.sign) {
+//			sign.setVisible(false);
+//		}
 		return super.onCreateOptionsMenu(menu);
 	}
 
@@ -202,7 +202,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 	public void showFinds(List<SelectBean> models) {
 		Intent intent = new Intent(this, SelectActivity.class)
 				.putExtra("type", 2)
-				.putExtra("title", getString(R.string.select_location))
+				.putExtra("title", getString(R.string.login_company_select))
 				.putParcelableArrayListExtra("data", (ArrayList<? extends Parcelable>) models);
 		startActivityForResult(intent, NUMBER_SELECT);
 	}