Explorar el Código

编写dbfind逻辑代码

Bitliker hace 8 años
padre
commit
b3f846eecf

+ 12 - 0
app_core/common/src/main/java/com/core/base/EasyFragment.java

@@ -28,6 +28,18 @@ public abstract class EasyFragment extends Fragment {
 	protected boolean isRunable;
 	protected Context ct;
 
+	protected boolean isVisible;
+	@Override
+	public void setUserVisibleHint(boolean isVisibleToUser) {
+		super.setUserVisibleHint(isVisibleToUser);
+
+		if(getUserVisibleHint()) {
+			isVisible = true;
+		} else {
+			isVisible = false;
+		}
+
+	}
 	/**
 	 * 是否缓存视图
 	 *

+ 1 - 1
app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java

@@ -104,7 +104,6 @@ public class ContactsManager {
         String url = isB2b ? "mobile/approvalflow/getUsersInfo" : "mobile/getAllHrorgEmps.action";
         String sessionId = CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId");
         HttpClient httpClient = new HttpClient.Builder(baseUrl)
-                .header("Cookie", "JSESSIONID=" + sessionId)
                 .add("master", CommonUtil.getMaster())
                 .add("sessionUser", CommonUtil.getEmcode())
                 .add("sessionId", sessionId)
@@ -113,6 +112,7 @@ public class ContactsManager {
                 .isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url(url)
+                .header("Cookie", "JSESSIONID=" + sessionId)
                 .add("master", master)
                 .add("lastdate", "")
                 .method(Method.GET)

+ 9 - 3
app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactsFragment.java

@@ -230,7 +230,7 @@ public class ContactsFragment extends EasyFragment
 
 
     void showLoading() {
-        if (!refreshListView.isRefreshing()) {
+        if (!refreshListView.isRefreshing() && isVisible) {
             progressDialog.show();
         }
     }//显示刷新
@@ -245,6 +245,12 @@ public class ContactsFragment extends EasyFragment
     }//关闭刷新
 
     private void loadData() {
+        if (allDatas != null) {
+            allDatas.clear();
+        }
+        if (showDatas != null) {
+            showDatas.clear();
+        }
         showLoading();
         ContactsManager.getInstance().loadContact(this);
     }
@@ -330,9 +336,9 @@ public class ContactsFragment extends EasyFragment
     @Override
     public void callback(List<EmployeesEntity> employees) {
         try {
-            if (ListUtils.isEmpty(employees)){
+            if (ListUtils.isEmpty(employees)) {
                 dimssLoading();
-            }else{
+            } else {
                 final List<BaseSortModel<Friend>> friends = getFriendsByErpDB(employees);
                 ThreadUtil.getInstance().addTask(new Runnable() {
                     @Override

+ 2 - 3
app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -1498,9 +1498,8 @@ public class ApprovaPresenter implements OnHttpResultListener {
 
             for (List<Approval> details : detailList) {
                 Map<String, Object> param = putItem2Params(details);
-                if (param == null)
-                    return false;
-                if (param.isEmpty() || param.keySet().size() <= 1) continue;
+                if (param == null&&param.isEmpty() || param.keySet().size() <= 1)
+                    continue;
                 params.add(param);
             }
         }

+ 7 - 7
app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -1067,13 +1067,13 @@ public class MessagePresenter implements OnHttpResultListener {
 		}
 
 
-			model = new MessageHeader("一元捐");
-			model.setIcon(R.drawable.uu_run);
-			model.setSubDoc("");
-			model.setRedKey(Constants.MESSAGE_RUN);
-			model.setType(9);
-			model.setTag("");
-			models.add(model);
+//			model = new MessageHeader("一元捐");
+//			model.setIcon(R.drawable.uu_run);
+//			model.setSubDoc("");
+//			model.setRedKey(Constants.MESSAGE_RUN);
+//			model.setType(9);
+//			model.setTag("");
+//			models.add(model);
 
 		iMessageView.updateHeader(models);
 	}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 6 - 1
app_modular/apputils/src/main/java/com/modular/apputils/activity/SelectNetAcitivty.java


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio