流动人口登记时间必填

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.6.10" />
+    <option name="version" value="1.6.0" />
   </component>
 </project>

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 17,
-      "versionName": "1.1.6",
+      "versionCode": 18,
+      "versionName": "1.1.7",
       "outputFile": "app-release.apk"
     }
   ]

baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java

@@ -1,6 +1,5 @@
 package com.tenlionsoft.baselib.constant;
 
-import android.net.ConnectivityManager;
 import android.os.Environment;
 
 import java.io.File;
@@ -13,8 +12,7 @@ import java.io.File;
 public class PathConfig {
 
     public static final String PROVIDER_URL = "content://com.tengshisoft.gridclient.content_provider";//内容提供者url
-    public static final String BASE_LAYER = "http://support.supermap.com.cn:8090/iserver/services/map-china400/rest" +
-            "/maps/China";//地图基础图层
+    public static final String BASE_LAYER = "https://58.18.108.24:8443/iserver/services/map-china400/rest/maps/China";//地图基础图层
     public static final int CRS = 4326;//坐标系
 
     /*===========================================*/
@@ -101,8 +99,12 @@ public class PathConfig {
     public static final String DEFAULT_AREA_2_Name = "乌兰察布市";
     public static final String DEFAULT_AREA_1_CODE = "150000000000";
     public static final String DEFAULT_AREA_2_CODE = "150900000000";
-    public static final double DEFAULT_LAT = 40.98896497581636;//默认纬度
-    public static final double DEFAULT_LNG = 113.11412662267688;//默认经度
+    public static final double DEFAULT_LAT = 40.98896497581636;//百度默认纬度
+    public static final double DEFAULT_LNG = 113.11412662267688;//百度默认经度
+
+
+//    public static final double DEFAULT_LAT =40.985146875223094;//84默认坐标
+//    public static final double DEFAULT_LNG =113.13547047287368;//84默认经度
     public static final double DEFAULT_BD_LAT = 40;//默认百度中心点
     public static final double DEFAULT_BD_LNG = 113;//默认百度中心点
     public static final int DEFAULT_ZOOM = 15;//地图默认缩放

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.0-rc'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         jcenter()
@@ -13,7 +13,7 @@ buildscript {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath "com.alibaba:arouter-register:1.0.2"
         classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.6'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -58,8 +58,8 @@ ext {
     gCompileSdkVersion = 30
     gMinSdkVersion = 21
     gTargetSdkVersion = 30
-    gVersionCode = 17
-    gVersionName = '1.1.6'
+    gVersionCode = 18
+    gVersionName = '1.1.7'
     gBuildToolsVersion = "29.0.2"
 //    gVersionCode=26
 //    gVersionName='1.3.0'

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java

@@ -1,11 +1,11 @@
 package com.tengshisoft.commonmodule.activitys.cases;
 
+
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Color;
-import android.graphics.drawable.AnimationDrawable;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
@@ -16,12 +16,10 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.ZoomControls;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -43,7 +41,6 @@ import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.gson.Gson;
-import com.tenlionsoft.baselib.utils.ToastUtils;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
 import com.tengshisoft.commonmodule.beans.AreaGridListBean;
@@ -66,12 +63,11 @@ import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
 import com.tenlionsoft.baselib.core.widget.PhotoActivity;
 import com.tenlionsoft.baselib.core.widget.base.AddPhotoAdapter;
 import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
-import com.tenlionsoft.baselib.core.widget.videorecord.MediaManager;
 import com.tenlionsoft.baselib.core.widget.views.AreaChooseDialog;
 import com.tenlionsoft.baselib.core.widget.views.ButtomDialogView;
-import com.tenlionsoft.baselib.core.widget.voicebutton.VoiceButton;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
 import com.tenlionsoft.baselib.utils.PermissionUtils;
+import com.tenlionsoft.baselib.utils.ToastUtils;
 import com.tenlionsoft.baselib.utils.UIUtil;
 import com.tenlionsoft.baselib.utils.UserLgUtils;
 
@@ -141,8 +137,11 @@ public class IncidentReportActivity extends BaseActivity {
     RelativeLayout mLlVideo;
     @BindView(R2.id.iv_del_video)
     ImageView mIvDelVideo;
+    //百度Map
     @BindView(R2.id.tmv_map)
-    TextureMapView mTmvMap;
+    TextureMapView mTmvMap;//
+    //    @BindView(R2.id.mv_map)
+//    TouchMapView mMapView;
     @BindView(R2.id.iv_cover)
     ImageView mIvCover;
     //    @BindView(R2.id.iv_voice)
@@ -675,9 +674,41 @@ public class IncidentReportActivity extends BaseActivity {
     private BaiduMap mBaiduMap;
     private BitmapDescriptor mBitMap;
 
+
+//    private DefaultItemizedOverlay mItemizedOverlay;
+
     /**
-     * 初始化地图
+     *TODO 超图初始化地图
      */
+//    private void initMap() {
+//
+//        Drawable marker = getResources().getDrawable(com.tengshisoft.commonmodule.R.drawable.ic_map_location_marker);
+//        mItemizedOverlay = new DefaultItemizedOverlay(marker);
+////        WMSLayerView baseLayerView= new WMSLayerView(mActivity,"https://58.18.108.24:8443/a2ap9hgf/iserver/services/map-WulanchabuData/wms130/WLCB_MAP?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&FORMAT=image/png&TRANSPARENT=true&LAYERS=WLCB_MAP&WIDTH=256&HEIGHT=256&CRS=EPSG:4326&STYLES=&BBOX=41.53530299790449,111.8926038994574,41.677021383644615,112.03432228519752","1.3.0","0.11");
+////        baseLayerView.setURL("https://58.18.108.24:8443/a2ap9hgf/iserver/services/map-WulanchabuData/wms130/WLCB_MAP?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&FORMAT=image/png&TRANSPARENT=true&LAYERS=WLCB_MAP&WIDTH=256&HEIGHT=256&CRS=EPSG:4326&STYLES=&BBOX=41.53530299790449,111.8926038994574,41.677021383644615,112.03432228519752");
+//        LayerView layerView = new LayerView(this);
+////        layerView.setURL(Pat?hConfig.BASE_LAYER);
+////        layerView.setURL("https://58.18.108.24:8443/0ix3sypi/iserver/services/map-WulanchabuData/rest/maps/WLCB_MAP/tileImage.png?width=256&height=256&redirect=false&transparent=true&cacheEnabled=true&origin=%7B%22x%22%3A110.33370165631604%2C%22y%22%3A43.377642012526096%7D&overlapDisplayed=false&scale=4.326818743302412e-7&x=2&y=1");
+////        layerView.setURL("https://58.18.108.24:8443/0ix3sypi/iserver/services/map-WulanchabuData/rest/maps/WLCB_MAP");
+////        layerView.setURL("https://58.18.108.24:8443/7fy2ee07/iserver/services/map-WulanchabuData/?layer=WLCB_MAP&style=default&tilematrixset=Custom_WLCB_MAP&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image/png&TileMatrix=0&TileCol=2&TileRow=1");
+////        layerView.setURL("https://58.18.108.24:8443/7fy2ee07/iserver/services/map-WulanchabuData/wmts100");
+////        layerView.setURL("https://58.18.108.24:8443/a2ap9hgf/iserver/services/map-WulanchabuData/wms130/WLCB_MAP?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&FORMAT=image/png&TRANSPARENT=true&LAYERS=WLCB_MAP&WIDTH=256&HEIGHT=256&CRS=EPSG:4326&STYLES=&BBOX=41.53530299790449,111.8926038994574,41.677021383644615,112.03432228519752");
+//        layerView.setURL("https://58.18.108.24:8443/a2ap9hgf/iserver/services/map-WulanchabuData/wms130/WLCB_MAP");
+////        layerView.setURL("http://support.supermap.com.cn:8090/iserver/services/map-china400/rest/maps/China");
+//        CoordinateReferenceSystem crs = new CoordinateReferenceSystem();
+//        crs.wkid = 4326;
+//        layerView.setCRS(crs);
+//        mMapView.addLayer(layerView);
+//        mMapView.getController().setCenter(new Point2D(116.391468, 39.904491));
+//        mMapView.getController().setZoom(PathConfig.DEFAULT_ZOOM);
+//        mMapView.setBuiltInZoomControls(false);//内置缩放控件
+//        mMapView.setClickable(true);
+//        mMapView.getOverlays().add(mItemizedOverlay);
+//        mMapView.invalidate();
+
+
+//    }
+    //TODO 百度Map
     @SuppressLint("ClickableViewAccessibility")
     private void initMap() {
         mTmvMap.showZoomControls(false);//缩放控件
@@ -706,6 +737,14 @@ public class IncidentReportActivity extends BaseActivity {
      * @param latLng
      */
     private void moveMapToCenter(LatLng latLng, int room) {
+//        double lat = Double.parseDouble(b.getReportLat());
+//        double lng = Double.parseDouble(b.getReportLng());
+//        Point2D point = new Point2D(lng, lat);
+//        mMvMap.getController().setCenter(point);
+//        OverlayItem item = new OverlayItem(point, "", "");
+//        mItemizedOverlay.addItem(item);
+//        mMvMap.invalidate();
+        //TODO 百度Map
         MapStatus ms = new MapStatus.Builder().zoom(room).target(latLng).build();
         MapStatusUpdate u = MapStatusUpdateFactory.newMapStatus(ms);
         mBaiduMap.setMapStatus(u);

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

@@ -119,7 +119,11 @@
 
                 <LinearLayout
                     style="@style/item_gray_vertical_top"
-                    tools:visibility="gone">
+                    tools:visibility="visible">
+                    <!--                    <com.tengshisoft.gismap.TouchMapView-->
+                    <!--                        android:id="@+id/mv_map"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="200dp" />-->
 
                     <com.baidu.mapapi.map.TextureMapView
                         android:id="@+id/tmv_map"
@@ -276,87 +280,87 @@
                     </LinearLayout>
                 </LinearLayout>
 
-<!--                <LinearLayout-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_marginLeft="10dp"-->
-<!--                    android:layout_marginTop="5dp"-->
-<!--                    android:layout_marginRight="10dp"-->
-<!--                    android:orientation="vertical">-->
+                <!--                <LinearLayout-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:layout_marginLeft="10dp"-->
+                <!--                    android:layout_marginTop="5dp"-->
+                <!--                    android:layout_marginRight="10dp"-->
+                <!--                    android:orientation="vertical">-->
 
-<!--                    <TextView-->
-<!--                        android:id="@+id/tv_voice"-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:drawablePadding="8dp"-->
-<!--                        android:gravity="left"-->
-<!--                        android:padding="5dp"-->
-<!--                        android:text="录音"-->
-<!--                        android:textColor="@color/text_20" />-->
+                <!--                    <TextView-->
+                <!--                        android:id="@+id/tv_voice"-->
+                <!--                        android:layout_width="wrap_content"-->
+                <!--                        android:layout_height="wrap_content"-->
+                <!--                        android:drawablePadding="8dp"-->
+                <!--                        android:gravity="left"-->
+                <!--                        android:padding="5dp"-->
+                <!--                        android:text="录音"-->
+                <!--                        android:textColor="@color/text_20" />-->
 
-<!--                    <LinearLayout-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="40dp"-->
-<!--                        android:background="@drawable/shape_rectangle_gray_5"-->
-<!--                        android:gravity="center_vertical"-->
-<!--                        android:orientation="horizontal">-->
+                <!--                    <LinearLayout-->
+                <!--                        android:layout_width="match_parent"-->
+                <!--                        android:layout_height="40dp"-->
+                <!--                        android:background="@drawable/shape_rectangle_gray_5"-->
+                <!--                        android:gravity="center_vertical"-->
+                <!--                        android:orientation="horizontal">-->
 
-<!--                        <LinearLayout-->
-<!--                            android:id="@+id/ll_voice"-->
-<!--                            android:layout_width="0dp"-->
-<!--                            android:layout_height="match_parent"-->
-<!--                            android:layout_weight="1"-->
-<!--                            android:gravity="center_vertical"-->
-<!--                            android:orientation="horizontal">-->
+                <!--                        <LinearLayout-->
+                <!--                            android:id="@+id/ll_voice"-->
+                <!--                            android:layout_width="0dp"-->
+                <!--                            android:layout_height="match_parent"-->
+                <!--                            android:layout_weight="1"-->
+                <!--                            android:gravity="center_vertical"-->
+                <!--                            android:orientation="horizontal">-->
 
-<!--                            <ImageView-->
-<!--                                android:id="@+id/iv_voice"-->
-<!--                                android:layout_width="30dp"-->
-<!--                                android:layout_height="30dp"-->
-<!--                                android:layout_marginLeft="10dp"-->
-<!--                                android:src="@drawable/ic_voice_icon_gray" />-->
+                <!--                            <ImageView-->
+                <!--                                android:id="@+id/iv_voice"-->
+                <!--                                android:layout_width="30dp"-->
+                <!--                                android:layout_height="30dp"-->
+                <!--                                android:layout_marginLeft="10dp"-->
+                <!--                                android:src="@drawable/ic_voice_icon_gray" />-->
 
-<!--                            <TextView-->
-<!--                                android:id="@+id/tv_voice_anim"-->
-<!--                                android:layout_width="wrap_content"-->
-<!--                                android:layout_height="wrap_content"-->
-<!--                                android:layout_marginLeft="15dp"-->
-<!--                                android:background="@drawable/anim_yuyin_sign"-->
-<!--                                android:clickable="true"-->
-<!--                                android:focusable="true"-->
-<!--                                android:visibility="invisible" />-->
+                <!--                            <TextView-->
+                <!--                                android:id="@+id/tv_voice_anim"-->
+                <!--                                android:layout_width="wrap_content"-->
+                <!--                                android:layout_height="wrap_content"-->
+                <!--                                android:layout_marginLeft="15dp"-->
+                <!--                                android:background="@drawable/anim_yuyin_sign"-->
+                <!--                                android:clickable="true"-->
+                <!--                                android:focusable="true"-->
+                <!--                                android:visibility="invisible" />-->
 
-<!--                            <View-->
-<!--                                android:layout_width="0dp"-->
-<!--                                android:layout_height="wrap_content"-->
-<!--                                android:layout_weight="1" />-->
-<!--                        </LinearLayout>-->
+                <!--                            <View-->
+                <!--                                android:layout_width="0dp"-->
+                <!--                                android:layout_height="wrap_content"-->
+                <!--                                android:layout_weight="1" />-->
+                <!--                        </LinearLayout>-->
 
-<!--                        <RelativeLayout-->
-<!--                            android:layout_width="0dp"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_weight="0.3">-->
+                <!--                        <RelativeLayout-->
+                <!--                            android:layout_width="0dp"-->
+                <!--                            android:layout_height="wrap_content"-->
+                <!--                            android:layout_weight="0.3">-->
 
-<!--                            <com.tenlionsoft.baselib.core.widget.voicebutton.VoiceButton-->
-<!--                                android:id="@+id/arb_audio"-->
-<!--                                android:layout_width="wrap_content"-->
-<!--                                android:layout_height="35dp"-->
-<!--                                android:background="@drawable/sel_btn_submit_circle"-->
-<!--                                android:gravity="center"-->
-<!--                                android:textColor="#fff"-->
-<!--                                android:textSize="14dp" />-->
+                <!--                            <com.tenlionsoft.baselib.core.widget.voicebutton.VoiceButton-->
+                <!--                                android:id="@+id/arb_audio"-->
+                <!--                                android:layout_width="wrap_content"-->
+                <!--                                android:layout_height="35dp"-->
+                <!--                                android:background="@drawable/sel_btn_submit_circle"-->
+                <!--                                android:gravity="center"-->
+                <!--                                android:textColor="#fff"-->
+                <!--                                android:textSize="14dp" />-->
 
 
-<!--                            <ImageView-->
-<!--                                android:id="@+id/iv_del_audio"-->
-<!--                                android:layout_width="wrap_content"-->
-<!--                                android:layout_height="wrap_content"-->
-<!--                                android:layout_centerInParent="true"-->
-<!--                                android:src="@drawable/ic_del_tong" />-->
-<!--                        </RelativeLayout>-->
-<!--                    </LinearLayout>-->
+                <!--                            <ImageView-->
+                <!--                                android:id="@+id/iv_del_audio"-->
+                <!--                                android:layout_width="wrap_content"-->
+                <!--                                android:layout_height="wrap_content"-->
+                <!--                                android:layout_centerInParent="true"-->
+                <!--                                android:src="@drawable/ic_del_tong" />-->
+                <!--                        </RelativeLayout>-->
+                <!--                    </LinearLayout>-->
 
-<!--                </LinearLayout>-->
+                <!--                </LinearLayout>-->
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
     </LinearLayout>

gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java

@@ -1026,6 +1026,11 @@ public class CensusMigrantAddActivity extends BaseActivity {
             ToastUtils.show("请选择住所类型");
             return false;
         }
+        String startDate = mTvStartDate.getText().toString().trim();
+        if (TextUtils.isEmpty(startDate)) {
+            ToastUtils.show("请选择登记日期");
+            return false;
+        }
         if (!TextUtils.isEmpty(mSelCardType)) {
             String cardNumber = mEtCardNumber.getText().toString().trim();
             if (TextUtils.isEmpty(cardNumber)) {

gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml

@@ -417,7 +417,7 @@
 
                         <ImageView
                             style="@style/style_hint_star"
-                            android:visibility="invisible" />
+                            android:visibility="visible" />
 
                         <TextView
                             style="@style/item_title"

mainmodule/build.gradle

@@ -70,7 +70,7 @@ dependencies {
     annotationProcessor "com.github.bumptech.glide:compiler:$rootProject.ext.supportGlide"
     //加载更多
     implementation "com.jcodecraeer:xrecyclerview:$rootProject.ext.xRecyclerViewVersion"
-    implementation "com.leon:lfilepickerlibrary:$rootProject.ext.lfilepickerlibraryVersion"
+//    implementation "com.leon:lfilepickerlibrary:$rootProject.ext.lfilepickerlibraryVersion"
     //指示器
     implementation "com.github.hackware1993:MagicIndicator:${rootProject.ext.mIndicatorVersion}"
     //图片压缩

mainmodule/src/main/AndroidManifest.xml

@@ -9,6 +9,8 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- 在SD卡中创建与删除文件权限-->
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />