解决冲突

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"
     }
   ]

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();
@@ -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);
     }
 
     /**

commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/JournalListAdapter.java

@@ -65,6 +65,11 @@ public class JournalListAdapter extends BaseRecyclerAdapter<JournalListBean.Rows
                     .apply(options)
                     .into(holder.mIvPic);
         }
+        if ("2".equals(bean.getGridLogType())) {
+            holder.mIvTag.setVisibility(View.VISIBLE);
+        } else {
+            holder.mIvTag.setVisibility(View.GONE);
+        }
     }
 
     private OnEditOrDel mPatrolListener;

commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/JournalHolder.java

@@ -15,6 +15,7 @@ public class JournalHolder extends RecyclerView.ViewHolder {
     public TextView mTvTime;
     public TextView mTvTitle;
     public TextView mTvLevel;
+    public ImageView mIvTag;
 
     public JournalHolder(@NonNull View itemView) {
         super(itemView);
@@ -22,6 +23,7 @@ public class JournalHolder extends RecyclerView.ViewHolder {
         mTvContent = itemView.findViewById(R.id.tv_content);
         mTvTime = itemView.findViewById(R.id.tv_time);
         mTvTitle = itemView.findViewById(R.id.tv_title);
-        mTvLevel= itemView.findViewById(R.id.tv_level);
+        mTvLevel = itemView.findViewById(R.id.tv_level);
+        mIvTag = itemView.findViewById(R.id.iv_tag);
     }
 }

commonmodule/src/main/res/layout/item_journal_list.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
     android:background="@color/white"
     android:orientation="vertical"
-    android:padding="5dp">
+    tools:layout_height="80dp"
+  >
 
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="5dp"
         android:orientation="horizontal">
 
         <ImageView
@@ -89,5 +91,11 @@
 
     </LinearLayout>
 
-
-</LinearLayout>
+    <ImageView
+        android:id="@+id/iv_tag"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="5dp"
+        android:src="@drawable/ic_journal_mend" />
+</RelativeLayout>

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;
@@ -299,6 +300,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
                             GlobalProvider.save(mActivity, "streetCode", streetCode);
                             GlobalProvider.save(mActivity, "villageCode", villageCode);
                             GlobalProvider.save(mActivity, "fullAreaCode", userExpandInfoBean.getAreaCode());
+
                         }
                         if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) {
                             LogUtils.e(userExpandInfoBean);
@@ -890,7 +892,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);
     }