16:21

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

@@ -25,6 +25,7 @@ import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
 import com.core.base.EasyFragment;
 import com.core.model.Friend;
 import com.core.utils.sortlist.BaseSortModel;
@@ -45,7 +46,6 @@ import com.modular.appmessages.model.MessageHeader;
 import com.modular.appmessages.presenter.MessagePresenter;
 import com.modular.appmessages.presenter.imp.IMessageView;
 import com.uas.appme.pedometer.view.UURanking;
-import com.uas.appme.settings.Constant.Constant;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskB2BActivity;
@@ -252,7 +252,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 				//				startActivity(new Intent(mContext, UUSportActivity.class));
 				startActivity(new Intent(mContext, UURanking.class));
 //				uustepRedtv.setVisibility(View.GONE);
-				PreferenceUtils.putBoolean(Constant.UU_STEP_RED, true);
+				PreferenceUtils.putBoolean(Constants.UU_STEP_RED, true);
 				break;
 		}
 

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

@@ -394,4 +394,16 @@ public class Constants {
 
     public static final String ACTION_LOCATION_CHANGE = "action_location_Change";//位置改变发送广播
     public static final String ACTION_WORK_SIGNIN = "action_work_signin";//当时间合理的时候回调计算内勤打卡
+
+
+    //设置计步相关迁移
+    public static String BAIDU_PUSH = "BAIDUPUSH";
+    public static String UU_STEP = "UUSTEP";
+    public static String B_SETTINGRED = "B_SETTINGRED";
+    public static String UU_STEP_RED = "UU_STEP_RED";
+    public static final int MSG_FROM_CLIENT = 0;
+    public static final int MSG_FROM_SERVER = 1;
+    public static final String BASEURL = "http://news-at.zhihu.com/api/4/";
+    public static final String START = "start-image/1080*1776";
+    public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
 }

app_modular/appme/src/main/java/com/uas/appme/pedometer/constant/Constant.java

@@ -1,27 +0,0 @@
-package com.uas.appme.pedometer.constant;
-
-/**
- * Created by FANGLH
- * Date : 2017/3/24
- * To do :
- */
-
-public class Constant {
-    public static final int MSG_FROM_CLIENT = 0;
-    public static final int MSG_FROM_SERVER = 1;
-    public static final String BASEURL = "http://news-at.zhihu.com/api/4/";
-    public static final String START = "start-image/1080*1776";
-    public static final String THEMES = "themes";
-    public static final String LATESTNEWS = "news/latest";
-    public static final String BEFORE = "news/before/";
-    public static final String THEMENEWS = "theme/";
-    public static final String CONTENT = "news/";
-    public static final int TOPIC = 131;
-    public static final String START_LOCATION = "start_location";
-    public static final String CACHE = "cache";
-    public static final int LATEST_COLUMN = Integer.MAX_VALUE;
-    public static final int BASE_COLUMN = 100000000;
-    public static String TRACK_STEP = "TRACKSTEP";
-    public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
-//    public static String BASE_STEP_URL = "http://192.168.253.136:8092/";
-}

app_modular/appme/src/main/java/com/uas/appme/pedometer/service/StepService.java

@@ -25,10 +25,10 @@ import android.os.RemoteException;
 
 import com.baidu.mapapi.model.LatLng;
 import com.common.LogUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
