diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index 0650ed6..3b7e68b 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -9,11 +9,13 @@ import com.sucstepsoft.cm_utils.constant.PathConfig; */ public class BaseUrlApi { - public static final String IP_URL = "http://v3.xzszwhy.cn/";/* 测试IP */ +// public static final String IP_URL = "http://v3.xzszwhy.cn/";/* 测试IP */ + public static final String IP_URL = "https://www.xzszwhy.cn/";/* 测试IP */ // public static final String IP_URL = "http://192.168.0.120:8081/";/* 测试IP */ // public static final String BASE_SYSTEM_IP = "http://192.168.0.120:8081/xzszwhy/";/*测试IP*/ - public static final String BASE_SYSTEM_IP = "http://v3.xzszwhy.cn/xzszwhy/";/*正式IP*/ +// public static final String BASE_SYSTEM_IP = "http://v3.xzszwhy.cn/xzszwhy/";/*正式IP*/ + public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/xzszwhy/";/*正式IP*/ public static final String PROJECT_NAME = "app/"; public static final String BASE_URL = BASE_SYSTEM_IP; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java index d42d3ed..f7033e8 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java @@ -302,6 +302,8 @@ public class MainActivity extends BaseActivity { UserLgUtils.setName(baseUserInfo.getName()); UserLgUtils.setUserName(baseUserInfo.getUsername()); UserLgUtils.setPhone(baseUserInfo.getPhone()); + String params = mActivity.getResources().getString(R.string.big_data_str, "USER", baseUserInfo.getUserId(), ""); + bigDataRead(params); } } @@ -370,7 +372,7 @@ public class MainActivity extends BaseActivity { private void startDownloadApk() { ToastUtils.showShort("开始下载,请在通知栏查看下载进度"); Intent intent = new Intent(mActivity, DownloadService.class); - intent.putExtra(Constants.APK_DOWNLOAD_URL, BaseUrlApi.APP_DOWNLOAD_URL+UserLgUtils.getAppVersionPathCode()); + intent.putExtra(Constants.APK_DOWNLOAD_URL, BaseUrlApi.APP_DOWNLOAD_URL + UserLgUtils.getAppVersionPathCode()); startService(intent); } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java index 355a78c..c10be54 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java @@ -248,7 +248,7 @@ public class HomeFragment extends BaseFragment { private void getMainNewsTab() { RetrofitManager.getInstance() .create(HomeApi.class) - .getMainNewsTab() + .getMainNewsTab("0") .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer>() { diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java index ea35ade..b85979b 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java @@ -116,8 +116,8 @@ public interface HomeApi { * 首页动态列表 */ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) - @GET("app/newsdirectories/list/areaplate/release") - Observable> getMainNewsTab(); + @GET("app/newsdirectories/listsub/areaauth/release/{pId}") + Observable> getMainNewsTab(@Path("pId")String pId); /** * 获取新闻子类别