合并代码

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 08 09:05:10 CST 2017
-debugName=95
+#Fri Dec 08 17:21:59 CST 2017
+debugName=99
 versionName=617
-debugCode=95
+debugCode=99
 versionCode=156

app_core/common/src/main/java/com/core/app/Constants.java

@@ -16,8 +16,8 @@ public class Constants {
     public static String IM_BASE_URL() {
         String url = "";
         if (BaseConfig.isDebug()) {
-            url = IM_BASE_URL_TEST;
-           // url = IM_BASE_URL;
+//            url = IM_BASE_URL_TEST;
+            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }
@@ -433,8 +433,8 @@ public class Constants {
     public static final String START = "start-image/1080*1776";
     public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
 
-    public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile/activeDetail";
-    public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile/projectDetail";
+    public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile/activeDetail/";
+    public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile/projectDetail/";
 
     //工作菜单缓存
     public static String WORK_MENU_CACHE = "work_menu_cache";

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

@@ -482,4 +482,9 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 		entity.setType(1);//当前时间
 		entitys.add(entity);
 	}
+
+	@Override
+	public void showLoading() {
+		super.showLoading();
+	}
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -76,7 +77,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
             entity.setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));//当前时间
             models.add(entity);
             iMission.showModels(models);
-            iMission.showLoading();
+//            iMission.showLoading();
         }
         if (intent != null) {
             modelIntent = intent.getParcelableExtra("model");
@@ -381,12 +382,15 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 
     //获取外勤计划列表
     public void loadMissionPlan() {
-        iMission.showLoading();
+        if (!isB2b){
+            iMission.showLoading();
+        }
         Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
 
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan :
                 "mobile/mobileoutplan.action";
+        LogUtil.i("url="+url);
         Request request = new Request.Bulider()
                 .setUrl(url)
                 .setWhat(LOAD_PLAN)

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -302,7 +302,6 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
                                     + "/" + MyApplication.getInstance().getLoginUserId()
                             , StringUtil.getMessage(R.string.charitable)
                             , carousel.getImageUrl(), carousel.getText());
-
                 }
             });
             banner.setAdapter(autoPlayPagerAdapter);