This commit is contained in:
hch
2024-03-22 17:47:12 +08:00
parent 2cc58b920f
commit 4d4d3d1bae
19 changed files with 173 additions and 77 deletions

View File

@@ -31,13 +31,13 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.bigkoo.pickerview.view.OptionsPickerView;
import com.bigkoo.pickerview.view.TimePickerView;
import com.google.gson.Gson;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.R;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.NewCommunityType;
import com.yunbao.common.custom.ItemDecoration;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.CommunityTypeManager;
import com.yunbao.common.upload.UploadBean;
import com.yunbao.common.upload.UploadCallback;
import com.yunbao.common.upload.UploadQnImpl;
@@ -50,6 +50,7 @@ import com.yunbao.common.utils.ToastUtil;
import java.io.File;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -90,7 +91,7 @@ public class CommunitySendActivity extends AbsActivity {
@Override
protected void main() {
newCommunityTypeList = new CommunityTypeManager(mContext).getCommunityTypeList();
newCommunityTypeList = CommonAppConfig.getCommunityTypeList(mContext);
content = findViewById(R.id.content);
submit = findViewById(R.id.submit);
submit.setVisibility(View.VISIBLE);
@@ -144,6 +145,9 @@ public class CommunitySendActivity extends AbsActivity {
@RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
@Override
public void onClick(View v) {
if (videoFile != null) {
return;
}
String permission1 = Manifest.permission.READ_EXTERNAL_STORAGE;
String permission2 = Manifest.permission.WRITE_EXTERNAL_STORAGE;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -163,6 +167,9 @@ public class CommunitySendActivity extends AbsActivity {
videoLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (imgUrlList.size() > 0) {
return;
}
String permission1 = Manifest.permission.READ_EXTERNAL_STORAGE;
String permission2 = Manifest.permission.WRITE_EXTERNAL_STORAGE;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -214,12 +221,11 @@ public class CommunitySendActivity extends AbsActivity {
private void submit() {
if (isImage) {
if (imgUrlList.size() == 0) {
ToastUtil.show("请选择图片或者视频");
return;
}
} else {
if (StringUtil.isEmpty(videoUrl)) {
ToastUtil.show("请选择图片或者视频");
return;
}
}
@@ -228,7 +234,7 @@ public class CommunitySendActivity extends AbsActivity {
imgUrl = new Gson().toJson(imgUrlList);
}
String tempTime = "";
if (!chooseTime.getText().toString().equals("立即发表")) {
if (!chooseTime.getText().toString().equals("立即發表") && !chooseTime.getText().toString().equals("Now")) {
tempTime = chooseTime.getText().toString();
}
JSONObject jsonObject = new JSONObject();
@@ -256,7 +262,7 @@ public class CommunitySendActivity extends AbsActivity {
talkContent.setText(talkList.get(options1));
talkContent.setVisibility(View.VISIBLE);
}
}).setTitleText("选择话题").setContentTextSize(16).build();
}).setTitleText(getResources().getString(R.string.choose_topic)).setContentTextSize(16).build();
pickerView.setPicker(talkList, null, null);
pickerView.show();
}
@@ -281,6 +287,11 @@ public class CommunitySendActivity extends AbsActivity {
}
public void showTimeChooseDialog() {
Calendar startCalendar = Calendar.getInstance();
startCalendar.set(1990, 1, 1);
Calendar endCalendar = Calendar.getInstance();
endCalendar.setTime(new Date());
TimePickerView timePickerView = new TimePickerBuilder(CommunitySendActivity.this, new OnTimeSelectListener() {
@SuppressLint("SetTextI18n")
@Override
@@ -288,13 +299,14 @@ public class CommunitySendActivity extends AbsActivity {
chooseTime.setText(DateFormatUtil.getTimeStrings(date.getTime()));
}
}).setType(new boolean[]{true, true, true, true, true, false})// 默认全部显示
.setCancelText("Cancel")//取消按钮文字
.setSubmitText("Sure")//确认按钮文字
.setCancelText(getResources().getString(R.string.cancel))//取消按钮文字
.setSubmitText(getResources().getString(R.string.back_community_sure))//确认按钮文字
.setTitleSize(20)//标题文字大小
.setTitleText("Title")//标题文字
.setOutSideCancelable(false)//点击屏幕,点在控件外部范围时,是否取消显示
.isCyclic(true)//是否循环滚动
.setLabel("", "", "", "", "", "")//默认设置为年月日时分秒
.setTitleText("")//标题文字
.setOutSideCancelable(true)//点击屏幕,点在控件外部范围时,是否取消显示
.isCyclic(false)//是否循环滚动
.setRangDate(startCalendar, endCalendar)
.setLabel("", "", "", "", "", "")//默认设置为年月日时分秒
.isCenterLabel(false) //是否只显示中间选中项的label文字false则每项item全部都带有label。
.build();
timePickerView.show();

View File

@@ -199,6 +199,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private View floatWarOrder;//战令浮窗
private List<AnchorStartLiveBean> startListNotifyList = new ArrayList<>();
@Override
protected int getLayoutId() {
return R.layout.activity_main;
@@ -211,11 +212,13 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
getWindow().setSharedElementEnterTransition(new FullAdToBannerTransition(1, 0.4f, new DecelerateInterpolator()));
}
@Override
protected void onPause() {
super.onPause();
OpenAdManager.getInstance().dismiss();
}
@Override
protected void main() {
ActivityCompat.postponeEnterTransition(this);
@@ -540,12 +543,13 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
MessageSayHiNotifyManager.getInstance().start();
showFirstLogin();
}
private void showFirstLogin(){
private void showFirstLogin() {
LiveNetManager.get(mContext)
.isFirstLogin(new com.yunbao.common.http.base.HttpCallback<FirstLoginBean>() {
@Override
public void onSuccess(FirstLoginBean data) {
if(data.getStatus()==0){
if (data.getStatus() == 0) {
mContext.startActivity(new Intent(mContext, CompleteUserInfoActivity.class));
}
}
@@ -661,7 +665,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
} else {
if (mainHomeComViewHolder != null && mainHomeComViewHolder.isFloatWarOrder()) {
floatWarOrder.setVisibility(View.GONE);
}else {
} else {
floatWarOrder.setVisibility(View.VISIBLE);
}
@@ -1137,7 +1141,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
}
private void loadPageData(int position, boolean needlLoadData) {
if (mViewHolders == null) {
ToastUtil.showDebug("Holders为空");
@@ -1152,7 +1155,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
return;
}
if (position == 0) {
mainHomeComViewHolder = new MainHomeComViewHolder(mContext, parent);
mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
vh = mainHomeComViewHolder;
} else if (position == 1) {
mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);

View File

@@ -219,7 +219,7 @@ public class UserHomeActivity extends AbsActivity {
followLayout.setVisibility(View.GONE);
}
if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getUser_goodnum())) {
userId.setText("靓号:" + userInfo.getUserHomeTopInfo().getUser_goodnum());//用户靓号
userId.setText("ID:" + userInfo.getUserHomeTopInfo().getUser_goodnum());//用户靓号
} else {
userId.setText("ID:" + userInfo.getUserHomeTopInfo().getUser_id());//用户ID
}

View File

@@ -1,6 +1,7 @@
package com.yunbao.main.views;
import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
@@ -10,9 +11,12 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.fragment.app.FragmentActivity;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.event.FloatWarOrderEvent;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
@@ -40,8 +44,9 @@ public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
return floatWarOrder;
}
public MainHomeComViewHolder(Context context, ViewGroup parentView) {
public MainHomeComViewHolder(Context context, Activity activity, ViewGroup parentView) {
super(context, parentView);
mProcessResultUtil = new ProcessImageUtil((FragmentActivity) activity);
}
@Override
@@ -79,9 +84,6 @@ public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
} else {
ToastUtil.show(mContext.getResources().getString(R.string.only_open_anchor));
}
Intent intent = new Intent(mContext, CommunitySendActivity.class);
mContext.startActivity(intent);
}
});
tvPlay = (TextView) findViewById(R.id.tvPlay);

View File

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.ActiveBean;
@@ -92,27 +93,10 @@ public class MainHomeNewViewHolder extends AbsMainHomeChildViewHolder implements
@Override
public void init() {
List<NewCommunityType> list = new CommunityTypeManager(mContext).getCommunityTypeList();
if (list != null && !list.isEmpty()&& !StringUtil.isEmpty(list.get(0).getTalk_name())) {
typeHot = list.get(0).getTalk_name();
select = list.get(0).getId();
} else {
CommonHttpUtil.getTag(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
List<NewCommunityType> list = JSON.parseArray(Arrays.toString(info), NewCommunityType.class);
NewCommunityType newCommunityType = new NewCommunityType();
newCommunityType.setId(0);
newCommunityType.setTalk_name(mContext.getString(R.string.recomment));
list.add(0, newCommunityType);
CommunityTypeManager communityTypeManager = new CommunityTypeManager(mContext);
communityTypeManager.UpCommunityType(new Gson().toJson(list));
typeHot = list.get(0).getTalk_name();
select = list.get(0).getId();
initCommunityTypeList(list);
}
});
}
List<NewCommunityType> list = CommonAppConfig.getCommunityTypeList(mContext);
typeHot = list.get(0).getTalk_name();
select = list.get(0).getId();
mBtnDismiss = findViewById(R.id.btn_dismiss);
mBtnDismiss.setOnClickListener(new View.OnClickListener() {
@Override