diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 30639f4..805b3f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -113,6 +113,7 @@ android:value="1d130afb822d8a1019e6592cbaf10bcc"/> @@ -126,44 +127,61 @@ + + + - - + + + + \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index b798d2c..0627fa4 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -38,6 +38,7 @@ public class AppConfig { public static String BASE_URL="http://60.190.202.57:1000/"; public static String BASE_URL_IMG="http://60.190.202.57:1000"; public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; + public static String BASE_URL_FILE="http://60.190.202.57:8196"; //默认日志保存的路径 diff --git a/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java b/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java index b98ab75..0869b9e 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java @@ -34,8 +34,12 @@ public class ToolBean implements Serializable { @Override public String toString() { return "ToolBean{" + - "toolImg='" + toolImage + '\'' + + "toolImage='" + toolImage + '\'' + ", toolName='" + toolName + '\'' + + ", toolUrl='" + toolUrl + '\'' + + ", toolId='" + toolId + '\'' + + ", columnType='" + columnType + '\'' + + ", orderById='" + orderById + '\'' + '}'; } } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java index 0b5feb8..a5f0f3c 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java @@ -1,5 +1,6 @@ package com.shunzhi.parent.presenter.ceping; +import android.util.Log; import android.view.View; import android.widget.LinearLayout; @@ -18,6 +19,7 @@ import java.util.ArrayList; import java.util.List; import io.reactivex.functions.Consumer; +import timber.log.Timber; /** * Created by ToaHanDong on 2018/3/14. 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 98053fb..7711c74 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 @@ -68,7 +68,6 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { mRxManager.register(mIModel.getBanners(position, areaName).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { - Log.d("666666","getBanners="+jsonObject.toString()); if (jsonObject.get("status").getAsString().equals("1")) { JsonArray jsonArray = jsonObject.getAsJsonArray("data"); List guangGaoBeanList = new ArrayList<>(); diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java index 7029743..90352c3 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -15,6 +16,7 @@ import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; import com.shunzhi.parent.R; import com.shunzhi.parent.adapter.MyConsultAdapter; import com.shunzhi.parent.bean.MyConsultBean; +import com.shunzhi.parent.ui.fragment.consult.ConsultTwoLevelFragment; import java.util.ArrayList; import java.util.List; @@ -32,6 +34,10 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi EditText et_search; String channel; + + FrameLayout frame_consult_two; + + ConsultTwoLevelFragment consultTwoLevelFragment=null; @Override protected void initView(Bundle savedInstanceState) { initViews(); @@ -47,12 +53,20 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi channel=getIntent().getStringExtra("channel"); ivBack = findViewById(R.id.ivBack); ivBack.setOnClickListener(this); + frame_consult_two=findViewById(R.id.frame_consult_two); et_search = findViewById(R.id.et_search); ivSearch = findViewById(R.id.ivSearch); ivSearch.setOnClickListener(this); + consultTwoLevelFragment=new ConsultTwoLevelFragment(); + Bundle bundle=new Bundle(); + bundle.putString("channel",channel); + consultTwoLevelFragment.setArguments(bundle); + getSupportFragmentManager().beginTransaction().add(R.id.frame_consult_two,consultTwoLevelFragment) + .show(consultTwoLevelFragment).commit(); + } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java index a0caaff..63ee9ed 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java @@ -19,6 +19,7 @@ import android.widget.TextView; import com.share.mvpsdk.base.activity.BaseCompatActivity; import com.share.mvpsdk.utils.AppUtils; import com.share.mvpsdk.utils.NetworkConnectionUtils; +import com.share.mvpsdk.utils.ToastUtils; import com.share.mvpsdk.widgets.NestedScrollWebView; import com.shunzhi.parent.AppConfig; import com.shunzhi.parent.R; @@ -110,6 +111,7 @@ public class WebViewActivity extends BaseCompatActivity { initWebView(); initWebSetting(nesteScrollWebView.getSettings()); + ToastUtils.showToast(getIntent().getStringExtra("url")); nesteScrollWebView.loadUrl(getIntent().getStringExtra("url")); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java index 1f189ae..99e3c4d 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java @@ -127,7 +127,7 @@ public class OrderDetailActivity extends BaseMVPCompatActivity guangGaoBeanList) { for (int i = 0; i < guangGaoBeanList.size(); i++) { - imgesUrl.add(AppConfig.BASE_URL_IMG + guangGaoBeanList.get(i).fileSrc); + imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc); describeList.add(guangGaoBeanList.get(i).describe); } initBanners(); 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 d2e8978..0957aed 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 @@ -100,7 +100,7 @@ public class StartFragment extends BaseMVPCompatFragment myConsultBeanList = new ArrayList<>(); + String channel=""; @Override public int getLayoutId() { return R.layout.fragment_consult_two_level; @@ -46,25 +48,11 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment list) { - + if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity()); + myConsultAdapter.addAll(list); + recyclerView.setAdapter(myConsultAdapter); } @Override 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 dd9ee36..b056c4a 100644 --- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java +++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java @@ -14,6 +14,8 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.share.mvpsdk.utils.DisplayUtils; +import com.shunzhi.parent.AppConfig; +import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; @@ -55,6 +57,7 @@ public class TextAndImgShowView extends LinearLayout { } public void addImgs(String imgUrl){ + if (!imgUrl.startsWith("http"))imgUrl= AppConfig.BASE_URL_FILE+imgUrl; Glide.with(getContext()).load(imgUrl).error(R.drawable.gxzt).into(image); } diff --git a/app/src/main/res/layout/activity_consult_two_level.xml b/app/src/main/res/layout/activity_consult_two_level.xml index a6e398b..673960a 100644 --- a/app/src/main/res/layout/activity_consult_two_level.xml +++ b/app/src/main/res/layout/activity_consult_two_level.xml @@ -10,4 +10,10 @@ + + diff --git a/app/src/main/res/layout/fragment_zi_xun.xml b/app/src/main/res/layout/fragment_zi_xun.xml index 40308c0..5d803e9 100644 --- a/app/src/main/res/layout/fragment_zi_xun.xml +++ b/app/src/main/res/layout/fragment_zi_xun.xml @@ -6,7 +6,7 @@ android:orientation="vertical" tools:context="com.shunzhi.parent.ui.fragment.ConsultFragment"> - + + android:paddingTop="@dimen/size_dp_10"> - + + + android:paddingRight="@dimen/size_dp_10"> - - + + + diff --git a/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java b/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java index c2cdb5a..d83a565 100644 --- a/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java +++ b/mvpsdk/src/main/java/com/share/mvpsdk/helper/RetrofitCreateHelper.java @@ -24,12 +24,13 @@ import retrofit2.converter.gson.GsonConverterFactory; public class RetrofitCreateHelper { private static final int TIMEOUT_READ = 20; private static final int TIMEOUT_CONNECTION = 10; - private static String Authorization="",token=""; - private static RetrofitCreateHelper retrofitCreateHelper=null; + private static String Authorization = "", token = ""; + private static RetrofitCreateHelper retrofitCreateHelper = null; private static final HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor() .setLevel(HttpLoggingInterceptor.Level.BODY); private static CacheInterceptor cacheInterceptor = new CacheInterceptor(); - private static OkHttpClient.Builder okhttpClientBuilder=null; + private static OkHttpClient.Builder okhttpClientBuilder = null; + /*private static OkHttpClient okHttpClient = new OkHttpClient.Builder() //SSL证书 .sslSocketFactory(TrustManager.getUnsafeOkHttpClient()) @@ -47,33 +48,39 @@ public class RetrofitCreateHelper { //失败重连 .retryOnConnectionFailure(true) .build();*/ - public static RetrofitCreateHelper getInstance(){ - if (null==retrofitCreateHelper){ - synchronized (RetrofitCreateHelper.class){ - if (null==retrofitCreateHelper)retrofitCreateHelper=new RetrofitCreateHelper(); + public static RetrofitCreateHelper getInstance() { + if (null == retrofitCreateHelper) { + synchronized (RetrofitCreateHelper.class) { + if (null == retrofitCreateHelper) retrofitCreateHelper = new RetrofitCreateHelper(); } } return retrofitCreateHelper; } - public RetrofitCreateHelper(){ - if (null==okhttpClientBuilder)okhttpClientBuilder=new OkHttpClient.Builder(); - okhttpClientBuilder.connectTimeout(10000,TimeUnit.SECONDS); - okhttpClientBuilder.addInterceptor(new Interceptor() { - @Override - public Response intercept(Chain chain) throws IOException { - Request original = chain.request(); - Request.Builder requestBuilder = original.newBuilder().header("Authorization", Authorization); - Request request = requestBuilder.build(); - return chain.proceed(request); + public RetrofitCreateHelper() { + try { + if (null == okhttpClientBuilder) { + okhttpClientBuilder = new OkHttpClient.Builder(); + okhttpClientBuilder.connectTimeout(10000, TimeUnit.SECONDS); + okhttpClientBuilder.addInterceptor(new Interceptor() { + @Override + public Response intercept(Chain chain) throws IOException { + Request original = chain.request(); + Request.Builder requestBuilder = original.newBuilder().header("Authorization", Authorization); + Request request = requestBuilder.build(); + return chain.proceed(request); + } + }); + okhttpClientBuilder.addNetworkInterceptor(cacheInterceptor); + okhttpClientBuilder.addInterceptor(interceptor); } - }); - okhttpClientBuilder.addNetworkInterceptor(cacheInterceptor); - okhttpClientBuilder.addInterceptor(interceptor); + } catch (Exception e) { + e.printStackTrace(); + } } public T createApi(Class clazz, String url) { - Authorization=token; + Authorization = token; Retrofit retrofit = new Retrofit.Builder() .baseUrl(url) .client(okhttpClientBuilder.build()) @@ -83,7 +90,7 @@ public class RetrofitCreateHelper { return retrofit.create(clazz); } -// public static T loginApi(Class clazz, String url) { + // public static T loginApi(Class clazz, String url) { // Authorization= StringUtils.getSign(); // okHttpClient.newBuilder().addInterceptor(new Interceptor() { // @Override @@ -103,13 +110,13 @@ public class RetrofitCreateHelper { // .build(); // return retrofit.create(clazz); // } - public void setAuthorization(String Authorization){ - this.token=Authorization; + public void setAuthorization(String Authorization) { + this.token = Authorization; } - public T login(Class clazz,String url){ - Authorization= StringUtils.getSign(); - Retrofit retrofit=new Retrofit.Builder() + public T login(Class clazz, String url) { + Authorization = StringUtils.getSign(); + Retrofit retrofit = new Retrofit.Builder() .client(okhttpClientBuilder.build()) .baseUrl(url) .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) @@ -119,6 +126,5 @@ public class RetrofitCreateHelper { } - } -- libgit2 0.21.0