瀏覽代碼

首页调整为网页版;

owen 7 年之前
父節點
當前提交
b87711b7b3

+ 13 - 8
app/src/main/java/com/wiipu/peopleheart/MainActivity.java

@@ -16,6 +16,7 @@ import android.widget.RadioGroup;
 import com.wiipu.commonlib.base.BaseActivity;
 import com.wiipu.peopleheart.cases.CaseFragment;
 import com.wiipu.peopleheart.home.HomeFragment;
+import com.wiipu.peopleheart.home.HomeNewFragment;
 import com.wiipu.peopleheart.info.InfoFragment;
 
 import java.util.List;
@@ -26,7 +27,8 @@ import java.util.List;
 
 public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener {
 
-    public static final int FRAGMENT_HOME = 0;
+ //   public static final int FRAGMENT_HOME = 0;
+    public static final int FRAGMENT_HOME_NET = 0;
     public static final int FRAGMENT_CASE = 1;
     public static final int FRAGMENT_INFO = 2;
 
@@ -34,7 +36,7 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
     private RadioGroup mRgBottom;
 
 
-    private HomeFragment mHomeFragment;
+    private HomeNewFragment mHomeFragment;
     private CaseFragment mCaseFragment;
     private InfoFragment mInfoFragment;
 
@@ -56,7 +58,7 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
         mRgBottom.check(R.id.tab_main_home);
 
         //主页
-        setFragment(FRAGMENT_HOME);
+        setFragment(FRAGMENT_HOME_NET);
 
     }
 
