diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b946366..30639f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -112,7 +112,7 @@ android:name="com.amap.api.v2.apikey" android:value="1d130afb822d8a1019e6592cbaf10bcc"/> - @@ -130,7 +130,7 @@ - android:windowSoftInputMode="adjustPan|stateHidden" /> + 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 49a0c13..0b5feb8 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 @@ -41,6 +41,7 @@ public class CePingPresenter extends CepingContract.CePingPresenter { mRxManager.register(mIModel.getTools(areaName).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { + if (jsonObject.get("status").getAsString().equals("1")){ JsonArray jsonArray=jsonObject.getAsJsonArray("data"); layout_control.removeAllViews(); 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 a9e1f00..77ba01c 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,6 +68,7 @@ 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/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java index 6adccbb..27175cb 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 @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.webkit.JavascriptInterface; import android.webkit.WebChromeClient; @@ -26,8 +27,8 @@ public class WebViewActivity extends BaseCompatActivity { NestedScrollWebView nesteScrollWebView; LinearLayout binding_success, binding_success2; - ImageView close; - TextView tv_info,zuoye,title_web; +// ImageView close; + TextView tv_info,zuoye,title_web,close_btn; int type; @@ -48,13 +49,13 @@ public class WebViewActivity extends BaseCompatActivity { binding_success=findViewById(R.id.binding_success1); binding_success2=findViewById(R.id.binding_success2); - close = findViewById(R.id.close_btn); + close_btn = findViewById(R.id.close_btn); tv_info = findViewById(R.id.tv_info); zuoye = findViewById(R.id.zuoye); title_web = findViewById(R.id.title_web); - close.setOnClickListener(new View.OnClickListener() { + close_btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { onBackPressedSupport(); @@ -178,8 +179,8 @@ public class WebViewActivity extends BaseCompatActivity { @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { // Log.d("666666","onPageStartedurl="+url); - if (url.startsWith("http"))view.loadUrl(url); - view.getSettings().setJavaScriptEnabled(true); +// if (url.startsWith("http"))view.loadUrl(url); +// view.getSettings().setJavaScriptEnabled(true); super.onPageStarted(view, url, favicon); } 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 d7887bd..3afdf6f 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 @@ -27,6 +27,7 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean; import com.shunzhi.parent.contract.consult.ConsultContract; import com.shunzhi.parent.presenter.consult.ConsultPresenter; 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.stx.xhb.xbanner.XBanner; @@ -114,6 +115,13 @@ public class ConsultFragment extends BaseMVPCompatFragment stringList) { if (null!=shaiXuanPop){ + if (stringList.size()>0)tvNoData.setVisibility(View.GONE); shaiXuanPop.setDatas(stringList); shaiXuanPop.show(tvShaiXuan); } 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 1b8d2cc..14e5110 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 @@ -7,11 +7,13 @@ import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import com.bumptech.glide.Glide; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; import com.shunzhi.parent.AppConfig; +import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; import com.shunzhi.parent.bean.GuangGaoBean; import com.shunzhi.parent.bean.channel.ChannelBean; @@ -29,6 +31,8 @@ public class StartFragment extends BaseMVPCompatFragment - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml index 9a1bd13..ef28507 100644 --- a/app/src/main/res/layout/fragment_login_and_regist.xml +++ b/app/src/main/res/layout/fragment_login_and_regist.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" tools:context="com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment"> @@ -59,6 +60,7 @@ android:text="" android:maxLength="11" android:textColorHint="@color/hintTextColor" + android:textColor="@color/textColor" android:textSize="@dimen/sp_16" /> + android:layout_height="?android:actionBarSize"> @@ -167,7 +167,7 @@ @@ -197,7 +197,7 @@ diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index 05da01a..d7b196b 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -46,6 +46,17 @@ android:textSize="@dimen/textSize16" /> + + + + -- libgit2 0.21.0