@@ -137,11 +137,11 @@ public class StepService extends Service implements SensorEventListener {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case Constant.MSG_FROM_CLIENT:
+                case Constants.MSG_FROM_CLIENT:
                     try {
                         //这里负责将当前的步数发送出去，可以在界面或者其他地方获取，我这里是在MainActivity中获取来更新界面
                         Messenger messenger = msg.replyTo;
-                        Message replyMsg = Message.obtain(null, Constant.MSG_FROM_SERVER);
+                        Message replyMsg = Message.obtain(null, Constants.MSG_FROM_SERVER);
                         Bundle bundle = new Bundle();
                         bundle.putInt("steps", CURRENT_STEP);
                         replyMsg.setData(bundle);

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepHttpUtils.java

@@ -4,9 +4,9 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import com.core.app.Constants;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.ResponseHandlerInterface;
-import com.uas.appme.pedometer.constant.Constant;
 
 /**
  *Created by FANGlh on 2017/4/24.
@@ -16,7 +16,7 @@ public class StepHttpUtils {
     private static AsyncHttpClient client = new AsyncHttpClient();
 
     public static void get(String url, ResponseHandlerInterface responseHandler) {
-        client.get(Constant.BASEURL + url, responseHandler);
+        client.get(Constants.BASEURL + url, responseHandler);
     }
 
     public static void getImage(String url, ResponseHandlerInterface responseHandler) {

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepUtils.java

@@ -1,7 +1,6 @@
 package com.uas.appme.pedometer.utils;
 
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -14,6 +13,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.AppConstant;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
 import com.core.model.Friend;
@@ -33,7 +33,6 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 
 import java.util.HashMap;
@@ -66,7 +65,7 @@ public class StepUtils {
         saveMap.put("as_uusteps", steps);
         saveMap.put("as_date", date);
         String map = JSONUtil.map2JSON(saveMap);
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appUUsteps")
                 .add("map", map)
@@ -150,7 +149,7 @@ public class StepUtils {
         if (MyApplication.getInstance() == null
                 || MyApplication.getInstance().mLoginUser == null
                 || MyApplication.getInstance().mLoginUser.getUserId() == null) return;
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appSteps")
                 .add("userid", MyApplication.getInstance().mLoginUser.getUserId())
@@ -207,7 +206,7 @@ public class StepUtils {
         if (!doPrise) return;
 
         //点赞操作
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appStepPrise")
                 .add("userid",userid) // 点赞对象ID

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -20,12 +20,12 @@ import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.calendar.BeforeOrAfterCalendarView;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.service.StepService;
 import com.uas.appme.pedometer.utils.StepCountCheckUtil;
@@ -188,7 +188,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
                 public void run() {
                     try {
                         messenger = new Messenger(service);
-                        Message msg = Message.obtain(null, Constant.MSG_FROM_CLIENT);
+                        Message msg = Message.obtain(null, Constants.MSG_FROM_CLIENT);
                         msg.replyTo = mGetReplyMessenger;
                         messenger.send(msg);
                     } catch (RemoteException e) {
@@ -282,7 +282,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     public boolean handleMessage(Message msg) {
         switch (msg.what) {
             //这里用来获取到Service发来的数据
-            case Constant.MSG_FROM_SERVER:
+            case Constants.MSG_FROM_SERVER:
 
                 //如果是今天则更新数据
                 if (curSelDate.equals(TimeUtil.getCurrentDate())) {

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/PersonalPageActivity.java

@@ -25,6 +25,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -39,7 +40,6 @@ import com.uas.appcontact.ui.activity.ContactsActivity;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.ComPolylineBean;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.utils.PolylineUtils;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
@@ -127,7 +127,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         }
         if (StringUtil.isEmpty(userid)) return;
         progressDialog.show();
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.getHeaders().remove("Content-Type");
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appSteps")
@@ -209,7 +209,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         mMovementTotalStepsTimeTv.setText(now_time);
 
         //获取点赞信息
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appPriseList")
                 .add("userid",userid)
@@ -230,7 +230,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void doAttendHandle(int attention_type) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appUUSet")
                 .add("userids", userid)

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/StepSplashActivity.java

@@ -12,10 +12,10 @@ import android.view.animation.ScaleAnimation;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.core.app.Constants;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.BinaryHttpResponseHandler;
 import com.uas.appme.R;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.utils.StepHttpUtils;
 
 import org.apache.http.Header;
@@ -74,7 +74,7 @@ public class StepSplashActivity extends Activity {
             @Override
             public void onAnimationEnd(Animation animation) {
                 if (StepHttpUtils.isNetworkConnected(StepSplashActivity.this)) {
-                    StepHttpUtils.get(Constant.START, new AsyncHttpResponseHandler() {
+                    StepHttpUtils.get(Constants.START, new AsyncHttpResponseHandler() {
                         @Override
                         public void onSuccess(int i, Header[] headers, byte[] bytes) {
                             try {

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -23,6 +23,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.AppConstant;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -40,7 +41,6 @@ import com.uas.appme.pedometer.adapter.UUAttentionAdapter;
 import com.uas.appme.pedometer.adapter.UURankingAdapter;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
@@ -200,7 +200,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         }
         progressDialog.show();
         //获取所有人的当天步数数据
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appStepsrank")
                 .add("userid",MyApplication.getInstance().mLoginUser.getUserId())

app_modular/appme/src/main/java/com/uas/appme/settings/Constant/Constant.java

@@ -1,23 +0,0 @@
-package com.uas.appme.settings.Constant;
-
-import com.core.app.MyApplication;
-import com.core.utils.CommonUtil;
-
-/**
- * Created by FANGlh on 2017/8/30.
- * function:
- */
-
-public class Constant {
-    public static String BAIDU_PUSH = "BAIDUPUSH";
-    public static String UU_STEP = "UUSTEP";
-//    public static String BASE_BOOKING_SETTING_URL= "http://113.105.74.140:8092/"; //发布正式ip
-//    public static String BASE_BOOKING_SETTING_URL= "http://192.168.253.136:8092/";   //测试LQM本地ip
-    public static String BASE_BOOKING_SETTING_URL=  "http://113.105.74.135:8092/"; //测试ip
-    public static String BASE_COMPANYID =  CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu");
-//    public static String BASE_COMPANYID = "201";
-
-    public static String B_SETTINGRED = "B_SETTINGRED";
-    public static String UU_STEP_RED = "UU_STEP_RED";
-    public static String BASE_LQM_URL = "http://192.168.253.136:8092/";
-}

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetCompanyRestActivity.java

@@ -19,6 +19,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -31,7 +32,6 @@ import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.utils.TimeUtil;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.CompanyRestBean;
 
 import java.util.ArrayList;
@@ -118,7 +118,7 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
     }
 
     private void doSave(List<CompanyRestBean> mList) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appBatchCrest")

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetEmployeeRestActivity.java

@@ -26,6 +26,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
@@ -41,7 +42,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.utils.TimeUtil;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.ComRestBean;
 import com.uas.appme.settings.model.PersonSetingBean;
 
@@ -72,7 +72,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     private void initData() {
 
         //获取商家服务人员
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
 //                .add("companyid", 201)
@@ -179,7 +179,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     }
 
     private void doSave(List<ComRestBean> mList) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appBatchMrest")

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BRestActivity.java

@@ -28,7 +28,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.adapter.BRestAdapter;
 import com.uas.appme.settings.model.BRest;
 import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
@@ -172,7 +171,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
                     break;
             }
 
