From 5326eab6c8ba932ab6dc007ff903964afcff9a8e Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Fri, 9 Dec 2022 10:58:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/output-metadata.json | 4 +- build.gradle | 4 +- .../journal/JournalReportActivity.java | 10 +- .../adapters/JournalListAdapter.java | 5 + .../commonmodule/holders/JournalHolder.java | 4 +- .../res/drawable-xhdpi/ic_journal_mend.png | Bin 0 -> 1478 bytes .../src/main/res/layout/item_journal_list.xml | 16 +- .../mainmodule/base/MainTabActivity.java | 299 +++++++++--------- 8 files changed, 182 insertions(+), 160 deletions(-) create mode 100644 commonmodule/src/main/res/drawable-xhdpi/ic_journal_mend.png diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index a4dbd8f..f538d50 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 9, - "versionName": "1.0.8", + "versionCode": 10, + "versionName": "1.0.9", "outputFile": "app-release.apk" } ] diff --git a/build.gradle b/build.gradle index 7a5a735..22277b5 100644 --- a/build.gradle +++ b/build.gradle @@ -55,8 +55,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 21 gTargetSdkVersion = 30 - gVersionCode = 9 - gVersionName = '1.0.8' + gVersionCode = 10 + gVersionName = '1.0.9' gBuildToolsVersion = "29.0.2" // gVersionCode=26 // gVersionName='1.3.0' diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java index 0344ffa..808cd86 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java @@ -100,7 +100,7 @@ public class JournalReportActivity extends BaseActivity { @Override public void initData() { ButterKnife.bind(this); - mTvBaseTitle.setText("日志填报`"); + mTvBaseTitle.setText("日志填报"); refreshView(STATE_LOAD_SUCCESS); mIvAppSearchIcon.setVisibility(View.GONE); initViews(); @@ -113,7 +113,7 @@ public class JournalReportActivity extends BaseActivity { mRlvPhotos.setAdapter(mAddPhotoAdapter); mAddPhotoAdapter.addOnDeleteListener(((bean, i) -> { mAddPhotoAdapter.removeItem(bean); - mPhotoIds = mPhotoIds.replace(bean.getId() + ",", ""); + mPhotoIds = mPhotoIds.replace(bean.getId() + ",", ""); })); mAddPhotoAdapter.addOnItemClickListener(bean -> { if (TextUtils.isEmpty(bean.getPath())) { @@ -137,17 +137,23 @@ public class JournalReportActivity extends BaseActivity { mLevel.add("月报"); mLevel.add("年报"); mTvType.setText("日报"); + mTvDate.setEnabled(false); String date = getIntent().getStringExtra("date"); mTvDate.setText(date); mRgWay.setOnCheckedChangeListener((group, checkedId) -> { if (checkedId == R.id.rb_way_1) { //当天填报 mSelType = "1"; + mTvDate.setEnabled(false); } else { //补填 mSelType = "2"; + mTvDate.setEnabled(true); } }); + String title = UserLgUtils.getName() + "-" + date + "-日报"; + + mEtTitle.setText(title); } /** diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/JournalListAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/JournalListAdapter.java index 6c313aa..dc345f6 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/JournalListAdapter.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/JournalListAdapter.java @@ -65,6 +65,11 @@ public class JournalListAdapter extends BaseRecyclerAdapterG`W>AhQx}dj$%j@8`0*2YD1Ki9i@`) zDoKs7>3nx_(1wm|j4=#j-0x;T5G0=A;f8RVH>WDhnmEtkcmPOR--v*lMHEFKn7%JykK)+%y)thL zMaJ)*D!R6^AQ=qzmo)y_g{pQLs&I|h&b@lNy1X=5m@8rh_j%fJjfmZwGzJ2xLZ)xG z6`A*g{@k1AT^rYoXP#Xi8tk^zUh3~1&q)&=qIFwn4j%F2ny4)_*GXHOCkwI%g50O> z-stytmDInN@j81PHqO3$#NTN#cJa)}*%N&p+om7f?6F5j)8c#GtYzI_#C5e_C&qg0 z4Ew0IqZy}p*17^OhgIo-41P_`#W{#dDQq z6L}Y;?JdF(FZs&Ke9h~jSSEkRrX`_ZB>DJwcB&Yw>D^^HUBX_OotDex0w1U4v61oI z^u;gj{Q+*$&#glzkBHw_E&lUqbxF27I53>Z;yW7m)19Y^3ns2-j;5X*jz20o7C7^) zL=+t&>+AVCHNkf>l>@LcH#2rAW#&;)IpUb5cy4?GgXRwu9seV6iZ1PkwtfKMfAgZc z1|$_tat|CBaG@wORp^>7K1Q|D5>-zX<-C8ZGgT4p4Natf*m-N^Pg3a3QoJ~gSW*7Fc`yOR!lsTT#kz) zb|Dlc1F%TA4Y~*hNEP8W!X|`*Bmy4<5ke710w19eHUKeh3pj;r0vxChgD^Y{#8hAa zMuH4X9nvu^NW*mDK1?5aV}{TZ1<)NOKq{&V-O#nr1=RqDP;C&3Qa}j00R*EsZ~#>X z`%xnBN7n&A% zLgpGKw`IsiM3Dj_d2bBFx8ue-t()u9_pqp~ZhdZ!w2`|;*=wb_`5jHIT{V}Y1S5cw3Qzw1M+cBo{VMi2X z2y#U`b$Ef>Uywe!?<|xdHzScCl}6giImn<_?e*Qz!uR0RtTJcg+I6JkAyS-^?mZS{ zXvivm5|T9WvCy?e{K)i|ZGTnj-P0PeQNQ1r - + tools:layout_height="80dp" + > - - \ No newline at end of file + + \ No newline at end of file diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java index 9f044d8..4dc9d08 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -17,6 +17,10 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.RequiresApi; +import androidx.core.content.ContextCompat; +import androidx.viewpager2.widget.ViewPager2; + import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.baidu.location.BDLocation; @@ -87,9 +91,6 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.List; -import androidx.annotation.RequiresApi; -import androidx.core.content.ContextCompat; -import androidx.viewpager2.widget.ViewPager2; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -130,10 +131,10 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro private UpcomingReceiver mReceiver; private long finishTime = 0; private String[] mActions = new String[]{ - BroadcastConstant.ACTION_LOGIN_SUCCESS, - BroadcastConstant.ACTION_LOGIN_FAILED, - BroadcastConstant.ACTION_AUTH_FAILED, - BroadcastConstant.ACTION_FIRST_CHANGE_PWD}; + BroadcastConstant.ACTION_LOGIN_SUCCESS, + BroadcastConstant.ACTION_LOGIN_FAILED, + BroadcastConstant.ACTION_AUTH_FAILED, + BroadcastConstant.ACTION_FIRST_CHANGE_PWD}; private String mConfId; private ProgressDialog mDialog; @@ -165,48 +166,48 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro */ private void getAppConfig() { RetrofitManager.getInstance() - .create(BaseApiService.class) - .getAppConfig(UserLgUtils.getToken()) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(BaseApiService.class) + .getAppConfig(UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull JsonObject obj) { - try { - String rhUrl = obj.get("rhUrl").getAsString(); - String rhPort = obj.get("rhPort").getAsString(); - String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); - if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { - UserLgUtils.setRhPort(Integer.parseInt(rhPort)); - UserLgUtils.setRhUrl(rhUrl); - UserLgUtils.setHttpsPort(rhHttpsPort); - if (AppUtils.isSupportCall()) { - //判断是否可以视频通话 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - initHWClound();//初始化华为融合通信 - getUserExpandInfo(); + @Override + public void onNext(@NonNull JsonObject obj) { + try { + String rhUrl = obj.get("rhUrl").getAsString(); + String rhPort = obj.get("rhPort").getAsString(); + String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); + if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { + UserLgUtils.setRhPort(Integer.parseInt(rhPort)); + UserLgUtils.setRhUrl(rhUrl); + UserLgUtils.setHttpsPort(rhHttpsPort); + if (AppUtils.isSupportCall()) { + //判断是否可以视频通话 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + initHWClound();//初始化华为融合通信 + getUserExpandInfo(); + } } } + } catch (Exception e) { + e.printStackTrace(); } - } catch (Exception e) { + } + + @Override + public void onError(@NonNull Throwable e) { e.printStackTrace(); } - } - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - } + @Override + public void onComplete() { - @Override - public void onComplete() { - - } - }); + } + }); } @@ -275,63 +276,63 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro */ private void getUserExpandInfo() { RetrofitManager.getInstance() - .create(BaseApiService.class) - .getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken()) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(BaseApiService.class) + .getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull UserExpandInfoBean userExpandInfoBean) { - UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode()); - if (!TextUtils.isEmpty(userExpandInfoBean.getAreaCode())) { - String cityCode = userExpandInfoBean.getAreaCode().substring(0, 4); - String areaCode = userExpandInfoBean.getAreaCode().substring(0, 6); - String streetCode = userExpandInfoBean.getAreaCode().substring(0, 9); - String villageCode = userExpandInfoBean.getAreaCode(); + @Override + public void onNext(@NonNull UserExpandInfoBean userExpandInfoBean) { UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode()); - UserLgUtils.setLocationAddress(userExpandInfoBean.getAreaName()); - GlobalProvider.save(mActivity, "cityCode", cityCode); - GlobalProvider.save(mActivity, "areaCode", areaCode); - GlobalProvider.save(mActivity, "streetCode", streetCode); - GlobalProvider.save(mActivity, "villageCode", villageCode); - GlobalProvider.save(mActivity, "fullAreaCode", userExpandInfoBean.getAreaCode()); - } - if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) { - LogUtils.e(userExpandInfoBean); - UserLgUtils.setHwAccount(userExpandInfoBean.getSmcNumber()); - UserLgUtils.setHwPwd(userExpandInfoBean.getSmcPassword()); - int status = getIntent().getIntExtra("status", -1); - if (status == -1) { - //TODO doLoginHWClound(); + if (!TextUtils.isEmpty(userExpandInfoBean.getAreaCode())) { + String cityCode = userExpandInfoBean.getAreaCode().substring(0, 4); + String areaCode = userExpandInfoBean.getAreaCode().substring(0, 6); + String streetCode = userExpandInfoBean.getAreaCode().substring(0, 9); + String villageCode = userExpandInfoBean.getAreaCode(); + UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode()); + UserLgUtils.setLocationAddress(userExpandInfoBean.getAreaName()); + GlobalProvider.save(mActivity, "cityCode", cityCode); + GlobalProvider.save(mActivity, "areaCode", areaCode); + GlobalProvider.save(mActivity, "streetCode", streetCode); + GlobalProvider.save(mActivity, "villageCode", villageCode); + GlobalProvider.save(mActivity, "fullAreaCode", userExpandInfoBean.getAreaCode()); } + if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) { + LogUtils.e(userExpandInfoBean); + UserLgUtils.setHwAccount(userExpandInfoBean.getSmcNumber()); + UserLgUtils.setHwPwd(userExpandInfoBean.getSmcPassword()); + int status = getIntent().getIntExtra("status", -1); + if (status == -1) { + doLoginHWClound(); + } + } + String ids = ""; + List departments = userExpandInfoBean.getDepartments(); + for (int i = 0; i < departments.size(); i++) { + ids += departments.get(i).getDepartmentId() + ","; + LogUtils.e(departments.get(i).getDepartmentName()); + } + if (ids.endsWith(",")) { + ids = ids.substring(0, ids.length() - 1); + } + LogUtils.e(ids); + UserLgUtils.setUserDeptId(ids); } - String ids = ""; - List departments = userExpandInfoBean.getDepartments(); - for (int i = 0; i < departments.size(); i++) { - ids += departments.get(i).getDepartmentId() + ","; - LogUtils.e(departments.get(i).getDepartmentName()); + + @Override + public void onError(@NonNull Throwable e) { + } - if (ids.endsWith(",")) { - ids = ids.substring(0, ids.length() - 1); + + @Override + public void onComplete() { + } - LogUtils.e(ids); - UserLgUtils.setUserDeptId(ids); - } - - @Override - public void onError(@NonNull Throwable e) { - - } - - @Override - public void onComplete() { - - } - }); + }); } /** @@ -339,34 +340,34 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro */ private void checkAppVersion() { RetrofitManager.getInstance() - .create(BaseApiService.class) - .doCheckAppVersion(BaseUrlApi.APP_VERSION_ID) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + .create(BaseApiService.class) + .doCheckAppVersion(BaseUrlApi.APP_VERSION_ID) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(VersionBean successBean) { - if (successBean != null && successBean.getData() > 0) { - if (CheckUpdateUtils.checkcode(MainTabActivity.this, successBean.getData() + "")) { - startDownloadApk(); + @Override + public void onNext(VersionBean successBean) { + if (successBean != null && successBean.getData() > 0) { + if (CheckUpdateUtils.checkcode(MainTabActivity.this, successBean.getData() + "")) { + startDownloadApk(); + } } } - } - @Override - public void onError(Throwable e) { + @Override + public void onError(Throwable e) { - } + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -500,10 +501,10 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro mRlTitleBar.setVisibility(View.VISIBLE); mTvBaseTitle.setText("乌兰察布市社会市域治理"); ImmersionBar.with(this) - .statusBarColor(R.color.main_theme) - .statusBarDarkFont(true) - .titleBar(mRlTitleBar) - .init(); + .statusBarColor(R.color.main_theme) + .statusBarDarkFont(true) + .titleBar(mRlTitleBar) + .init(); break; case 2://咨询 mIvHome.setBackgroundResource(R.drawable.ic_home_normal); @@ -513,9 +514,9 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro mVpContent.setCurrentItem(1, false); mTvBaseTitle.setText("智慧咨询"); ImmersionBar.with(mActivity) - .statusBarColor(R.color.status_bar_blue) - .statusBarDarkFont(false) - .init(); + .statusBarColor(R.color.status_bar_blue) + .statusBarDarkFont(false) + .init(); break; case 3://我的 mIvHome.setBackgroundResource(R.drawable.ic_home_normal); @@ -526,10 +527,10 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro mRlTitleBar.setVisibility(View.VISIBLE); mTvBaseTitle.setText("乌兰察布市社会市域治理"); ImmersionBar.with(this) - .statusBarColor(R.color.main_theme) - .titleBar(mRlTitleBar) - .statusBarDarkFont(true) - .init(); + .statusBarColor(R.color.main_theme) + .titleBar(mRlTitleBar) + .statusBarDarkFont(true) + .init(); break; } } @@ -724,7 +725,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro msgHint = getString(R.string.cloudLink_mine_loginFailZero); } else { msgHint = getString(R.string.cloudLink_mine_loginFailIndex1) + - index + getString(R.string.cloudLink_mine_loginFailIndex2); + index + getString(R.string.cloudLink_mine_loginFailIndex2); } break; case TSDKErrorConstant.LOGIN_ERROR_CODE_33554482: @@ -890,7 +891,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro private void checkScreenIsLock() { KeyguardManager km = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE); boolean b = km.inKeyguardRestrictedInputMode(); - LogUtils.e("是否锁屏"+b); + LogUtils.e("是否锁屏" + b); } @@ -911,45 +912,45 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro switch (targetPage) { case "TASK_ACCEPT": //中心端受理任务), ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST) - .withString("id", id) - .navigation(); + .build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST) + .withString("id", id) + .navigation(); break; case "TASK_ALLOCATE"://中心端分拨 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST) - .withString("id", id) - .navigation(); + .build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST) + .withString("id", id) + .navigation(); break; case "TASK_ALLOCATE_SURE"://部门端分拨确认 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY) - .withString("id", id) - .navigation(); + .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY) + .withString("id", id) + .navigation(); break; case "TASK_DISPATCH"://部门端派遣 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY) - .withString("id", id) - .navigation(); + .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY) + .withString("id", id) + .navigation(); break; case "TASK_DISPATCH_HANDLING"://派遣处理任务 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST) - .withString("id", id) - .navigation(); + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST) + .withString("id", id) + .navigation(); break; case "TASK_DISPATCH_HANDLING_EXAMINE"://派遣核查任务 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST) - .withString("id", id) - .navigation(); + .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST) + .withString("id", id) + .navigation(); break; case "TASK_EXAMINE"://上报人核查 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST) - .withString("id", id) - .navigation(); + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST) + .withString("id", id) + .navigation(); break; } } @@ -1088,11 +1089,11 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro UserDatabaseBean userByUserId = AppDatabase.getInstance(mActivity).getUserDao().getUserByUserId(userId); if (!TextUtils.isEmpty(userByUserId.getUserName())) { ARouter.getInstance() - .build(PathConfig.PATH_MODULE_CHAT_CHAT) - .withString("to", userByUserId.getUserId()) - .withString("toName", userByUserId.getUserName()) - .withString("data", page) - .navigation(); + .build(PathConfig.PATH_MODULE_CHAT_CHAT) + .withString("to", userByUserId.getUserId()) + .withString("toName", userByUserId.getUserName()) + .withString("data", page) + .navigation(); } else { ToastUtils.show("未找到联系人"); }