陶汉栋 / ParentWork

Download as
Browse Code »

Commit 935f129cf1a7e76c7ef8ed3b48c1956a698fcdfc

Authored by 姚旭斌
1 parent 0f4158c7
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 4 changed files with 7 additions and 9 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @935f129
... ... @@ -173,7 +173,6 @@
173 173  
174 174 <activity
175 175 android:name=".ui.activity.mywebview.WebViewActivity"
176   - android:launchMode="singleInstance"
177 176 android:screenOrientation="portrait" />
178 177  
179 178 <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity"
... ...
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
  Diff comments   View file @935f129
... ... @@ -19,7 +19,6 @@ import android.widget.TextView;
19 19 import com.share.mvpsdk.base.activity.BaseCompatActivity;
20 20 import com.share.mvpsdk.utils.AppUtils;
21 21 import com.share.mvpsdk.utils.NetworkConnectionUtils;
22   -import com.share.mvpsdk.utils.ToastUtils;
23 22 import com.share.mvpsdk.widgets.NestedScrollWebView;
24 23 import com.shunzhi.parent.AppConfig;
25 24 import com.shunzhi.parent.R;
... ... @@ -40,7 +39,6 @@ public class WebViewActivity extends BaseCompatActivity {
40 39 Intent intent = new Intent(context, WebViewActivity.class);
41 40 intent.putExtra("url", url);
42 41 intent.putExtra("type", type);
43   - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
44 42 context.startActivity(intent);
45 43 }
46 44  
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
  Diff comments   View file @935f129
... ... @@ -15,7 +15,6 @@ import android.widget.ImageView;
15 15 import android.widget.LinearLayout;
16 16 import android.widget.TextView;
17 17  
18   -import com.bumptech.glide.Glide;
19 18 import com.jcodecraeer.xrecyclerview.XRecyclerView;
20 19 import com.share.mvpsdk.base.BasePresenter;
21 20 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
... ... @@ -55,6 +54,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
55 54  
56 55 List<String> imgesUrl = new ArrayList<>();
57 56 List<String> describeList = new ArrayList<>();
  57 + List<GuangGaoBean> guanggaoList = new ArrayList<>();
58 58 List<ChannelContextBean> contextList = new ArrayList<>();
59 59  
60 60 JZVideoPlayerStandard videoplayer;
... ... @@ -140,7 +140,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
140 140 xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() {
141 141 @Override
142 142 public void onItemClick(XBanner banner, int position) {
143   - WebViewActivity.getInstance(getContext(), describeList.get(position), -1);
  143 + WebViewActivity.getInstance(getContext(), guanggaoList.get(position).url, -1);
144 144 }
145 145 });
146 146  
... ... @@ -215,6 +215,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
215 215 public void showBanners(List<GuangGaoBean> guangGaoBeanList) {
216 216 describeList.clear();
217 217 imgesUrl.clear();
  218 + guanggaoList=guangGaoBeanList;
218 219 for (int i = 0; i < guangGaoBeanList.size(); i++) {
219 220 imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc);
220 221 describeList.add(guangGaoBeanList.get(i).describe);
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  Diff comments   View file @935f129
... ... @@ -6,7 +6,6 @@ import android.support.annotation.Nullable;
6 6 import android.support.v7.widget.LinearLayoutManager;
7 7 import android.support.v7.widget.RecyclerView;
8 8 import android.text.TextUtils;
9   -import android.util.Log;
10 9 import android.view.LayoutInflater;
11 10 import android.view.View;
12 11 import android.view.ViewGroup;
... ... @@ -97,7 +96,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
97 96 pageIndex = 1;
98 97 mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
99 98  
100   - mPresenter.getBanners("4", AppContext.getInstance().district);
  99 + mPresenter.getBanners("3", AppContext.getInstance().district);
101 100  
102 101 }
103 102  
... ... @@ -223,13 +222,14 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment&lt;ConsultOneCon
223 222 }
224 223  
225 224 @Override
226   - public void onBindViewHolder(final GuangGaoBean object, int position) {
  225 + public void onBindViewHolder(final GuangGaoBean object, final int position) {
227 226 GlideUtils.showImg(mContext, iv_grally, object.fileSrc);
228 227 tv_grally_title.setText(object.describe + "");
229 228 iv_grally.setOnClickListener(new View.OnClickListener() {
230 229 @Override
231 230 public void onClick(View v) {
232   - WebViewActivity.getInstance(mContext, object.url, -1);
  231 +// WebViewActivity.getInstance(mContext, object.url, -1);
  232 + WebViewActivity.getInstance(getActivity(), object.url, -1);
233 233 }
234 234 });
235 235 }
... ...