-			HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+			HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
 			httpClient.Api().send(new HttpClient.Builder()
 					.url("user/appStoreDel")
 					.add("keyfield", keyfield)

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSetComRestListActivity.java

@@ -22,6 +22,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -33,7 +34,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.BSettingPlaceBean;
 import com.uas.appme.settings.model.CompanyRestListBean;
 import com.uas.appme.settings.model.EmployeeRestListBean;
@@ -158,7 +158,7 @@ public class BSetComRestListActivity extends BaseActivity {
 				break;
 		}
 
-		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+		HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("user/appStoreDel")
 				.add("keyfield", keyfield)
@@ -247,7 +247,7 @@ public class BSetComRestListActivity extends BaseActivity {
 			ToastMessage(getString(R.string.common_notlinknet));
 			return;
 		}
-		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+		HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
 		httpClient.Api().send(new HttpClient.Builder()
 				.url(url)
 //				.add("companyid", 201)

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -18,7 +19,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 
 /**
  * Created by FANGlh on 2017/10/10.
@@ -40,7 +40,7 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void judgeWhichType() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyType")
                 .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -36,6 +36,7 @@ import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
@@ -54,7 +55,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.BSetLocationBean;
 import com.umeng.socialize.utils.Log;
 
@@ -239,7 +239,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         String tablename = "ServiceType";
         String id = st_id;
 
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreDel")
                 .add("keyfield", keyfield)
@@ -279,7 +279,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             param.put("st_servicetime",mList.get(0).getSt_servicetime());
             progressDialog.show();save_bt.setEnabled(false);
 
-            HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+            HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
                     .url("user/appServiceSet")
                     .add("map",JSON.toJSONString(param))
@@ -421,7 +421,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     }
     private void doSaveDatasList() {
         progressDialog.show();save_bt.setEnabled(false);
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
 
 //        httpClient.getHeaders().remove("Content-Type");
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BusinessHoursSetting.java

@@ -13,6 +13,7 @@ import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -22,7 +23,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -131,7 +131,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         param.put("sc_booktype",sc_booktype);
 
         LogUtil.prinlnLongMsg("appStoreUpdate",JSONUtil.map2JSON(param));
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreUpdate")
                 .add("map", JSONUtil.map2JSON(param))
@@ -174,7 +174,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
 
     //获取是否之前有设置的时间
     private void initData() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
                 .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
@@ -228,7 +228,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         param.put("sc_endtime",mTvEndTime.getText().toString());
 
         LogUtil.prinlnLongMsg("appStoreUpdate",JSONUtil.map2JSON(param));
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreUpdate")
                 .add("map", JSONUtil.map2JSON(param))

app_modular/appme/src/main/java/com/uas/appme/settings/activity/ImageSettingActivity.java

@@ -22,6 +22,7 @@ import com.common.data.StringUtil;
 import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
@@ -38,7 +39,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.umeng.socialize.utils.Log;
 
 import java.io.File;
@@ -161,7 +161,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
         Map<String, Object> params = new HashMap<>();
         params.put("sc_imageurl",oUrl);
         params.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.getHeaders().remove("Content-Type");
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStorurl")

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -32,6 +32,7 @@ import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ImageUtil;
 import com.common.ui.ProgressDialogUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
@@ -52,7 +53,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.BSettingPlaceBean;
 import com.uas.appme.settings.model.PersonSetingBean;
 import com.umeng.socialize.utils.Log;
@@ -162,7 +162,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         HttpClient httpClient =
 //                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);\
-                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+                new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appPlaceList")
                 .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
@@ -271,7 +271,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         }
     }
     private void doDelete() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreDel")
                 .add("keyfield", "sm_id")
@@ -409,7 +409,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         HttpClient httpClient =
 //                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-                    new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+                    new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appPersonSet")
                 .add("map", JSONUtil.map2JSON(params))

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingListActivity.java

@@ -14,6 +14,7 @@ import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -24,7 +25,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.adapter.PSettingListAdapter;
 import com.uas.appme.settings.model.PersonSetingBean;
 
@@ -75,7 +75,7 @@ public class PersonSettingListActivity extends BaseActivity {
             ToastMessage(getString(R.string.common_notlinknet));
             return;
         }
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
                 .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
@@ -156,7 +156,7 @@ public class PersonSettingListActivity extends BaseActivity {
         DisplayUtil.backgroundAlpha(this, 1f);
     }
     private void doDeleteHandle(int longPosition) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreDel")
                 .add("keyfield", "sm_id")

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -59,7 +59,6 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.view.NewStepActivity;
 import com.uas.appme.pedometer.view.StepSplashActivity;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appworks.OA.erp.activity.FlightsActivity;
 import com.uas.appworks.OA.erp.activity.MissionSetActivity;
 import com.uas.appworks.OA.erp.activity.MyRuleSetActivity;
@@ -140,7 +139,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         businessmen_setting_rl.setOnClickListener(this);
         bsettingRed = (TextView) findViewById(R.id.businessmen_setting_new);
 
-        if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constant.B_SETTINGRED)) //商家设置红点
+        if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constants.B_SETTINGRED)) //商家设置红点
             bsettingRed.setVisibility(View.GONE);
 
         new_step_rl.setOnClickListener(this);
@@ -151,7 +150,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         share_rl = (RelativeLayout) findViewById(R.id.share_rl);
         mExitBtn = (Button) findViewById(R.id.exit_btn);
         //share_rl.setVisibility(View.GONE);
-        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constant.BAIDU_PUSH);
+        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.BAIDU_PUSH);
 
         if (isPush == -1) {//第一次进入没有配置
             cb_task_reply.setChecked(true);
@@ -165,11 +164,11 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
                 if (isChecked) {
-                    PreferenceUtils.putInt(Constant.BAIDU_PUSH, 1);
+                    PreferenceUtils.putInt(Constants.BAIDU_PUSH, 1);
                     PushManager.resumeWork(MyApplication.getInstance());
                 } else {
                     PushManager.stopWork(MyApplication.getInstance());
-                    PreferenceUtils.putInt(Constant.BAIDU_PUSH, 0);
+                    PreferenceUtils.putInt(Constants.BAIDU_PUSH, 0);
                 }
             }
         });
@@ -198,7 +197,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
 
         //UU开关的 根据StepService是否开启显示状态
-        int isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP);
+        int isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.UU_STEP);
         if (isServiceRunning(newStep_service_name) && (isStep == -1 || isStep == 1)) {
             uu_step_reply.setChecked(true);
         } else {
@@ -212,13 +211,13 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 tv_menu_setting.setVisibility(View.GONE);
                 CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
                 if (isChecked) {
-                    PreferenceUtils.putInt(Constant.UU_STEP, 1);
+                    PreferenceUtils.putInt(Constants.UU_STEP, 1);
 //                    PushManager.resumeWork(MyApplication.getInstance());
 //
                     startActivity(new Intent(mContext, StepSplashActivity.class));
                 } else {
 //                    PushManager.stopWork(MyApplication.getInstance());
-                    PreferenceUtils.putInt(Constant.UU_STEP, 0);
+                    PreferenceUtils.putInt(Constants.UU_STEP, 0);
 //                    stopService(intent);
                     Toast.makeText(mContext, getString(R.string.set_close_step_notice1), Toast.LENGTH_LONG).show();
                     speech_recognition_rl.setVisibility(View.GONE);
@@ -230,7 +229,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             public void onClick(View v) {
                 tv_menu_setting.setVisibility(View.GONE);
                 CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
-                int last_isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP);
+                int last_isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.UU_STEP);
                 if (isServiceRunning(newStep_service_name) && last_isStep == 1) {
                     startActivity(new Intent(mContext, NewStepActivity.class));
                 } else {
@@ -273,7 +272,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     }
 
     private void doShowBSettingJudge() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
 //                .add("companyid",10043574)
@@ -294,12 +293,12 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 try {
                     //{"result":"1","url":"http://113.105.74.140:8081/u/0/0/201710/o/48fda5af663f40f795f2dd49e2d8801f.jpg"}
                     if (o.toString().contains("result")) {
-                        if ("1".equals(JSON.parseObject(o.toString()).getString("result"))){
+                        if (!CommonUtil.isReleaseVersion()) {
+                            businessmen_setting_rl.setVisibility(View.VISIBLE);
+                        }else if ("1".equals(JSON.parseObject(o.toString()).getString("result"))){
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
                             if (o.toString().contains("url"))
                                 business_iamge = JSON.parseObject(o.toString()).getString("url");
-                        }else if (!CommonUtil.isReleaseVersion()) {
-                            businessmen_setting_rl.setVisibility(View.VISIBLE);
                         }else{
                             businessmen_setting_rl.setVisibility(View.GONE);
                         }
@@ -439,7 +438,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
        }else if (v.getId() == R.id.businessmen_setting_rl){
            startActivity(new Intent(this,BSettingActivity.class)
            .putExtra("business_iamge",business_iamge));
-           PreferenceUtils.putBoolean(Constant.B_SETTINGRED, true);
+           PreferenceUtils.putBoolean(Constants.B_SETTINGRED, true);
            bsettingRed.setVisibility(View.GONE);
        }
     }