@@ -98,7 +100,7 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
     @Override
     public void onCheckedChanged(RadioGroup radioGroup, @IdRes int i) {
         if (i == R.id.tab_main_home) {
-            setFragment(FRAGMENT_HOME);
+            setFragment(FRAGMENT_HOME_NET);
         } else if (i == R.id.tab_main_case) {
             setFragment(FRAGMENT_CASE);
         } else if (i == R.id.tab_main_info) {
@@ -133,9 +135,9 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
 
     private Fragment getFragment(int fragmentId) {
         switch (fragmentId) {
-            case FRAGMENT_HOME:
+            case FRAGMENT_HOME_NET:
                 if (mHomeFragment == null) {
-                    mHomeFragment = new HomeFragment();
+                    mHomeFragment = new HomeNewFragment();
                 }
                 return mHomeFragment;
 
@@ -160,8 +162,8 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        int fragmentId = intent.getIntExtra("fragment_id",FRAGMENT_HOME);
-        if(fragmentId == FRAGMENT_HOME){
+        int fragmentId = intent.getIntExtra("fragment_id",FRAGMENT_HOME_NET);
+        if(fragmentId == FRAGMENT_HOME_NET){
             mRgBottom.check(R.id.tab_main_home);
         }
         else if(fragmentId == FRAGMENT_CASE){
@@ -189,6 +191,9 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
             }else if (mCurFragmentId == FRAGMENT_INFO){
                 mInfoFragment.onBackPressed();
                 return true;
+            } else if (mCurFragmentId == FRAGMENT_HOME_NET){
+                mHomeFragment.onBackPressed();
+                return true;
             }
         }
         return super.onKeyDown(keyCode, event);

+ 2 - 1
app/src/main/java/com/wiipu/peopleheart/cases/CaseFragment.java

@@ -12,6 +12,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.wiipu.commonlib.base.BaseMvpFragment;
+import com.wiipu.commonlib.net.HttpClient;
 import com.wiipu.peopleheart.R;
 
 import butterknife.BindView;
@@ -53,7 +54,7 @@ public class CaseFragment extends BaseMvpFragment {
         //设置WebView属性,能够执行Javascript脚本
         mWebView.getSettings().setJavaScriptEnabled(true);
         //加载需要显示的网页
-        mWebView.loadUrl("http://47.96.24.215/rongzhi110/weixinMinxin/allHanding_manage.php");
+        mWebView.loadUrl(HttpClient.BASE_NET_URL + "weixinMinxin/allHanding_manage.php");
         //设置web视图
         //当用户点击了你的WebView中的一个链接,默认的行为是Android启动一个处理URL的应用,通常,默认的浏览器打开并下载目标URL。
         // 可以在WebView中覆盖这一行为,使得连接仍在WebView中打开。

+ 128 - 0
app/src/main/java/com/wiipu/peopleheart/home/HomeNewFragment.java

@@ -0,0 +1,128 @@
+package com.wiipu.peopleheart.home;
+
+import android.os.Bundle;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.bigkoo.convenientbanner.ConvenientBanner;
+import com.bigkoo.convenientbanner.holder.CBViewHolderCreator;
+import com.bigkoo.convenientbanner.listener.OnItemClickListener;
+import com.wiipu.commonlib.base.BaseAdapter;
+import com.wiipu.commonlib.base.BaseMvpFragment;
+import com.wiipu.commonlib.net.HttpClient;
+import com.wiipu.peopleheart.R;
+import com.wiipu.peopleheart.home.acticity.commonActivity;
+import com.wiipu.peopleheart.home.acticity.homeNewsDetailActivity;
+import com.wiipu.peopleheart.home.adapter.homeRcylerApdater;
+import com.wiipu.peopleheart.home.contract.HomeContract;
+import com.wiipu.peopleheart.home.presenter.HomePresenter;
+import com.wiipu.peopleheart.home.response.homeNewsResponse;
+import com.wiipu.peopleheart.home.response.topNewsResponse;
+import com.wiipu.peopleheart.widget.ClearEditText;
+import com.wiipu.peopleheart.widget.convenientBanner.GlideHolderView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
+
+
+public class HomeNewFragment extends BaseMvpFragment{
+
+    @BindView(R.id.wv_home_net)
+    WebView mWebView;
+    Unbinder unbinder;
+    @BindView(R.id.iv_back_home_net)
+    ImageView ivBackCase;
+    @BindView(R.id.tv_title_home_net)
+    TextView tvTitleHomeNet;
+
+    @Override
+    protected void attach() {
+
+    }
+
+    @Override
+    protected void detach() {
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_home_net;
+    }
+
+    @Override
+    protected void initViews() {
+        //设置WebView属性,能够执行Javascript脚本
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        //加载需要显示的网页
+        mWebView.loadUrl(HttpClient.BASE_NET_URL + "weixinMinxin/app_index.php");
+        //设置web视图
+        //当用户点击了你的WebView中的一个链接,默认的行为是Android启动一个处理URL的应用,通常,默认的浏览器打开并下载目标URL。
+        // 可以在WebView中覆盖这一行为,使得连接仍在WebView中打开。
+        mWebView.setWebViewClient(new WebViewClient());
+    }
+
+    @Override
+    protected void initListeners() {
+
+    }
+
+    @Override
+    protected void initData() {
+        if (!TextUtils.isEmpty(mWebView.getTitle())) {
+            tvTitleHomeNet.setText(mWebView.getTitle());
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+
+    }
+
+
+    public void onBackPressed() {
+        if (mWebView.canGoBack()) {
+            mWebView.goBack();
+        } else {
+            getActivity().finish();
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // TODO: inflate a fragment view
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        unbinder = ButterKnife.bind(this, rootView);
+        return rootView;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @OnClick(R.id.iv_back_home_net)
+    public void onViewClicked() {
+        onBackPressed();
+    }
+
+
+
+}

+ 2 - 1
app/src/main/java/com/wiipu/peopleheart/info/InfoFragment.java

@@ -12,6 +12,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.wiipu.commonlib.base.BaseMvpFragment;
+import com.wiipu.commonlib.net.HttpClient;
 import com.wiipu.peopleheart.R;
 
 import butterknife.BindView;
@@ -53,7 +54,7 @@ public class InfoFragment extends BaseMvpFragment {
         //设置WebView属性,能够执行Javascript脚本
         mWebView.getSettings().setJavaScriptEnabled(true);
         //加载需要显示的网页
-        mWebView.loadUrl("http://47.96.24.215/rongzhi110/weixinMinxin/policyNews.php");
+        mWebView.loadUrl(HttpClient.BASE_NET_URL + "weixinMinxin/policyNews.php");
         //设置web视图
         //当用户点击了你的WebView中的一个链接,默认的行为是Android启动一个处理URL的应用,通常,默认的浏览器打开并下载目标URL。
         // 可以在WebView中覆盖这一行为,使得连接仍在WebView中打开。

+ 43 - 0
app/src/main/res/layout/fragment_home_net.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <RelativeLayout
+        android:id="@+id/ll_home_net"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/margin48dp"
+        android:background="@color/blue_black">
+
+        <ImageView
+            android:id="@+id/iv_back_home_net"
+            android:layout_width="@dimen/margin20dp"
+            android:layout_height="@dimen/margin20dp"
+            android:src="@drawable/ic_imagepicker_arrow_left"
+            android:layout_alignParentLeft="true"
+            android:layout_centerInParent="true"
+            android:layout_marginLeft="10dp"
+            />
+        <TextView
+            android:id="@+id/tv_title_home_net"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:textSize="@dimen/textsize_20"
+            android:textColor="@color/white"
+            android:layout_centerInParent="true"
+            android:text="@string/tv_main"
+            />
+
+    </RelativeLayout>
+
+    <WebView
+        android:layout_marginTop="@dimen/margin1dp"
+        android:id="@+id/wv_home_net"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
+</LinearLayout>

+ 4 - 0
commonlib/src/main/java/com/wiipu/commonlib/net/HttpClient.java

@@ -14,6 +14,10 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class HttpClient {
 
+    /*
+     * 网页版测试环境
+     */
+    public static final String BASE_NET_URL = "http://rongzhi110.xazhima.com/";
 
     /*
      * 测试环境