From b7d02685e98afd0ad896351cdfb3e24ec4e90350 Mon Sep 17 00:00:00 2001 From: taohd <2821744554@qq.com> Date: Sat, 5 May 2018 09:43:21 +0800 Subject: [PATCH] no message --- .idea/misc.xml | 2 +- app/libs/processor.jar | Bin 5681 -> 0 bytes app/src/main/java/com/shunzhi/parent/AppContext.java | 13 +++++++------ app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java | 5 +++-- app/src/main/java/com/shunzhi/parent/db/DBHelper.java | 2 +- app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java | 5 +++++ app/src/main/java/com/shunzhi/parent/ui/MainActivity.java | 10 +++++++++- app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 27 +++++++++++++++++---------- app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java | 6 ++++-- app/src/main/java/com/shunzhi/parent/util/GlideUtils.java | 10 ++++++++++ app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java | 4 +++- mvpsdk/build.gradle | 4 +++- 12 files changed, 63 insertions(+), 25 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 75dac50..3963879 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ </value> </option> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/app/libs/processor.jar b/app/libs/processor.jar index b2ef457..952eada 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 6cf58c4..4f0c9f1 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -64,6 +64,8 @@ public class AppContext extends GlobalApplication { super.onCreate(); NIMClient.init(this, loginInfo(), options()); + if (null==AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT)) + AppConfig.getAppConfig(getContext()).set(AppConfig.DISTRICT,"越城区"); if (inMainProcess(this)) { //开启地图地位 @@ -210,9 +212,9 @@ public class AppContext extends GlobalApplication { @Override public void onLocationChanged(AMapLocation aMapLocation) { if (null != aMapLocation) { + Timber.d("88888%s","aMapLocation="+aMapLocation.getErrorCode()); if (aMapLocation.getErrorCode() == 0) { String currName = AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT); - Log.e("11111", currName); if (currName != null && !"定位失败".equals(currName) &&! "".equals(currName)) { district = AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT); } else { @@ -221,18 +223,17 @@ public class AppContext extends GlobalApplication { aMapLocation.getCityCode(); } AppConfig.getAppConfig(getContext()).set(AppConfig.DISTRICT, district); - Intent intent = new Intent(); - intent.setAction(LOCATION_CITYNAME + ""); - sendBroadcast(intent); - Log.e("11111", "222222"); stopLocation(); } else { cityName = "定位失败"; district = "定位失败"; if (null != AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT)) district = AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT); + else if ("定位失败".equals(district))district="越城区"; } - + Intent intent = new Intent(); + intent.setAction(LOCATION_CITYNAME + ""); + sendBroadcast(intent); } } }; diff --git a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java index f18e887..0f3acb0 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java @@ -20,6 +20,7 @@ import com.shunzhi.parent.R; import com.shunzhi.parent.bean.channel.ChannelContextBean; import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; import com.shunzhi.parent.util.GlideUtils; +import com.squareup.picasso.Picasso; /** * Created by ToaHanDong on 2018/3/14. @@ -75,7 +76,7 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean if (object.getIsAds() == 1) { frame_ad.setVisibility(View.VISIBLE); normal_content.setVisibility(View.GONE); - GlideUtils.showImg(mContext,iv_consult,object.getImage()); + GlideUtils.showImgWithPicass(mContext,iv_consult,object.getImage()); frame_ad.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -89,7 +90,7 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean tvConsultContent.setText(object.getContent()); tvPingLunNums.setText("浏览量:"+object.getLookNum()+""); tvZhuanFaNums.setText("转发:"+object.getForwardingNum()+""); - GlideUtils.showImg(mContext,iv_consult,object.getImage()); + GlideUtils.showImgWithPicass(mContext,iv_consult,object.getImage()); normal_content.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/shunzhi/parent/db/DBHelper.java b/app/src/main/java/com/shunzhi/parent/db/DBHelper.java index 7fa7938..ce50b68 100644 --- a/app/src/main/java/com/shunzhi/parent/db/DBHelper.java +++ b/app/src/main/java/com/shunzhi/parent/db/DBHelper.java @@ -14,7 +14,7 @@ public class DBHelper extends SQLiteOpenHelper { public final int VERSION=1; public DBHelper(Context context, String name) { - super(context, name, null, 2); + super(context, name, null, 1); } public DBHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version, DatabaseErrorHandler errorHandler) { diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java index c7b9b27..e42d7eb 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java @@ -25,6 +25,7 @@ import java.util.List; import io.reactivex.functions.Consumer; import retrofit2.HttpException; +import timber.log.Timber; /** * Created by ToaHanDong on 2018/3/14. @@ -78,6 +79,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { }, new Consumer<Throwable>() { @Override public void accept(Throwable throwable) throws Exception { + Timber.d("88888%s","getBanners="+throwable.toString()); OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); } })); @@ -102,6 +104,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { @Override public void accept(Throwable throwable) throws Exception { try { + Timber.d("88888%s","getContextChannel="+throwable.toString()); OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); }catch (Exception e){ @@ -132,6 +135,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { }, new Consumer<Throwable>() { @Override public void accept(Throwable throwable) throws Exception { + Timber.d("88888%s","getInformationTopic="+throwable.toString()); // Log.d("66666","getInformationTopic="+throwable); OkHttpExceptionUtil.handOkHttpException((HttpException) throwable); } @@ -148,6 +152,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { }, new Consumer<Throwable>() { @Override public void accept(Throwable throwable) throws Exception { + Timber.d("88888%s","loginVote="+throwable.toString()); mIView.showVote(position,""); } })); diff --git a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java index a022559..588029b 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java @@ -1,5 +1,6 @@ package com.shunzhi.parent.ui; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; @@ -40,6 +41,11 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. FragmentTransaction fragmentTransaction = null; + public static void newInstance(Context context){ + Intent intent=new Intent(context,MainActivity.class); + context.startActivity(intent); + } + @Override protected void initView(Bundle savedInstanceState) { @@ -146,7 +152,9 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. @Override public void onPermissionGranted(int requestCode) { - + if (requestCode==PermissionUtils.CODE_ACCESS_COARSE_LOCATION||requestCode==PermissionUtils.CODE_ACCESS_FINE_LOCATION){ + AppContext.getInstance().startLocation(); + } } @Override diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index 10b9ed5..27e2e1e 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -34,6 +34,7 @@ import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity; import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; import com.shunzhi.parent.util.AttrsUtils; import com.shunzhi.parent.views.TextAndImgShowView; +import com.squareup.picasso.Picasso; import com.stx.xhb.xbanner.XBanner; import java.util.ArrayList; @@ -42,6 +43,7 @@ import java.util.List; import cn.jzvd.JZVideoPlayerStandard; import me.leefeng.citypicker.CityPicker; import me.leefeng.citypicker.CityPickerListener; +import timber.log.Timber; public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel> implements View.OnClickListener , ConsultContract.IConsultView, CityPickerListener { @@ -76,6 +78,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu NestedScrollView nesteScrollView; + private String districtName=""; + @Override public int getLayoutId() { return R.layout.fragment_zi_xun; @@ -96,7 +100,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu videoplayer.batteryLevel.setVisibility(View.GONE); videoplayer.replayTextView.setVisibility(View.GONE); videoplayer.backButton.setVisibility(View.GONE); - + districtName=AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.DISTRICT); initBroadCast(); initRecycler(); initListeners(); @@ -109,7 +113,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu } }); - mPresenter.getBanners("2", AppContext.getInstance().district); + mPresenter.getBanners("2", districtName); } @@ -121,7 +125,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu //refresh data here pageIndex = 1; contextList.clear(); - mPresenter.getContextChannel(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.DISTRICT), 0, 1, pageIndex); + mPresenter.getContextChannel(districtName, 0, 1, pageIndex); recycler_context.refreshComplete(); } @@ -129,12 +133,12 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu public void onLoadMore() { // load more data here pageIndex = pageIndex + 1; - mPresenter.getContextChannel(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.DISTRICT), 0, 1, pageIndex); + mPresenter.getContextChannel(districtName, 0, 1, pageIndex); recycler_context.refreshComplete(); } }); pageIndex = 1; - mPresenter.getContextChannel(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.DISTRICT), 0, 1, pageIndex); + mPresenter.getContextChannel(districtName, 0, 1, pageIndex); } private void initListeners() { @@ -145,8 +149,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu private void initBanners() { xBanner.setData(imgesUrl, describeList); // xBanner.setPointsIsVisible(false); + xBanner.setAutoPalyTime(5000); xBanner.setmAdapter(xBannerAdapter); - xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() { @Override public void onItemClick(XBanner banner, int position) { @@ -160,7 +164,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu private XBanner.XBannerAdapter xBannerAdapter = new XBanner.XBannerAdapter() { @Override public void loadBanner(XBanner banner, Object model, View view, int position) { - Glide.with(getContext()).load(imgesUrl.get(position)).into((ImageView) view); +// Glide.with(getContext()).load(imgesUrl.get(position)).into((ImageView) view); + Picasso.get().load(imgesUrl.get(position)).into((ImageView) view); // GlideUtils.showImg(getActivity(),(ImageView) view,imgesUrl.get(position)); } }; @@ -196,7 +201,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu case R.id.ivSearch://搜索按钮 if (!TextUtils.isEmpty(et_search.getText().toString())) { contextList.clear(); - mPresenter.getInformationTopic(et_search.getText().toString(), AppContext.getInstance().district, "0", "1", 1); + mPresenter.getInformationTopic(et_search.getText().toString(), districtName, "0", "1", 1); } break; } @@ -213,7 +218,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu @Override public void onReceive(Context context, Intent intent) { if (intent.getAction().equals(AppContext.LOCATION_CITYNAME + "")) { - tvLocalAddress.setText(AppContext.getInstance().district); + districtName=AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.DISTRICT); + tvLocalAddress.setText(districtName); } } }; @@ -301,7 +307,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu public void refresh() { first = true; - tvLocalAddress.setText(AppContext.getInstance().district); + districtName=AppConfig.getAppConfig(AppContext.getContext()).get(AppConfig.DISTRICT); + tvLocalAddress.setText(districtName); mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, pageIndex); mPresenter.getBanners("2", AppContext.getInstance().district); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java index c460e70..85cd49a 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java @@ -75,7 +75,8 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult tvJump.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - startNewActivity(MainActivity.class); +// startNewActivity(MainActivity.class); + MainActivity.newInstance(getContext()); getActivity().finish(); } }); @@ -148,6 +149,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult } else { isQidong = false; startNewActivity(StartActivity.class); + getActivity().finish(); // showVideos(); // showBanners(); } @@ -169,7 +171,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult private void showBanners() { xBanner.setData(imgUrl, describeList); xBanner.stopAutoPlay(); - xBanner.setmAutoPalyTime(10000); + xBanner.setAutoPalyTime(10000); xBanner.setPointsIsVisible(false); xBanner.setmAdapter(new XBanner.XBannerAdapter() { @Override diff --git a/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java b/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java index a3462a1..12680b1 100644 --- a/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java +++ b/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java @@ -7,6 +7,7 @@ import android.widget.ImageView; import com.bumptech.glide.Glide; import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.R; +import com.squareup.picasso.Picasso; /** * Created by ToaHanDong on 2018/3/21. @@ -26,6 +27,15 @@ public class GlideUtils { } } + public static void showImgWithPicass(Context context,ImageView imageView,String url){ + if (!TextUtils.isEmpty(url)){ + if (url.startsWith("http")) + Picasso.get().load(url).error(R.color.xueqing_blue).into(imageView); + else Picasso.get().load(AppConfig.BASE_URL_FILE+url).error(R.color.xueqing_blue).into(imageView); + }else { + Picasso.get().load(url).error(R.color.xueqing_blue).into(imageView); + } + } public static void showImgWithDefaule(Context context,ImageView imageView,String url,int defaultImg){ if (!TextUtils.isEmpty(url)){ diff --git a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java index d6978bb..917233c 100644 --- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java +++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java @@ -17,6 +17,7 @@ import com.share.mvpsdk.utils.DisplayUtils; import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.R; +import com.squareup.picasso.Picasso; /** @@ -59,7 +60,8 @@ public class TextAndImgShowView extends LinearLayout { public void addImgs(String imgUrl) { // Log.d("66666","imgUrl="+imgUrl); if (!imgUrl.startsWith("http")) imgUrl = AppConfig.BASE_URL_FILE + imgUrl; - Glide.with(getContext()).load(imgUrl).error(R.drawable.gxzt).into(image); + Picasso.get().load(imgUrl).error(R.drawable.gxzt).into(image); +// Glide.with(getContext()).load(imgUrl).error(R.drawable.gxzt).into(image); } public void setSelect(boolean isSelect) { diff --git a/mvpsdk/build.gradle b/mvpsdk/build.gradle index 8a1278c..7870032 100644 --- a/mvpsdk/build.gradle +++ b/mvpsdk/build.gradle @@ -105,7 +105,7 @@ dependencies { // compile(name: 'jiaozivideoplayer-6.2.3', ext: 'aar') //轮播图XBanner - compile 'com.xhb:xbanner:1.3.1' + compile 'com.xhb:xbanner:1.3.8' //省市区联动 compile 'me.leefeng:citypicker:1.0' @@ -125,5 +125,7 @@ dependencies { compile 'com.j256.ormlite:ormlite-core:4.48' compile 'com.j256.ormlite:ormlite-android:4.48' + compile 'com.squareup.picasso:picasso:2.71828' + } -- libgit2 0.21.0