From bfc68ef2c50fef642dc2aef536bf89cd0b990fc3 Mon Sep 17 00:00:00 2001 From: 陶汉栋 <2821744554@qq.com> Date: Fri, 16 Mar 2018 17:28:06 +0800 Subject: [PATCH] no message --- app/src/main/AndroidManifest.xml | 3 ++- app/src/main/java/com/shunzhi/parent/AppConfig.java | 1 + app/src/main/java/com/shunzhi/parent/AppContext.java | 6 +++--- app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java | 2 ++ app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java | 14 ++++++++++---- app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java | 2 +- app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java | 2 +- app/src/main/java/com/shunzhi/parent/ui/activity/StartActivity.java | 41 +++++++++-------------------------------- app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java | 13 ++++++++++--- app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 25 ++----------------------- app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java | 5 +++++ app/src/main/res/drawable-xhdpi/header_icon.jpg | Bin 0 -> 13300 bytes app/src/main/res/drawable/shape_corner_bg.xml | 9 +++++++++ app/src/main/res/drawable/web_progress_bar_bg.xml | 24 ++++++++++++++++++++++++ app/src/main/res/layout/activity_start.xml | 6 +----- app/src/main/res/layout/activity_web_view.xml | 23 +++++++++++++++++++++++ app/src/main/res/layout/fragment_start.xml | 12 ++++++++++++ app/src/main/res/layout/popup_pic_longclick.xml | 35 +++++++++++++++++++++++++++++++++++ app/src/main/res/layout/sub_net_status.xml | 26 ++++++++++++++++++++++++++ app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/styles.xml | 14 ++++++++++++++ mvpsdk/build.gradle | 2 +- mvpsdk/src/main/AndroidManifest.xml | 7 ++++++- mvpsdk/src/main/res/values/strings.xml | 2 +- 26 files changed, 498 insertions(+), 76 deletions(-) create mode 100644 app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java create mode 100644 app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java create mode 100644 app/src/main/res/drawable-xhdpi/header_icon.jpg create mode 100644 app/src/main/res/drawable/shape_corner_bg.xml create mode 100644 app/src/main/res/drawable/web_progress_bar_bg.xml create mode 100644 app/src/main/res/layout/activity_web_view.xml create mode 100644 app/src/main/res/layout/fragment_start.xml create mode 100644 app/src/main/res/layout/popup_pic_longclick.xml create mode 100644 app/src/main/res/layout/sub_net_status.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e2a8148..580b6dc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -109,7 +109,8 @@ android:name=".ui.activity.binding.InviteCodeActivity" android:screenOrientation="portrait" /> - + + \ 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 7d1f7d8..03d8958 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -23,6 +23,7 @@ public class AppConfig { public static String USER_IMAGE = "user_image"; public static String PARENT_ID = "parent_id"; public static String USER_ID="user_id"; + public static String APP_IS_START="app_is_start"; //http://campus.myjxt.com/ public static String BASE_URL="http://60.190.202.57:1000/"; diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 08857bd..54e88a2 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -19,7 +19,7 @@ public class AppContext extends GlobalApplication { public final static int LOCATION_CITYNAME=0x00; - public String cityName=""; + public String cityName="",district=""; public static AppContext getInstance() { return appContext; @@ -99,15 +99,15 @@ public class AppContext extends GlobalApplication { if (aMapLocation.getErrorCode()==0){ cityName=aMapLocation.getCity(); + district=aMapLocation.getDistrict(); aMapLocation.getCityCode(); - Log.d("mlocation:","handler="+handler); Intent intent=new Intent(); intent.setAction(LOCATION_CITYNAME+""); sendBroadcast(intent); stopLocation(); }else { cityName="定位失败"; - Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo()); +// Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo()); } } diff --git a/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java b/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java index 1e8d5be..f6fea55 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java @@ -31,6 +31,8 @@ public interface CepingContract { interface ICePingView extends IBaseFragment{ + void showTools(); + } } 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 67481fd..2af644f 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; @@ -10,6 +11,7 @@ import com.shunzhi.parent.R; import com.shunzhi.parent.bean.ToolBean; import com.shunzhi.parent.contract.ceping.CepingContract; import com.shunzhi.parent.model.CePingModel; +import com.shunzhi.parent.ui.activity.WebViewActivity; import com.shunzhi.parent.util.AttrsUtils; import com.shunzhi.parent.views.TextAndImgShowView; @@ -42,22 +44,26 @@ public class CePingPresenter extends CepingContract.CePingPresenter { public void accept(JsonObject jsonObject) throws Exception { if (jsonObject.get("status").getAsString().equals("1")){ JsonArray jsonArray=jsonObject.getAsJsonArray("data"); + layout_control.removeAllViews(); for (int i = 0; i < jsonArray.size(); i++) { ToolBean toolBean=new Gson().fromJson(jsonArray.get(i).getAsJsonObject(),ToolBean.class); TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); textAndImgShowView.setTextColor(R.color.textColor); textAndImgShowView.setText(toolBean.toolName); - textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBean.toolImage)); + textAndImgShowView.addImgs(toolBean.toolImage); textAndImgShowView.setSelect(true); textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0)); + textAndImgShowView.setTag(toolBean); textAndImgShowView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - + ToolBean toolBean1= (ToolBean) view.getTag(); + WebViewActivity.getInstance(mIView.getBindActivity(),toolBean1.toolUrl); } }); layout_control.addView(textAndImgShowView); + mIView.showTools(); } }else { @@ -89,7 +95,7 @@ public class CePingPresenter extends CepingContract.CePingPresenter { } }); layout_control.addView(textAndImgShowView); - } - mIView.showTools(toolBeanList);*/ + }*/ +// mIView.showTools(toolBeanList); } } 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 f849db0..decf1af 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 @@ -40,7 +40,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); textAndImgShowView.setTextColor(R.color.textColor); textAndImgShowView.setText(toolBeanList.get(i).toolName); - textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImg)); + textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImage)); textAndImgShowView.setSelect(true); textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0)); diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java index c1d5c9c..3053259 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java @@ -38,7 +38,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); textAndImgShowView.setTextColor(R.color.textColor); textAndImgShowView.setText(toolBeanList.get(i).toolName); - textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImg)); + textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImage)); textAndImgShowView.setSelect(true); textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0)); diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/StartActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/StartActivity.java index dbe7bc4..32bec60 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/StartActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/StartActivity.java @@ -1,6 +1,7 @@ package com.shunzhi.parent.ui.activity; import android.os.Bundle; +import android.support.v4.app.FragmentTransaction; import android.support.v4.view.ViewPager; import android.view.View; import android.widget.ImageView; @@ -8,6 +9,7 @@ import android.widget.ImageView; import com.bumptech.glide.Glide; import com.share.mvpsdk.base.activity.BaseCompatActivity; import com.shunzhi.parent.R; +import com.shunzhi.parent.ui.fragment.StartFragment; import com.stx.xhb.xbanner.XBanner; import java.util.ArrayList; @@ -15,44 +17,19 @@ import java.util.List; public class StartActivity extends BaseCompatActivity { - XBanner xBanner; - List imgUrl=new ArrayList<>(); - @Override - protected void initView(Bundle savedInstanceState) { - - xBanner=findViewById(R.id.xBanner); - - imgUrl.add(getClass().getResource("/assets/yindao1.png").toString()); - imgUrl.add(getClass().getResource("/assets/yindao2.png").toString()); - imgUrl.add(getClass().getResource("/assets/yindao3.png").toString()); - imgUrl.add(getClass().getResource("/assets/yindao4.png").toString()); - xBanner.setData(imgUrl,null); - xBanner.setmAutoPlayAble(false); + FragmentTransaction fragmentTransaction=null; - xBanner.setmAdapter(new XBanner.XBannerAdapter() { - @Override - public void loadBanner(XBanner banner, Object model, View view, int position) { - Glide.with(StartActivity.this).load(imgUrl.get(position)).placeholder(R.drawable.ic_launcher_background) - .into((ImageView) view); - } - }); + StartFragment startFragment=null; - xBanner.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } + @Override + protected void initView(Bundle savedInstanceState) { - @Override - public void onPageSelected(int position) { + fragmentTransaction=getSupportFragmentManager().beginTransaction(); - } + startFragment=new StartFragment(); - @Override - public void onPageScrollStateChanged(int state) { + fragmentTransaction.add(R.id.frame_start,startFragment).show(startFragment).commit(); - } - }); } @Override diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java new file mode 100644 index 0000000..c3f57d2 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java @@ -0,0 +1,200 @@ +package com.shunzhi.parent.ui.activity; + +import android.content.Context; +import android.content.Intent; +import android.graphics.Bitmap; +import android.os.Bundle; +import android.view.View; +import android.webkit.JavascriptInterface; +import android.webkit.WebChromeClient; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.ProgressBar; + +import com.share.mvpsdk.base.activity.BaseCompatActivity; +import com.share.mvpsdk.utils.AppUtils; +import com.share.mvpsdk.utils.NetworkConnectionUtils; +import com.share.mvpsdk.widgets.NestedScrollWebView; +import com.shunzhi.parent.R; + +public class WebViewActivity extends BaseCompatActivity { + + NestedScrollWebView nesteScrollWebView; + + private ProgressBar pvWeb; + + public static void getInstance(Context context,String url){ + Intent intent=new Intent(context,WebViewActivity.class); + intent.putExtra("url",url); + context.startActivity(intent); + } + + @Override + protected void initView(Bundle savedInstanceState) { + nesteScrollWebView=findViewById(R.id.nesteScrollWebView); + pvWeb=findViewById(R.id.pb_web); + initWebView(); + initWebSetting(nesteScrollWebView.getSettings()); + nesteScrollWebView.loadUrl(getIntent().getStringExtra("url")); + } + + @Override + protected int getLayoutId() { + return R.layout.activity_web_view; + } + + @Override + public void onBackPressedSupport() { + if (nesteScrollWebView.canGoBack()){ + nesteScrollWebView.goBack(); + }else { + super.onBackPressedSupport(); + } + } + + /** + * js接口 + */ + public class SupportJavascriptInterface { + private Context context; + + public SupportJavascriptInterface(Context context) { + this.context = context; + } + + @JavascriptInterface + public void openImage(final String img) { + AppUtils.runOnUIThread(new Runnable() { + @Override + public void run() { +// gotoImageBrowse(img); + } + }); + } + } + + protected void initWebView() { + // 添加js交互接口类，并起别名 imagelistner + nesteScrollWebView.addJavascriptInterface(new SupportJavascriptInterface(this), + "imagelistner"); + nesteScrollWebView.setWebViewClient(new WebViewClient() { + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return true; + } + + @Override + public void onPageFinished(WebView view, String url) { + view.getSettings().setJavaScriptEnabled(true); + super.onPageFinished(view, url); + // html加载完成之后，添加监听图片的点击js函数 + addWebImageClickListner(view); +// toolbar.setTitle(getToolbarTitle()); + } + + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + view.getSettings().setJavaScriptEnabled(true); + super.onPageStarted(view, url, favicon); + } + + // 注入js函数监听 + protected void addWebImageClickListner(WebView webView) { + // 这段js函数的功能就是，遍历所有的img节点，并添加onclick函数， + // 函数的功能是在图片点击的时候调用本地java接口并传递url过去 + webView.loadUrl("javascript:(function(){" + + "var objs = document.getElementsByTagName(\"img\"); " + + "for(var i=0;i + implements ConsultContract.IConsultView { + + XBanner xBanner; + + @Override + public int getLayoutId() { + return R.layout.fragment_start; + } + + @Override + public void initUI(View view, @Nullable Bundle savedInstanceState) { + xBanner = view.findViewById(R.id.xBanner); + if (!TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.APP_IS_START))) { + mPresenter.getBanners("0"); + AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1"); + } else mPresenter.getBanners("1"); + } + + @NonNull + @Override + public BasePresenter initPresenter() { + return new ConsultPresenter(); + } + + @Override + public void showTools() { + + } + + @Override + public void showBanners(List guangGaoBeanList) { + initBannes(guangGaoBeanList); + } + + private void initBannes(List guangGaoBeanList) { + final List imgUrl = new ArrayList<>(); + List describeList = new ArrayList<>(); + for (int i = 0; i < guangGaoBeanList.size(); i++) { + imgUrl.add(guangGaoBeanList.get(i).fileSrc); + describeList.add(guangGaoBeanList.get(i).describe); + } + xBanner.setData(imgUrl, describeList); + xBanner.setmAutoPlayAble(false); + xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER); + + xBanner.setmAdapter(new XBanner.XBannerAdapter() { + @Override + public void loadBanner(XBanner banner, Object model, View view, int position) { + Glide.with(getActivity()).load(imgUrl.get(position)).placeholder(R.drawable.ic_launcher_background) + .into((ImageView) view); + } + }); + + xBanner.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + if (position == imgUrl.size() - 1) { + startNewActivity(MainActivity.class); + } + } + + @Override + public void onPageSelected(int position) { + + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }); + + } +} 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 fd6e3b2..81717e0 100644 --- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java +++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java @@ -13,6 +13,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.bumptech.glide.Glide; import com.share.mvpsdk.utils.DisplayUtils; import com.shunzhi.parent.R; @@ -54,6 +55,10 @@ public class TextAndImgShowView extends LinearLayout { imgs = new int[]{normalDrawable, selectDrawable}; } + public void addImgs(String imgUrl){ + Glide.with(getContext()).load(imgUrl).error(R.drawable.gxzt).into(image); + } + public void setSelect(boolean isSelect) { if (isSelect) { if (imgs != null && imgs.length > 1) diff --git a/app/src/main/res/drawable-xhdpi/header_icon.jpg b/app/src/main/res/drawable-xhdpi/header_icon.jpg new file mode 100644 index 0000000..f16540b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/header_icon.jpg differ diff --git a/app/src/main/res/drawable/shape_corner_bg.xml b/app/src/main/res/drawable/shape_corner_bg.xml new file mode 100644 index 0000000..d604f69 --- /dev/null +++ b/app/src/main/res/drawable/shape_corner_bg.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/web_progress_bar_bg.xml b/app/src/main/res/drawable/web_progress_bar_bg.xml new file mode 100644 index 0000000..40bba59 --- /dev/null +++ b/app/src/main/res/drawable/web_progress_bar_bg.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml index 6447119..0e7465b 100644 --- a/app/src/main/res/layout/activity_start.xml +++ b/app/src/main/res/layout/activity_start.xml @@ -4,12 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/frame_start" tools:context="com.shunzhi.parent.ui.activity.StartActivity"> - diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml new file mode 100644 index 0000000..3de5e9d --- /dev/null +++ b/app/src/main/res/layout/activity_web_view.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml new file mode 100644 index 0000000..98fbb90 --- /dev/null +++ b/app/src/main/res/layout/fragment_start.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/popup_pic_longclick.xml b/app/src/main/res/layout/popup_pic_longclick.xml new file mode 100644 index 0000000..f333987 --- /dev/null +++ b/app/src/main/res/layout/popup_pic_longclick.xml @@ -0,0 +1,35 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/sub_net_status.xml b/app/src/main/res/layout/sub_net_status.xml new file mode 100644 index 0000000..72d7b1f --- /dev/null +++ b/app/src/main/res/layout/sub_net_status.xml @@ -0,0 +1,26 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 37c9671..a35c28a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,6 +11,7 @@ 32dp 64dp 48dp + 260dp 34dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index bbe6ef3..e08d0f9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -41,4 +41,18 @@ true + + + + + + diff --git a/mvpsdk/build.gradle b/mvpsdk/build.gradle index c670878..41892f6 100644 --- a/mvpsdk/build.gradle +++ b/mvpsdk/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' @@ -103,7 +104,6 @@ dependencies { compile 'cn.jzvd:jiaozivideoplayer:6.2.7' // compile(name: 'jiaozivideoplayer-6.2.3', ext: 'aar') - //轮播图XBanner compile 'com.xhb:xbanner:1.3.1' diff --git a/mvpsdk/src/main/AndroidManifest.xml b/mvpsdk/src/main/AndroidManifest.xml index 4cf5ec6..d79b4c5 100644 --- a/mvpsdk/src/main/AndroidManifest.xml +++ b/mvpsdk/src/main/AndroidManifest.xml @@ -1,2 +1,7 @@ + + package="com.share.mvpsdk"> + + + + \ No newline at end of file diff --git a/mvpsdk/src/main/res/values/strings.xml b/mvpsdk/src/main/res/values/strings.xml index 7165da5..5c7a08c 100644 --- a/mvpsdk/src/main/res/values/strings.xml +++ b/mvpsdk/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ Loading…… Load failed. Please click me again Press again to exit -报告 + 报告 Day Week -- libgit2 0.21.0