From b222a6321b9f0f1f0a033c9038d4dd853d985b42 Mon Sep 17 00:00:00 2001 From: renjianbo0118 <18133922183> Date: Tue, 6 Apr 2021 22:53:08 +0800 Subject: [PATCH 01/10] d --- .../java/com/sl/house_property/user/MyPropertyActivity.java | 5 ++++- app/src/main/java/http/ApiConfig.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java index f48ee1c..78107d3 100644 --- a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java +++ b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java @@ -428,6 +428,7 @@ public class MyPropertyActivity extends BaseActivity }).show(); } }); +// String string13 = homegridentityvArrayList.get(position).getString13(); if (homegridentityvArrayList.get(position).getString13().equals("1.0")) { homeGridAdapterItemBinding.llJt.setVisibility(VISIBLE); }else { @@ -476,7 +477,9 @@ public class MyPropertyActivity extends BaseActivity Log.e("dsfsdfdsfs",adding+""); if (!adding) { adding = true; - homegridentityvArrayList.add(new SimpleEntity()); + SimpleEntity simpleEntity = new SimpleEntity(); + simpleEntity.setString13("1.0"); + homegridentityvArrayList.add(simpleEntity); baseRecycleViewAdapterv.setData(homegridentityvArrayList); // int size = homegridentityvArrayList.size(); // Log.e("dsfsdfsdfs",size+""); diff --git a/app/src/main/java/http/ApiConfig.java b/app/src/main/java/http/ApiConfig.java index 9600fa5..5f8fda3 100644 --- a/app/src/main/java/http/ApiConfig.java +++ b/app/src/main/java/http/ApiConfig.java @@ -9,7 +9,7 @@ public class ApiConfig { public static String APPID="szo007"; public static String webUrl="https://www.dafaok88.com";*/ - public static String BASE_PARENT_URL="http://wy.dou1.net/"; + public static String BASE_PARENT_URL="https://wy.dou1.net/"; public static String BASE_URL= BASE_PARENT_URL + "api/"; public static String APPID="api/"; From 668da8bdf35b494d60b47ca98b4a05718facfae9 Mon Sep 17 00:00:00 2001 From: renjianbo0118 <18133922183> Date: Sun, 18 Apr 2021 20:21:27 +0800 Subject: [PATCH 02/10] d --- app/src/main/res/layout/activity_login.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 684bd16..aee35c7 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -201,7 +201,7 @@ android:onClick="yinagreementEvent" android:layout_gravity="center_vertical" android:gravity="center_vertical" - android:text="@string/agreewhitemeg1" + android:text="@string/agreewhitemeg2" android:textSize="16sp"/> From 7fe8ca2f5d836914cc26c7719149b5bab91f1ef4 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Mon, 19 Apr 2021 16:13:03 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sl/house_property/BaseFragment.java | 1 + .../sl/house_property/MainTabActivity.java | 31 ++--- .../message/MessageAdapter.java | 23 ++++ .../house_property/message/MessageEntity.java | 66 +++++++++++ .../message/MessageFragment.java | 112 ++++++++++++++++++ app/src/main/res/layout/activity_main_tab.xml | 39 +++--- app/src/main/res/layout/fragment_message.xml | 51 ++++++++ app/src/main/res/layout/item_message.xml | 52 ++++++++ 8 files changed, 337 insertions(+), 38 deletions(-) create mode 100644 app/src/main/java/com/sl/house_property/message/MessageAdapter.java create mode 100644 app/src/main/java/com/sl/house_property/message/MessageEntity.java create mode 100644 app/src/main/java/com/sl/house_property/message/MessageFragment.java create mode 100644 app/src/main/res/layout/fragment_message.xml create mode 100644 app/src/main/res/layout/item_message.xml diff --git a/app/src/main/java/com/sl/house_property/BaseFragment.java b/app/src/main/java/com/sl/house_property/BaseFragment.java index f9cdab3..5bb856d 100644 --- a/app/src/main/java/com/sl/house_property/BaseFragment.java +++ b/app/src/main/java/com/sl/house_property/BaseFragment.java @@ -33,6 +33,7 @@ public ProgressDialog progressDialog; @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(getLayoutId(), null); + mDataBinding = DataBindingUtil.bind(view); onCreateVew(inflater, savedInstanceState); progressDialog=new ProgressDialog(getActivity()); diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java index 2827412..c5dabf7 100644 --- a/app/src/main/java/com/sl/house_property/MainTabActivity.java +++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java @@ -7,39 +7,21 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.util.Log; -import android.view.Gravity; import android.view.MotionEvent; import android.view.View; import android.widget.RadioButton; import android.widget.RadioGroup; -import com.google.gson.Gson; -import com.google.gson.internal.LinkedTreeMap; -import com.google.gson.reflect.TypeToken; import com.gyf.immersionbar.ImmersionBar; -import com.selectpicker.OptionsPopupWindow; import com.sl.house_property.cart.CartFragment; import com.sl.house_property.databinding.ActivityMainTabBinding; import com.sl.house_property.discovery.DiscoveryFragment; -import com.sl.house_property.discovery.LikeFragment; -import com.sl.house_property.user.MyPropertyActivity; +import com.sl.house_property.message.MessageFragment; -import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import entity.MyHomequEntity; -import entity.RegisterUser; -import entity.SimpleEntity; -import http.ApiConfig; import my_loader.Loader; -import my_loader.Resultcode; -import rx.Subscription; -import rx.functions.Action1; import tools.Config; -import utils.Md5; -import utils.SPUtils; public class MainTabActivity extends BaseActivity implements View.OnClickListener, @@ -64,6 +46,7 @@ public class MainTabActivity extends BaseActivity private Main3Fragment fragment2; private CartFragment fragment3; private Main4Fragment fragment4; + private MessageFragment messageFragment; // private LikeFragment likeFragment; private Fragment currentFragment; @@ -248,14 +231,14 @@ public class MainTabActivity extends BaseActivity break; case R.id.button2: - if (fragment2 == null) { - fragment2 = Main3Fragment.newInstance("", ""); - fragmentTransaction.add(R.id.mycontent, fragment2, "fragment2"); + if (messageFragment == null) { + messageFragment = MessageFragment.newInstance(); + fragmentTransaction.add(R.id.mycontent, messageFragment, "fragment2"); } else { - fragmentTransaction.show(fragment2); + fragmentTransaction.show(messageFragment); } - currentFragment = fragment2; + currentFragment = messageFragment; break; case R.id.button3: // mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly)); diff --git a/app/src/main/java/com/sl/house_property/message/MessageAdapter.java b/app/src/main/java/com/sl/house_property/message/MessageAdapter.java new file mode 100644 index 0000000..3f1d016 --- /dev/null +++ b/app/src/main/java/com/sl/house_property/message/MessageAdapter.java @@ -0,0 +1,23 @@ +package com.sl.house_property.message; + +import android.widget.ImageView; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.sl.house_property.R; + +public class MessageAdapter extends BaseQuickAdapter { + public MessageAdapter() { + super(R.layout.item_message); + } + + @Override + protected void convert(BaseViewHolder baseViewHolder, MessageEntity.StoreInfo messageEntity) { + Glide.with(mContext).load(messageEntity.getImg()).apply(new RequestOptions().circleCrop()) + .into(baseViewHolder.itemView.findViewById(R.id.iv)); + baseViewHolder.setText(R.id.tv_name,messageEntity.getStore_name()); + baseViewHolder.setText(R.id.tv_title,messageEntity.getTitle()); + } +} diff --git a/app/src/main/java/com/sl/house_property/message/MessageEntity.java b/app/src/main/java/com/sl/house_property/message/MessageEntity.java new file mode 100644 index 0000000..c6ead2b --- /dev/null +++ b/app/src/main/java/com/sl/house_property/message/MessageEntity.java @@ -0,0 +1,66 @@ +package com.sl.house_property.message; + +import android.support.annotation.Keep; + +import java.util.ArrayList; + +@Keep +public class MessageEntity { + private ArrayList storeInfo; + private String userid; + + public ArrayList getStoreInfo() { + return storeInfo; + } + + public void setStoreInfo(ArrayList storeInfo) { + this.storeInfo = storeInfo; + } + + public String getUserid() { + return userid; + } + + public void setUserid(String userid) { + this.userid = userid; + } + + public static class StoreInfo{ + private String title; + private String img; + private String store_name; + private String url; + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public String getStore_name() { + return store_name; + } + + public void setStore_name(String store_name) { + this.store_name = store_name; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + } + +} diff --git a/app/src/main/java/com/sl/house_property/message/MessageFragment.java b/app/src/main/java/com/sl/house_property/message/MessageFragment.java new file mode 100644 index 0000000..14e4ae1 --- /dev/null +++ b/app/src/main/java/com/sl/house_property/message/MessageFragment.java @@ -0,0 +1,112 @@ +package com.sl.house_property.message; + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.google.gson.Gson; +import com.google.gson.internal.LinkedTreeMap; +import com.google.gson.reflect.TypeToken; +import com.sl.house_property.R; +import com.sl.house_property.WebActivitytwo; + +import org.jetbrains.annotations.NotNull; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import entity.RegisterUser; +import http.ApiConfig; +import my_loader.Loader; +import my_loader.Resultcode; +import rx.functions.Action1; +import tools.Config; +import utils.Md5; + +public class MessageFragment extends Fragment { + // private int pageIndex = 0; + private MessageAdapter adapter = null; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_message, null); + return view; + } + + public static MessageFragment newInstance() { + MessageFragment fragment = new MessageFragment(); + Bundle args = new Bundle(); + + fragment.setArguments(args); + return fragment; + } + + @Override + public void onViewCreated(@NonNull @NotNull View view, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + RecyclerView rv = view.findViewById(R.id.rv); + adapter = new MessageAdapter(); + rv.setAdapter(adapter); + rv.setLayoutManager(new LinearLayoutManager(getContext())); + adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { + @Override + public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) { + WebActivitytwo.runActivity(getContext(), adapter.getData().get(i).getTitle(), adapter.getData().get(i).getUrl()); + } + }); + getData(); + } + + private void getData() { + RegisterUser user = + Config.getInstance(getContext()).getUser(); + Map map = new HashMap<>(); + if (user != null) { + map.put("userid", user.getUserid()); + } else { + map.put("userid", 0 + ""); + } + map.put("app", "Store"); + map.put("class", "GetMsgList"); + map.put("sign", Md5.md5("Store" + "GetMsgList" + Md5.secret)); + Loader mGankLoader = new Loader(); + mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() { + @Override + public void call(Resultcode resultcode) { + if (!(resultcode.status == 0)) { +// getActivity().setToast(1, resultcode.msg); + Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show(); + } + + Gson gs = new Gson(); + LinkedTreeMap adta = (LinkedTreeMap) resultcode.data; + String s = gs.toJson(adta); + Log.e("json", s); + + + MessageEntity messageEntity = gs.fromJson(s, MessageEntity.class); + + adapter.setNewData(messageEntity.getStoreInfo()); + } + }, new Action1() { + @Override + public void call(Throwable throwable) { + throwable.fillInStackTrace(); + Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show(); + } + }); + } + +} diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml index 8bbaed0..0b79a9d 100644 --- a/app/src/main/res/layout/activity_main_tab.xml +++ b/app/src/main/res/layout/activity_main_tab.xml @@ -63,6 +63,17 @@ android:text="@string/news" android:textColor="@color/radiobuttoncolor" /> + + + android:textColor="@color/radiobuttoncolor" + android:visibility="gone" /> - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml new file mode 100644 index 0000000..cb4baf6 --- /dev/null +++ b/app/src/main/res/layout/item_message.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + \ No newline at end of file From 669ea2210103a84b5f1d500094281f4e211a01ed Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Mon, 19 Apr 2021 17:30:11 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/GlideRoundTransform.java | 55 +++++++++++++++++++ .../message/MessageAdapter.java | 14 ++++- .../house_property/message/MessageEntity.java | 28 ++++++++++ .../message/MessageFragment.java | 16 ++++++ app/src/main/res/drawable/circle_red.xml | 11 ++++ app/src/main/res/layout/fragment_message.xml | 1 + app/src/main/res/layout/item_message.xml | 43 +++++++++++---- 7 files changed, 154 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java create mode 100644 app/src/main/res/drawable/circle_red.xml diff --git a/app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java b/app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java new file mode 100644 index 0000000..cb0da11 --- /dev/null +++ b/app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java @@ -0,0 +1,55 @@ +package com.sl.house_property.message; + +import android.graphics.Bitmap; +import android.graphics.BitmapShader; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.RectF; +import android.graphics.Shader; +import android.support.annotation.NonNull; + +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; +import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; +import com.bumptech.glide.load.resource.bitmap.TransformationUtils; + +import org.jetbrains.annotations.NotNull; + +import java.security.MessageDigest; + +public class GlideRoundTransform extends BitmapTransformation { + + private int dp; + + public GlideRoundTransform(int dp) { + this.dp = dp; + } + + @Override + protected Bitmap transform(@NonNull @NotNull BitmapPool bitmapPool, @NonNull @NotNull Bitmap bitmap, int outWidth, int outHeight) { + Bitmap bitmap1 = TransformationUtils.centerCrop(bitmapPool, bitmap, outWidth, outHeight); + return roundCrop(bitmapPool, bitmap1); + + } + + private Bitmap roundCrop(BitmapPool pool, Bitmap source) { + + if (source == null) return null; + Bitmap result = pool.get(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888); + if (result == null) { + result = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888); + } + + Canvas canvas = new Canvas(result); + Paint paint = new Paint(); + paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)); + paint.setAntiAlias(true); + RectF rectF = new RectF(0f, 0f, source.getWidth(), source.getHeight()); + canvas.drawRoundRect(rectF, dp, dp, paint); + return result; + } + + @Override + public void updateDiskCacheKey(@NonNull @NotNull MessageDigest messageDigest) { + + } +} diff --git a/app/src/main/java/com/sl/house_property/message/MessageAdapter.java b/app/src/main/java/com/sl/house_property/message/MessageAdapter.java index 3f1d016..5aa3151 100644 --- a/app/src/main/java/com/sl/house_property/message/MessageAdapter.java +++ b/app/src/main/java/com/sl/house_property/message/MessageAdapter.java @@ -1,5 +1,6 @@ package com.sl.house_property.message; +import android.view.View; import android.widget.ImageView; import com.bumptech.glide.Glide; @@ -15,9 +16,16 @@ public class MessageAdapter extends BaseQuickAdapterfindViewById(R.id.iv)); - baseViewHolder.setText(R.id.tv_name,messageEntity.getStore_name()); - baseViewHolder.setText(R.id.tv_title,messageEntity.getTitle()); + baseViewHolder.setText(R.id.tv_name, messageEntity.getStore_name()); + baseViewHolder.setText(R.id.tv_title, messageEntity.getTitle()); + baseViewHolder.setText(R.id.tv_time, messageEntity.getCtime()); + if (messageEntity.getIs_dot().equals("1")) { + baseViewHolder.getView(R.id.view).setVisibility(View.VISIBLE); + } else { + baseViewHolder.getView(R.id.view).setVisibility(View.GONE); + } } + } diff --git a/app/src/main/java/com/sl/house_property/message/MessageEntity.java b/app/src/main/java/com/sl/house_property/message/MessageEntity.java index c6ead2b..7763c80 100644 --- a/app/src/main/java/com/sl/house_property/message/MessageEntity.java +++ b/app/src/main/java/com/sl/house_property/message/MessageEntity.java @@ -8,6 +8,15 @@ import java.util.ArrayList; public class MessageEntity { private ArrayList storeInfo; private String userid; + private String Msg_count; + + public String getMsg_count() { + return Msg_count; + } + + public void setMsg_count(String msg_count) { + Msg_count = msg_count; + } public ArrayList getStoreInfo() { return storeInfo; @@ -30,6 +39,25 @@ public class MessageEntity { private String img; private String store_name; private String url; + private String ctime; + private String is_dot; + + public String getCtime() { + return ctime; + } + + public void setCtime(String ctime) { + this.ctime = ctime; + } + + public String getIs_dot() { + return is_dot; + } + + public void setIs_dot(String is_dot) { + this.is_dot = is_dot; + } + public String getTitle() { return title; } diff --git a/app/src/main/java/com/sl/house_property/message/MessageFragment.java b/app/src/main/java/com/sl/house_property/message/MessageFragment.java index 14e4ae1..6171d4b 100644 --- a/app/src/main/java/com/sl/house_property/message/MessageFragment.java +++ b/app/src/main/java/com/sl/house_property/message/MessageFragment.java @@ -10,6 +10,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; import android.widget.Toast; import com.chad.library.adapter.base.BaseQuickAdapter; @@ -37,6 +38,7 @@ import utils.Md5; public class MessageFragment extends Fragment { // private int pageIndex = 0; private MessageAdapter adapter = null; + private TextView tvTitle; @Nullable @Override @@ -57,6 +59,7 @@ public class MessageFragment extends Fragment { public void onViewCreated(@NonNull @NotNull View view, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); RecyclerView rv = view.findViewById(R.id.rv); + tvTitle = view.findViewById(R.id.tv_title); adapter = new MessageAdapter(); rv.setAdapter(adapter); rv.setLayoutManager(new LinearLayoutManager(getContext())); @@ -66,6 +69,12 @@ public class MessageFragment extends Fragment { WebActivitytwo.runActivity(getContext(), adapter.getData().get(i).getTitle(), adapter.getData().get(i).getUrl()); } }); + + } + + @Override + public void onResume() { + super.onResume(); getData(); } @@ -97,6 +106,13 @@ public class MessageFragment extends Fragment { MessageEntity messageEntity = gs.fromJson(s, MessageEntity.class); + int i = Integer.parseInt(messageEntity.getMsg_count()); + if (i > 0) { + tvTitle.setText("消息(" + i + ")"); + + } else { + tvTitle.setText("消息"); + } adapter.setNewData(messageEntity.getStoreInfo()); } diff --git a/app/src/main/res/drawable/circle_red.xml b/app/src/main/res/drawable/circle_red.xml new file mode 100644 index 0000000..d038667 --- /dev/null +++ b/app/src/main/res/drawable/circle_red.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml index 095ec76..6ddacb9 100644 --- a/app/src/main/res/layout/fragment_message.xml +++ b/app/src/main/res/layout/fragment_message.xml @@ -12,6 +12,7 @@ android:layout_marginTop="@dimen/mystatusbar"> - + android:src="@color/black" /> + + + + + - Date: Tue, 20 Apr 2021 14:35:26 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sl/house_property/MainTabActivity.java | 55 +++++++++++-------- .../house_property/message/MessageEntity.java | 9 +++ .../message/MessageFragment.java | 6 +- app/src/main/res/layout/activity_main_tab.xml | 40 ++++++++++---- 4 files changed, 75 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java index c5dabf7..1d0db83 100644 --- a/app/src/main/java/com/sl/house_property/MainTabActivity.java +++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java @@ -53,7 +53,6 @@ public class MainTabActivity extends BaseActivity private int myeditcode = 1000; private Loader mGankLoader; - private int nowradioId; // @Override // public boolean dispatchTouchEvent(MotionEvent ev) { @@ -69,7 +68,13 @@ public class MainTabActivity extends BaseActivity public void visibilyBottom(int isVisibily) { findViewById(R.id.rl_bottom).setVisibility(isVisibily); } - + public void setMessageCount(boolean isRed){ + if (isRed){ + findViewById(R.id.redview).setVisibility(View.VISIBLE); + }else { + findViewById(R.id.redview).setVisibility(View.GONE); + } + } //2. 保存MyOnTouchListener接口的列表 private ArrayList onTouchListeners = new ArrayList(); @@ -184,14 +189,11 @@ public class MainTabActivity extends BaseActivity } private void initView() { - radioGroup = mDataBinding.radioGroup; - for (int i = 0; i < radioGroup.getChildCount(); i++) { - RadioButton myRadioButton = (RadioButton) radioGroup.getChildAt(i); - myRadioButton.setOnClickListener(this); - - } + findViewById(R.id.rl2).setOnClickListener(this); + findViewById(R.id.button).setOnClickListener(this); + findViewById(R.id.button1).setOnClickListener(this); + findViewById(R.id.button4).setOnClickListener(this); mDataBinding.button.setChecked(true); - nowradioId = mDataBinding.button.getId(); mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly)); changeFragment(mDataBinding.button.getId()); @@ -204,6 +206,10 @@ public class MainTabActivity extends BaseActivity switch (i) { case R.id.button: + mDataBinding.button.setChecked(true); + mDataBinding.button1.setChecked(false); + mDataBinding.button2.setChecked(false); + mDataBinding.button4.setChecked(false); // mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly)); if (fragment0 == null) { fragment0 = MainFragment.newInstance("", ""); @@ -216,6 +222,10 @@ public class MainTabActivity extends BaseActivity //setSytemBar(R.color.transparent); break; case R.id.button1: + mDataBinding.button.setChecked(false); + mDataBinding.button1.setChecked(true); + mDataBinding.button2.setChecked(false); + mDataBinding.button4.setChecked(false); // mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly)); if (fragment1 == null) { @@ -229,8 +239,11 @@ public class MainTabActivity extends BaseActivity currentFragment = fragment1; break; - case R.id.button2: - + case R.id.rl2: + mDataBinding.button.setChecked(false); + mDataBinding.button1.setChecked(false); + mDataBinding.button2.setChecked(true); + mDataBinding.button4.setChecked(false); if (messageFragment == null) { messageFragment = MessageFragment.newInstance(); fragmentTransaction.add(R.id.mycontent, messageFragment, "fragment2"); @@ -252,7 +265,10 @@ public class MainTabActivity extends BaseActivity currentFragment = fragment3; break; case R.id.button4: - + mDataBinding.button.setChecked(false); + mDataBinding.button1.setChecked(false); + mDataBinding.button2.setChecked(false); + mDataBinding.button4.setChecked(true); // mDataBinding.getRoot().setBackground(getResources().getDrawable(R.mipmap.beijing)); if (fragment4 == null) { fragment4 = Main4Fragment.newInstance("", ""); @@ -283,24 +299,19 @@ public class MainTabActivity extends BaseActivity @Override public void onClick(View view) { - if (view.getId() == nowradioId) return; - RadioButton myRadioButton = (RadioButton) findViewById(nowradioId); + if (view.getId() == R.id.button4) { if ((Config.getInstance(MainTabActivity.this).getUser() == null)) { Intent intent = new Intent(MainTabActivity.this, LoginActivity.class); startActivity(intent); - myRadioButton = (RadioButton) view; - myRadioButton.setChecked(false); - myRadioButton = (RadioButton) findViewById(nowradioId); - myRadioButton.setChecked(true); + mDataBinding.button.setChecked(false); + mDataBinding.button1.setChecked(false); + mDataBinding.button2.setChecked(false); + mDataBinding.button4.setChecked(false); return; } } - myRadioButton.setChecked(false); - myRadioButton = (RadioButton) view; - myRadioButton.setChecked(true); - nowradioId = view.getId(); changeFragment(view.getId()); } diff --git a/app/src/main/java/com/sl/house_property/message/MessageEntity.java b/app/src/main/java/com/sl/house_property/message/MessageEntity.java index 7763c80..6723013 100644 --- a/app/src/main/java/com/sl/house_property/message/MessageEntity.java +++ b/app/src/main/java/com/sl/house_property/message/MessageEntity.java @@ -41,6 +41,15 @@ public class MessageEntity { private String url; private String ctime; private String is_dot; + private String contents; + + public String getContents() { + return contents; + } + + public void setContents(String contents) { + this.contents = contents; + } public String getCtime() { return ctime; diff --git a/app/src/main/java/com/sl/house_property/message/MessageFragment.java b/app/src/main/java/com/sl/house_property/message/MessageFragment.java index 6171d4b..2503fe9 100644 --- a/app/src/main/java/com/sl/house_property/message/MessageFragment.java +++ b/app/src/main/java/com/sl/house_property/message/MessageFragment.java @@ -17,6 +17,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.google.gson.reflect.TypeToken; +import com.sl.house_property.MainTabActivity; import com.sl.house_property.R; import com.sl.house_property.WebActivitytwo; @@ -109,8 +110,11 @@ public class MessageFragment extends Fragment { int i = Integer.parseInt(messageEntity.getMsg_count()); if (i > 0) { tvTitle.setText("消息(" + i + ")"); - + MainTabActivity activity = (MainTabActivity) getActivity(); + activity.setMessageCount(true); } else { + MainTabActivity activity = (MainTabActivity) getActivity(); + activity.setMessageCount(false); tvTitle.setText("消息"); } diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml index 0b79a9d..48c3b38 100644 --- a/app/src/main/res/layout/activity_main_tab.xml +++ b/app/src/main/res/layout/activity_main_tab.xml @@ -42,7 +42,7 @@ android:background="@drawable/background_grey_line" android:visibility="gone" /> - - + + + + + - + From 645b56e7e53200238af8638ca7af56ccd2154ea3 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Tue, 20 Apr 2021 14:47:30 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sl/house_property/WebActivitytwo.java | 15 +++++++--- .../message/MessageFragment.java | 2 ++ app/src/main/res/layout/activity_webtwo.xml | 29 ++++++++++++++++++- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/WebActivitytwo.java b/app/src/main/java/com/sl/house_property/WebActivitytwo.java index 3f6ffe0..b514291 100644 --- a/app/src/main/java/com/sl/house_property/WebActivitytwo.java +++ b/app/src/main/java/com/sl/house_property/WebActivitytwo.java @@ -14,12 +14,14 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gyf.immersionbar.ImmersionBar; + public class WebActivitytwo extends AppCompatActivity implements View.OnClickListener { public final static String URL = "url"; public final static String TITLE = "title"; private WebView webView; private ProgressBar pb; - private RelativeLayout mLayTopLeftTv; + private ImageView mLayTopLeftTv; private TextView mLayTopTitle; private TextView mRight; private ImageView mIvCode; @@ -40,6 +42,11 @@ public class WebActivitytwo extends AppCompatActivity implements View.OnClickLis setContentView(R.layout.activity_webtwo); String url = getIntent().getStringExtra(URL); String title = getIntent().getStringExtra(TITLE); + ImmersionBar.with(this) + .keyboardEnable(false) //解决软键盘与底部输入框冲突问题 + // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE + // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出 + .barColor(R.color.colorPrimary).init(); initView(); pb.setMax(100); @@ -80,11 +87,11 @@ public class WebActivitytwo extends AppCompatActivity implements View.OnClickLis webView = (WebView) findViewById(R.id.webView); webView.setOnClickListener(this); pb = (ProgressBar) findViewById(R.id.pb); - mLayTopLeftTv = (RelativeLayout) findViewById(R.id.layTop_left_tv); + mLayTopLeftTv = (ImageView) findViewById(R.id.layTop_left_tv); mLayTopLeftTv.setOnClickListener(this); mLayTopTitle = (TextView) findViewById(R.id.layTop_title); - mRight = (TextView) findViewById(R.id.right); - mIvCode = (ImageView) findViewById(R.id.iv_code); + // mRight = (TextView) findViewById(R.id.right); + // mIvCode = (ImageView) findViewById(R.id.iv_code); mPb = (ProgressBar) findViewById(R.id.pb); mWebView = (WebView) findViewById(R.id.webView); mLayTopTitle.setText("智慧豆豆"); diff --git a/app/src/main/java/com/sl/house_property/message/MessageFragment.java b/app/src/main/java/com/sl/house_property/message/MessageFragment.java index 2503fe9..4b62b54 100644 --- a/app/src/main/java/com/sl/house_property/message/MessageFragment.java +++ b/app/src/main/java/com/sl/house_property/message/MessageFragment.java @@ -17,6 +17,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.google.gson.reflect.TypeToken; +import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.MainTabActivity; import com.sl.house_property.R; import com.sl.house_property.WebActivitytwo; @@ -59,6 +60,7 @@ public class MessageFragment extends Fragment { @Override public void onViewCreated(@NonNull @NotNull View view, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + RecyclerView rv = view.findViewById(R.id.rv); tvTitle = view.findViewById(R.id.tv_title); adapter = new MessageAdapter(); diff --git a/app/src/main/res/layout/activity_webtwo.xml b/app/src/main/res/layout/activity_webtwo.xml index 0ccd2cd..21f242b 100644 --- a/app/src/main/res/layout/activity_webtwo.xml +++ b/app/src/main/res/layout/activity_webtwo.xml @@ -6,7 +6,34 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - + + + + Date: Tue, 20 Apr 2021 15:43:02 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sl/house_property/MainTabActivity.java | 11 +++++++---- .../sl/house_property/message/MessageFragment.java | 4 ++-- app/src/main/res/drawable/circle_red.xml | 4 +--- app/src/main/res/layout/activity_main_tab.xml | 10 ++++++---- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java index 1d0db83..67b15bf 100644 --- a/app/src/main/java/com/sl/house_property/MainTabActivity.java +++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java @@ -11,6 +11,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.RadioButton; import android.widget.RadioGroup; +import android.widget.TextView; import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.cart.CartFragment; @@ -68,11 +69,13 @@ public class MainTabActivity extends BaseActivity public void visibilyBottom(int isVisibily) { findViewById(R.id.rl_bottom).setVisibility(isVisibily); } - public void setMessageCount(boolean isRed){ - if (isRed){ - findViewById(R.id.redview).setVisibility(View.VISIBLE); + public void setMessageCount(int num){ + TextView viewById = findViewById(R.id.redview); + if (num>0){ + viewById.setText(num); + viewById .setVisibility(View.VISIBLE); }else { - findViewById(R.id.redview).setVisibility(View.GONE); + viewById.setVisibility(View.GONE); } } //2. 保存MyOnTouchListener接口的列表 diff --git a/app/src/main/java/com/sl/house_property/message/MessageFragment.java b/app/src/main/java/com/sl/house_property/message/MessageFragment.java index 4b62b54..9cbfa69 100644 --- a/app/src/main/java/com/sl/house_property/message/MessageFragment.java +++ b/app/src/main/java/com/sl/house_property/message/MessageFragment.java @@ -113,10 +113,10 @@ public class MessageFragment extends Fragment { if (i > 0) { tvTitle.setText("消息(" + i + ")"); MainTabActivity activity = (MainTabActivity) getActivity(); - activity.setMessageCount(true); + activity.setMessageCount(i); } else { MainTabActivity activity = (MainTabActivity) getActivity(); - activity.setMessageCount(false); + activity.setMessageCount(i); tvTitle.setText("消息"); } diff --git a/app/src/main/res/drawable/circle_red.xml b/app/src/main/res/drawable/circle_red.xml index d038667..3f34201 100644 --- a/app/src/main/res/drawable/circle_red.xml +++ b/app/src/main/res/drawable/circle_red.xml @@ -5,7 +5,5 @@ - + diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml index 48c3b38..35e4c84 100644 --- a/app/src/main/res/layout/activity_main_tab.xml +++ b/app/src/main/res/layout/activity_main_tab.xml @@ -92,11 +92,13 @@ android:text="消息" android:textColor="@color/radiobuttoncolor" /> - From 41c9c0a9eac23c6ac45173cd26164a1d3c597ca7 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Tue, 20 Apr 2021 15:44:02 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_main_tab.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml index 35e4c84..d843c6c 100644 --- a/app/src/main/res/layout/activity_main_tab.xml +++ b/app/src/main/res/layout/activity_main_tab.xml @@ -95,6 +95,7 @@ Date: Tue, 20 Apr 2021 21:53:35 +0800 Subject: [PATCH 09/10] d --- .idea/runConfigurations.xml | 1 - app/src/main/java/com/sl/house_property/MainActivity.java | 4 ++-- app/src/main/res/layout/activity_login.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml index e497da9..7f68460 100644 --- a/.idea/runConfigurations.xml +++ b/.idea/runConfigurations.xml @@ -3,7 +3,6 @@