diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 6df1145..7c8e22e 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -56,7 +56,7 @@ public class PathConfig { public static final String SECRET = "CMXX_TOKEN_INFOS";//秘钥 public static final String SOCKET_MSG_SECRET = "SocKEtsEcReT_KeY";//消息秘钥 public static final String PROJECT_NAME = "city-governance";/* ===项目名称==*/ - public static final String PROJECT_NAME_CH = "市域治理"; + public static final String PROJECT_NAME_CH = "综合办公系统"; public static final String USER_TYPE_LEADER = "b01dac8e-c516-4974-b513-f1352ca40202"; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java index d05b32c..fcd4a35 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/utils/NotificationHelper.java @@ -1,5 +1,7 @@ package com.tenlionsoft.baselib.core.network.update.utils; +import static android.app.Notification.VISIBILITY_SECRET; + import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; @@ -8,12 +10,10 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; -import com.tenlionsoft.baselib.R; -import com.tenlionsoft.baselib.core.network.update.service.DownloadService; - import androidx.core.app.NotificationCompat; -import static android.app.Notification.VISIBILITY_SECRET; +import com.tenlionsoft.baselib.R; +import com.tenlionsoft.baselib.core.network.update.service.DownloadService; public class NotificationHelper { @@ -28,7 +28,8 @@ public class NotificationHelper { public NotificationHelper(Context context) { this.mContext = context; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT); + NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, + NotificationManager.IMPORTANCE_DEFAULT); channel.canBypassDnd(); channel.enableLights(true); channel.setLockscreenVisibility(VISIBILITY_SECRET); @@ -51,9 +52,10 @@ public class NotificationHelper { Intent myIntent = new Intent(mContext, DownloadService.class); myIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); myIntent.putExtra(Constants.APK_DOWNLOAD_URL, apkUrl); - PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, myIntent, PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, myIntent, + PendingIntent.FLAG_UPDATE_CURRENT); NotificationCompat.Builder builder = getNofity(content) - .setContentIntent(pendingIntent); + .setContentIntent(pendingIntent); getManager().notify(notification_id, builder.build()); } @@ -62,24 +64,25 @@ public class NotificationHelper { */ public void updateProgress(int progress) { String text = mContext.getString(R.string.android_auto_update_download_progress, progress); - PendingIntent pendingintent = PendingIntent.getActivity(mContext, 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent pendingintent = PendingIntent.getActivity(mContext, 0, new Intent(), + PendingIntent.FLAG_UPDATE_CURRENT); NotificationCompat.Builder builder = getNofity(text) - .setProgress(100, progress, false) - .setContentIntent(pendingintent); + .setProgress(100, progress, false) + .setContentIntent(pendingintent); getManager().notify(notification_id, builder.build()); } private NotificationCompat.Builder getNofity(String text) { return new NotificationCompat.Builder(mContext.getApplicationContext(), CHANNEL_ID) - .setTicker(mContext.getString(R.string.android_auto_update_notify_ticker)) - .setContentTitle("市域治理") - .setContentText(text) - .setSmallIcon(R.drawable.app_logo_small) - .setAutoCancel(true) - .setOnlyAlertOnce(true) - .setWhen(System.currentTimeMillis()) - .setPriority(NotificationCompat.PRIORITY_HIGH); + .setTicker(mContext.getString(R.string.android_auto_update_notify_ticker)) + .setContentTitle(mContext.getResources().getString(R.string.default_channel)) + .setContentText(text) + .setSmallIcon(R.drawable.app_logo_small) + .setAutoCancel(true) + .setOnlyAlertOnce(true) + .setWhen(System.currentTimeMillis()) + .setPriority(NotificationCompat.PRIORITY_HIGH); } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java index 96dac19..4cabf17 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java @@ -20,16 +20,16 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.hjq.toast.ToastUtils; -import com.jcodecraeer.xrecyclerview.progressindicator.AVLoadingIndicatorView; -import com.scwang.smart.refresh.layout.SmartRefreshLayout; -import com.tenlionsoft.baselib.R; - import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; +import com.hjq.toast.ToastUtils; +import com.jcodecraeer.xrecyclerview.progressindicator.AVLoadingIndicatorView; +import com.scwang.smart.refresh.layout.SmartRefreshLayout; +import com.tenlionsoft.baselib.R; + public abstract class BaseFragment extends Fragment { public static final int STATE_LOAD = 1234;//加载中 public static final int STATE_ERROR = 1235;//加载失败 @@ -86,6 +86,7 @@ public abstract class BaseFragment extends Fragment { setTitleView(false); setStateView(STATE_LOAD); setDataToView(mDataView); + setTouchDelegate(mIvFragmentBack, 30); return contentView; } diff --git a/baselib/src/main/res/values/strings.xml b/baselib/src/main/res/values/strings.xml index c47bb54..0b5fe66 100755 --- a/baselib/src/main/res/values/strings.xml +++ b/baselib/src/main/res/values/strings.xml @@ -30,7 +30,7 @@ 正在下载:%1$d%% 正在检查版本 - 市域治理 + 综合办公系统 未录入 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789 diff --git a/build.gradle b/build.gradle index dc17ee6..30897b7 100644 --- a/build.gradle +++ b/build.gradle @@ -59,8 +59,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 19 gTargetSdkVersion = 30 - gVersionCode = 5 - gVersionName = '1.0.5' + gVersionCode = 6 + gVersionName = '1.0.6' gBuildToolsVersion = "29.0.2" // gVersionCode=26 // gVersionName='1.3.0' diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingTimeAdapter.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingTimeAdapter.java index fe6dd42..5c16718 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingTimeAdapter.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/MeetingTimeAdapter.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; +import com.tenlionsoft.baselib.utils.LogUtils; import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.beans.MineJoinMeetingListBean; @@ -20,13 +21,24 @@ import java.util.List; * 描述: */ public class MeetingTimeAdapter extends BaseRecyclerAdapter { - public MeetingTimeAdapter(Context ctx, List list) { + private int mScreen = 2;//2 竖屏 1 横屏 + + public MeetingTimeAdapter(Context ctx, List list, int type) { super(ctx, list); + this.mScreen = type; } @Override public MeetingTimeHolder createHolder(ViewGroup parent, int viewType) { - View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_meeting_time, parent, false); + View itemView; + if (mScreen == 1) { + //横屏 + itemView = LayoutInflater.from(mContext).inflate(R.layout.item_meeting_time, parent, false); + } else { + //竖屏 + itemView = LayoutInflater.from(mContext).inflate(R.layout.item_meeting_time_p, parent, false); + } + LogUtils.e("屏幕切换"); return new MeetingTimeHolder(itemView); } diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/ScheduleAdapter.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/ScheduleAdapter.java index f8c6d1d..6f7c199 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/ScheduleAdapter.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/ScheduleAdapter.java @@ -38,9 +38,15 @@ public class ScheduleAdapter extends BaseRecyclerAdapter(); - mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas); - mRlvMeeting.setLayoutManager(new LinearLayoutManager(mActivity)); - mRlvMeeting.setAdapter(mMeetingTimeAdapter); - mMeetingTimeAdapter.addOnItemClickListener(rowsBean -> { - BaseFragment fragment = - FragmentUtils.getFragmentOne(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL, "id", - rowsBean.getMeetingId()); - mPadMainActivity.addFragment(1, fragment); - }); - mTvMeetingMore.setOnClickListener(v -> { - BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING); - mPadMainActivity.addFragment(1, fragment); - }); + //我的督办 mSuperviseBeans = new ArrayList<>(); mSuperviseHomeAdapter = new SuperviseHomeAdapter(mActivity, mSuperviseBeans); @@ -249,13 +235,29 @@ public class PadOaMainFragment extends BaseFragment { @Override public void onConfigurationChanged(@androidx.annotation.NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); + LogUtils.e("横竖屏切换===" + newConfig.orientation); if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { //竖屏 mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140); + mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 2); } else { //横屏 mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20); + mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 1); } + mMeetingTimeAdapter.setData(mMeetingDatas); + mRlvMeeting.setLayoutManager(new LinearLayoutManager(mActivity)); + mRlvMeeting.setAdapter(mMeetingTimeAdapter); + mMeetingTimeAdapter.addOnItemClickListener(rowsBean -> { + BaseFragment fragment = + FragmentUtils.getFragmentOne(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL, "id", + rowsBean.getMeetingId()); + mPadMainActivity.addFragment(1, fragment); + }); + mTvMeetingMore.setOnClickListener(v -> { + BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING); + mPadMainActivity.addFragment(1, fragment); + }); mFunctionAdapter.setData(mFuncBeans); } @@ -263,6 +265,8 @@ public class PadOaMainFragment extends BaseFragment { * 刷新页面 */ private void doRefresh() { + //会议 + mMeetingDatas = new ArrayList<>(); //常用功能 mFuncBeans = new ArrayList<>(); FlexboxLayoutManager flexboxLayoutManager = new FlexboxLayoutManager(mActivity, FlexDirection.ROW, @@ -270,19 +274,32 @@ public class PadOaMainFragment extends BaseFragment { //判断横竖屏 Configuration configuration = mActivity.getResources().getConfiguration(); int orientation = configuration.orientation; - LogUtils.e(orientation); if (orientation == Configuration.ORIENTATION_PORTRAIT) { //竖屏 mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140); + mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 2); } else { //横屏 mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20); + mMeetingTimeAdapter = new MeetingTimeAdapter(mActivity, mMeetingDatas, 1); } - + //功能按钮 mRlvFuncs.setLayoutManager(flexboxLayoutManager); mRlvFuncs.setAdapter(mFunctionAdapter); mFunctionAdapter.addOnItemClickListener(this::choosePage); - + //获取会议 + mRlvMeeting.setLayoutManager(new LinearLayoutManager(mActivity)); + mRlvMeeting.setAdapter(mMeetingTimeAdapter); + mMeetingTimeAdapter.addOnItemClickListener(rowsBean -> { + BaseFragment fragment = + FragmentUtils.getFragmentOne(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL, "id", + rowsBean.getMeetingId()); + mPadMainActivity.addFragment(1, fragment); + }); + mTvMeetingMore.setOnClickListener(v -> { + BaseFragment fragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING); + mPadMainActivity.addFragment(1, fragment); + }); mCsvSchedule.setState(CustomStateView.STATE_LOAD); mCsvFuncs.setState(CustomStateView.STATE_LOAD); @@ -529,6 +546,7 @@ public class PadOaMainFragment extends BaseFragment { @Override public void onNext(@NonNull MineJoinMeetingListBean listBean) { + LogUtils.e(listBean.getRows()); if (listBean.getRows() != null && listBean.getRows().size() > 0) { mCsvMeeting.setState(CustomStateView.STATE_SUCCESS); mMeetingDatas = listBean.getRows(); diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingAddFragment.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingAddFragment.java index 944e031..b128b8b 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingAddFragment.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingAddFragment.java @@ -13,6 +13,12 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder; @@ -56,11 +62,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; @@ -77,7 +78,7 @@ import okhttp3.RequestBody; * 作者: adam * 日期: 2022/5/9 - 14:31 * 邮箱: itgaojian@163.com - * 描述: + * 描述: 平板会议申请 */ @Route(path = PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_ADD) public class MeetingAddFragment extends BaseFragment { @@ -215,27 +216,27 @@ public class MeetingAddFragment extends BaseFragment { ToastUtils.show("超过最大上传数量限制"); } else { new LFilePicker() - .withFragment(MeetingAddFragment.this) - .withFragmentLauncher(mFileLauncher) - .withRequestCode(LionActions.REQUEST_CODE_AC) - .withTitle("文件选择") - .withMaxNum(mFileMax) - .withFileFilter(fileFilter) - .start(); + .withFragment(MeetingAddFragment.this) + .withFragmentLauncher(mFileLauncher) + .withRequestCode(LionActions.REQUEST_CODE_AC) + .withTitle("文件选择") + .withMaxNum(mFileMax) + .withFileFilter(fileFilter) + .start(); } } private void showConfirmDialog(MeetingAttachListBean bean, int i) { new AlertDialog.Builder(mActivity) - .setTitle("提示") - .setMessage("确定要删除该参会人员吗?") - .setPositiveButton("确定", (dialog, which) -> { - mJoinPerson.remove(i); - mPersonShowAdapter.notifyDataSetChanged(); - }) - .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) - .create() - .show(); + .setTitle("提示") + .setMessage("确定要删除该参会人员吗?") + .setPositiveButton("确定", (dialog, which) -> { + mJoinPerson.remove(i); + mPersonShowAdapter.notifyDataSetChanged(); + }) + .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()) + .create() + .show(); } @Override @@ -315,26 +316,26 @@ public class MeetingAddFragment extends BaseFragment { case 2: //判断时间大小 String start = mTvStartTime.getText().toString().trim(); - if(!TextUtils.isEmpty(start)){ - int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start)); - if (span >= 0) { - mTvEndTime.setText(TimeUtils.date2String(date)); - } else { - ToastUtils.show("结束时间须大于开始时间"); - } - }else{ - ToastUtils.show("请选择开始时间"); - } + if (!TextUtils.isEmpty(start)) { + int span = TimeUtils.compareDate(date, TimeUtils.string2Date(start)); + if (span >= 0) { + mTvEndTime.setText(TimeUtils.date2String(date)); + } else { + ToastUtils.show("结束时间须大于开始时间"); + } + } else { + ToastUtils.show("请选择开始时间"); + } break; } }) - .setTitleText("请选时间") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .isDialog(false) - .setType(new boolean[]{true, true, true, true, true, true}) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选时间") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .isDialog(false) + .setType(new boolean[]{true, true, true, true, true, true}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mTimePickerView.show(); } @@ -363,52 +364,52 @@ public class MeetingAddFragment extends BaseFragment { Observable[] observables1 = requests.toArray(new Observable[requests.size()]); Observable.mergeArrayDelayError(observables1) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } - - @Override - public void onNext(@NotNull Object o) { - ++mUploadCount; - mTvFileHint.setVisibility(View.GONE); - if (o instanceof BaseSuccessBean) { - --mFileMax; - //刷新文件 - BaseSuccessBean bean = (BaseSuccessBean) o; - AddFileBean fileBean = new AddFileBean(); - fileBean.setId(bean.getData()); - fileBean.setPath(BaseUrlApi.BASE_IMG_URL + bean.getData()); - fileBean.setFileType(1); - fileBean.setFileName(fileNames.get(mUploadCount - 1)); - mFileBeans.add(0, fileBean); } - mAddFileAdapter.notifyDataSetChanged(); - if (mUploadCount == paths.size()) { + + @Override + public void onNext(@NotNull Object o) { + ++mUploadCount; + mTvFileHint.setVisibility(View.GONE); + if (o instanceof BaseSuccessBean) { + --mFileMax; + //刷新文件 + BaseSuccessBean bean = (BaseSuccessBean) o; + AddFileBean fileBean = new AddFileBean(); + fileBean.setId(bean.getData()); + fileBean.setPath(BaseUrlApi.BASE_IMG_URL + bean.getData()); + fileBean.setFileType(1); + fileBean.setFileName(fileNames.get(mUploadCount - 1)); + mFileBeans.add(0, fileBean); + } + mAddFileAdapter.notifyDataSetChanged(); + if (mUploadCount == paths.size()) { + mUploadCount = 0; + if (progressDialog.isShowing()) { + progressDialog.dismiss(); + } + } + } + + @Override + public void onError(@NonNull Throwable e) { + e.printStackTrace(); mUploadCount = 0; if (progressDialog.isShowing()) { progressDialog.dismiss(); } + ToastUtils.show("上传失败,请稍后重试."); } - } - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - mUploadCount = 0; - if (progressDialog.isShowing()) { - progressDialog.dismiss(); + @Override + public void onComplete() { + } - ToastUtils.show("上传失败,请稍后重试."); - } - - @Override - public void onComplete() { - - } - }); + }); } private Observable createObservable(File file) { @@ -417,9 +418,9 @@ public class MeetingAddFragment extends BaseFragment { MultipartBody.Part body; body = MultipartBody.Part.createFormData("file", file.getName(), requestFile); return RetrofitManager.getInstance() - .create(BaseApiService.class) - .uploadFile(body) - .compose(RxTransformer.getTransformer()); + .create(BaseApiService.class) + .uploadFile(body) + .compose(RxTransformer.getTransformer()); } /** @@ -433,11 +434,11 @@ public class MeetingAddFragment extends BaseFragment { mSelType = mTyps.get(o1); mTvType.setText(mSelType.getDataName()); }) - .setTitleText("请选择") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mTypePicker.setPicker(mTyps); } mTypePicker.show(); @@ -453,74 +454,35 @@ public class MeetingAddFragment extends BaseFragment { ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); dialog.show(); RetrofitManager.getInstance() - .create(BaseApiService.class) - .getDictListAllByPid(pId) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - - } - - @Override - public void onNext(@NonNull List beans) { - dialog.dismiss(); - if (beans.size() > 0) { - switch (i) { - case 1://会议室类型 - mTyps = beans; - onShowType(); - break; - - } - } else { - ToastUtils.show("暂无数据"); - } - } - - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } - - @Override - public void onComplete() { - - } - }); - } - - private void doConfirm() { - if (checkParams()) { - ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中..."); - dialog.show(); - RequestBody body = buildParams(); - RetrofitManager.getInstance() - .create(OAApi.class) - .doSaveMeeting(body) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { + .create(BaseApiService.class) + .getDictListAllByPid(pId) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { } @Override - public void onNext(@NonNull BaseSuccessBean baseSuccessBean) { - if (dialog.isShowing()) dialog.dismiss(); - ToastUtils.show("保存成功"); - BaseFragment preFragment = mMainActivity.getPreFragment(); - if (preFragment != null) { - preFragment.mIsRefresh = true; + public void onNext(@NonNull List beans) { + dialog.dismiss(); + if (beans.size() > 0) { + switch (i) { + case 1://会议室类型 + mTyps = beans; + onShowType(); + break; + + } + } else { + ToastUtils.show("暂无数据"); } - mMainActivity.backFragment(1, MeetingAddFragment.this); } @Override public void onError(@NonNull Throwable e) { - if (dialog.isShowing()) dialog.dismiss(); + dialog.dismiss(); ExceptionHandler.handleException(e); } @@ -529,6 +491,45 @@ public class MeetingAddFragment extends BaseFragment { } }); + } + + private void doConfirm() { + if (checkParams()) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中..."); + dialog.show(); + RequestBody body = buildParams(); + RetrofitManager.getInstance() + .create(OAApi.class) + .doSaveMeeting(body) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull BaseSuccessBean baseSuccessBean) { + if (dialog.isShowing()) dialog.dismiss(); + ToastUtils.show("保存成功"); + BaseFragment preFragment = mMainActivity.getPreFragment(); + if (preFragment != null) { + preFragment.mIsRefresh = true; + } + mMainActivity.backFragment(1, MeetingAddFragment.this); + } + + @Override + public void onError(@NonNull Throwable e) { + if (dialog.isShowing()) dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); } } diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingDetailFragment.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingDetailFragment.java index 067d850..b6b8d5e 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingDetailFragment.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/meeting/MeetingDetailFragment.java @@ -65,7 +65,7 @@ import static com.tenlionsoft.baselib.core.widget.PhotoActivity.TAG_IMGURL; * 作者: adam * 日期: 2022/5/9 - 15:20 * 邮箱: itgaojian@163.com - * 描述: 会议详情 + * 描述: 平板------会议详情 */ @Route(path = PathConfig.PATH_MODULE_PAD_OA_FRAGMENT_MEETING_DETAIL) public class MeetingDetailFragment extends BaseFragment { diff --git a/oamodule/src/main/res/layout/fragment_meeting.xml b/oamodule/src/main/res/layout/fragment_meeting.xml index 229c56b..3dbb0e2 100644 --- a/oamodule/src/main/res/layout/fragment_meeting.xml +++ b/oamodule/src/main/res/layout/fragment_meeting.xml @@ -76,7 +76,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/switch_custom_gray_white_left" + android:background="@drawable/switch_custom_gray_white_center" android:button="@null" android:gravity="center" android:paddingLeft="10dp" @@ -92,7 +92,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/switch_custom_gray_white_left" + android:background="@drawable/switch_custom_gray_white_right" android:button="@null" android:gravity="center" android:paddingLeft="10dp" diff --git a/oamodule/src/main/res/layout/fragment_meeting_add.xml b/oamodule/src/main/res/layout/fragment_meeting_add.xml index e77b000..8ddd918 100644 --- a/oamodule/src/main/res/layout/fragment_meeting_add.xml +++ b/oamodule/src/main/res/layout/fragment_meeting_add.xml @@ -4,18 +4,16 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/gray_f0" + android:background="@color/gray_f2" android:orientation="vertical" + android:padding="5dp" tools:context=".activity.car.ByCarAddActivity"> - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:text="短信" + android:textColor="@color/col_blue_gray" /> + android:text="邮件" + android:textColor="@color/col_blue_gray" /> - + - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -302,25 +378,39 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" + android:background="@color/white" android:orientation="vertical" android:paddingTop="5dp" android:paddingBottom="10dp"> - + android:orientation="horizontal"> + + + + + + @@ -375,4 +466,377 @@ android:text="提交申请" android:textColor="@color/col_white_gray_press" /> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oamodule/src/main/res/layout/fragment_meeting_detail.xml b/oamodule/src/main/res/layout/fragment_meeting_detail.xml index b04e951..3359365 100644 --- a/oamodule/src/main/res/layout/fragment_meeting_detail.xml +++ b/oamodule/src/main/res/layout/fragment_meeting_detail.xml @@ -4,15 +4,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/gray_f0" + android:background="@color/gray_f2" android:orientation="vertical" + android:padding="5dp" tools:context=".activity.car.ByCarAddActivity"> - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +