diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index da6a75f..f309745 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -173,7 +173,7 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index da6a75f..f309745 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -173,7 +173,7 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index a1669d7..ad076f8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,11 +216,12 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; - if (mainActivity.uploadPositionPresenter == null) { - return; + try { + mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, + String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + } catch (NullPointerException e) { + e.printStackTrace(); } - mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; case Constant.LOGIN_OUT: Log.d(TAG, "退出登录"); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index da6a75f..f309745 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -173,7 +173,7 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index a1669d7..ad076f8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,11 +216,12 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; - if (mainActivity.uploadPositionPresenter == null) { - return; + try { + mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, + String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + } catch (NullPointerException e) { + e.printStackTrace(); } - mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; case Constant.LOGIN_OUT: Log.d(TAG, "退出登录"); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d1ce586..6ea3e95 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -176,7 +176,7 @@ cleanToiletPresenter = new CleanToiletPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); locationDialog = new QMUITipDialog.Builder(this) diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index da6a75f..f309745 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -173,7 +173,7 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index a1669d7..ad076f8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,11 +216,12 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; - if (mainActivity.uploadPositionPresenter == null) { - return; + try { + mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, + String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + } catch (NullPointerException e) { + e.printStackTrace(); } - mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; case Constant.LOGIN_OUT: Log.d(TAG, "退出登录"); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d1ce586..6ea3e95 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -176,7 +176,7 @@ cleanToiletPresenter = new CleanToiletPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); locationDialog = new QMUITipDialog.Builder(this) diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index b9ed8a8..4806122 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -35,6 +35,7 @@ public static final String IP_KEY = "BASE_IP"; public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; + public static final long HTTP_TIMEOUT = 30L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; public static final int REQUEST_REFRESH_CODE = 9002; diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index da6a75f..f309745 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -173,7 +173,7 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index a1669d7..ad076f8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,11 +216,12 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; - if (mainActivity.uploadPositionPresenter == null) { - return; + try { + mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, + String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + } catch (NullPointerException e) { + e.printStackTrace(); } - mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; case Constant.LOGIN_OUT: Log.d(TAG, "退出登录"); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d1ce586..6ea3e95 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -176,7 +176,7 @@ cleanToiletPresenter = new CleanToiletPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); locationDialog = new QMUITipDialog.Builder(this) diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index b9ed8a8..4806122 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -35,6 +35,7 @@ public static final String IP_KEY = "BASE_IP"; public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; + public static final long HTTP_TIMEOUT = 30L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; public static final int REQUEST_REFRESH_CODE = 9002; diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java deleted file mode 100644 index 1815327..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.dcms.utils; - -public class HttpConfig { - public static final long HTTP_TIMEOUT = 30L; -} diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index da6a75f..f309745 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -173,7 +173,7 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index a1669d7..ad076f8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,11 +216,12 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; - if (mainActivity.uploadPositionPresenter == null) { - return; + try { + mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, + String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + } catch (NullPointerException e) { + e.printStackTrace(); } - mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; case Constant.LOGIN_OUT: Log.d(TAG, "退出登录"); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d1ce586..6ea3e95 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -176,7 +176,7 @@ cleanToiletPresenter = new CleanToiletPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); locationDialog = new QMUITipDialog.Builder(this) diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index b9ed8a8..4806122 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -35,6 +35,7 @@ public static final String IP_KEY = "BASE_IP"; public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; + public static final long HTTP_TIMEOUT = 30L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; public static final int REQUEST_REFRESH_CODE = 9002; diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java deleted file mode 100644 index 1815327..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.dcms.utils; - -public class HttpConfig { - public static final long HTTP_TIMEOUT = 30L; -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index c542ac3..64022f2 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -1,5 +1,6 @@ package com.casic.dcms.utils; +import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -8,8 +9,6 @@ import android.graphics.Rect; import android.text.TextUtils; -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.ICompressListener; import com.casic.dcms.utils.callback.IWaterMarkAddListener; import com.qmuiteam.qmui.util.QMUIDisplayHelper; @@ -26,20 +25,30 @@ import top.zibin.luban.OnCompressListener; public class ImageHelper { + + private static final String TAG = "ImageHelper"; + @SuppressLint("StaticFieldLeak") + private static Context context; + private static Paint paint; + + public static void initPaint(Context context) { + ImageHelper.context = context; + //初始化画笔 + paint = new Paint(Paint.ANTI_ALIAS_FLAG);//抗锯齿 + paint.setColor(Color.RED); + paint.setDither(true); // 防抖动，获取更清晰的图像采样 + paint.setFilterBitmap(true);// 滤波 + paint.setTextSize(QMUIDisplayHelper.sp2px(context, 50)); + } + /** * 绘制文字到右下角并压缩图片 */ - public static void drawTextToRightBottom(Context context, final Bitmap bitmap, String name, String date, - String time, IWaterMarkAddListener markAddListener) { + public static void drawTextToRightBottom(final Bitmap bitmap, String name, String date, String time, + IWaterMarkAddListener markAddListener) { Observable.create(new Observable.OnSubscribe() { @Override public void call(Subscriber subscriber) { - //初始化画笔 - Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); - paint.setColor(Color.RED); - paint.setDither(true); // 获取跟清晰的图像采样 - paint.setFilterBitmap(true);// 过滤一些 - paint.setTextSize(QMUIDisplayHelper.sp2px(context, 50)); Rect nameBounds = new Rect(); paint.getTextBounds(name, 0, name.length(), nameBounds); Rect dateBounds = new Rect(); @@ -48,7 +57,7 @@ paint.getTextBounds(time, 0, time.length(), timeBounds); //添加水印 - android.graphics.Bitmap.Config bitmapConfig = bitmap.getConfig(); + Bitmap.Config bitmapConfig = bitmap.getConfig(); if (bitmapConfig == null) { bitmapConfig = Bitmap.Config.RGB_565; } @@ -127,41 +136,4 @@ } }); } - - /** - * 压缩图片 - */ - public static void compressImage(String imagePath, String targetDir, ICompressListener listener) { - Luban.with(BaseApplication.getInstance()) - .load(imagePath) - .ignoreBy(100) - .setTargetDir(targetDir) - .filter(new CompressionPredicate() { - @Override - public boolean apply(String path) { - return !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif")); - } - }) - .setCompressListener(new OnCompressListener() { - - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - if (file != null) { - listener.onSuccess(file); - } else { - listener.onSuccess(null); - } - } - - @Override - public void onError(Throwable e) { - listener.onError(e); - } - }).launch(); - } } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index bc0dce3..b142196 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -7,6 +7,7 @@ import com.casic.dcms.greendao.DaoMaster; import com.casic.dcms.greendao.DaoSession; import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.ImageHelper; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.ArcGISRuntimeEnvironment; @@ -26,16 +27,11 @@ SaveKeyValues.initSharedPreferences(this); ToastHelper.initToastHelper(this); FileUtils.initFileConfig(this); + ImageHelper.initPaint(this); ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license));//去掉开发版水印 ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)); //个推初始化 com.igexin.sdk.PushManager.getInstance().initialize(this); -// com.igexin.sdk.PushManager.getInstance().setDebugLogger(this, new IUserLoggerInterface() { -// @Override -// public void log(String s) { -// Log.d(TAG, s); -// } -// }); initDataBase(); CrashReport.initCrashReport(this, getString(R.string.bugly_app_id), true); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index e53c5ac..1cf3bf3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -3,7 +3,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.casic.dcms.base.BaseApplication; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; @@ -30,8 +29,7 @@ view.showProgress(); //改为上传带水印的图片 Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - ImageHelper.drawTextToRightBottom(BaseApplication.getInstance(), bitmap, - StringHelper.getUserAccount(), + ImageHelper.drawTextToRightBottom(bitmap, StringHelper.getUserAccount(), TimeOrDateUtil.timestampToDate(System.currentTimeMillis()), TimeOrDateUtil.timestampToTime(System.currentTimeMillis()), new IWaterMarkAddListener() { diff --git a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java index b5a94e2..544fcc3 100644 --- a/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BigImageActivity.java @@ -64,7 +64,6 @@ imagePagerView.setAdapter(new BigImageAdapter(this, urls)); imagePagerView.setCurrentItem(index); imagePagerView.setOffscreenPageLimit(2);//设置预加载数量 - imagePagerView.setPageMargin(5);//控制两幅图之间的间距 imagePagerView.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 2d0c0af..78c499f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -144,7 +144,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); checkImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 90a578a..4241a5c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -125,7 +125,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private MediaPlayer mediaPlayer; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter @Override @@ -153,7 +153,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); handleImageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 4af9584..0ff8167 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -123,7 +123,7 @@ private CaseSubmitPresenterImpl caseSubmitPresenter; private List largeClassBeans; private List smallClassBeans; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ProgressDialog progressDialog; private UploadImagePresenterImpl uploadImagePresenter; private List imageList = new ArrayList<>();//服务器返回的拍照数据集 @@ -161,7 +161,7 @@ submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); progressDialog = new ProgressDialog(this); progressDialog.setMessage("视频压缩中..."); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 60521cf..22ed63e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -73,7 +73,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; private ImageRecycleViewAdapter imageAdapter; - private QMUITipDialog submitDialog, loadingDialog; + private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真是图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private String gridId, shopID; @@ -94,7 +94,7 @@ shopCaseSubmitPresenter = new ShopCaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7830b21..331439d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -115,7 +115,7 @@ caseSubmitPresenter = new CaseSubmitPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index da6a75f..f309745 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -173,7 +173,7 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index a1669d7..ad076f8 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,11 +216,12 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; - if (mainActivity.uploadPositionPresenter == null) { - return; + try { + mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, + String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + } catch (NullPointerException e) { + e.printStackTrace(); } - mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; case Constant.LOGIN_OUT: Log.d(TAG, "退出登录"); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index d1ce586..6ea3e95 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -176,7 +176,7 @@ cleanToiletPresenter = new CleanToiletPresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("提交中，请稍后") + .setTipWord("处理中，请稍后") .create(); locationDialog = new QMUITipDialog.Builder(this) diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index b9ed8a8..4806122 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -35,6 +35,7 @@ public static final String IP_KEY = "BASE_IP"; public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; + public static final long HTTP_TIMEOUT = 30L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; public static final int REQUEST_REFRESH_CODE = 9002; diff --git a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java b/app/src/main/java/com/casic/dcms/utils/HttpConfig.java deleted file mode 100644 index 1815327..0000000 --- a/app/src/main/java/com/casic/dcms/utils/HttpConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.dcms.utils; - -public class HttpConfig { - public static final long HTTP_TIMEOUT = 30L; -} diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index c542ac3..64022f2 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -1,5 +1,6 @@ package com.casic.dcms.utils; +import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -8,8 +9,6 @@ import android.graphics.Rect; import android.text.TextUtils; -import com.casic.dcms.base.BaseApplication; -import com.casic.dcms.utils.callback.ICompressListener; import com.casic.dcms.utils.callback.IWaterMarkAddListener; import com.qmuiteam.qmui.util.QMUIDisplayHelper; @@ -26,20 +25,30 @@ import top.zibin.luban.OnCompressListener; public class ImageHelper { + + private static final String TAG = "ImageHelper"; + @SuppressLint("StaticFieldLeak") + private static Context context; + private static Paint paint; + + public static void initPaint(Context context) { + ImageHelper.context = context; + //初始化画笔 + paint = new Paint(Paint.ANTI_ALIAS_FLAG);//抗锯齿 + paint.setColor(Color.RED); + paint.setDither(true); // 防抖动，获取更清晰的图像采样 + paint.setFilterBitmap(true);// 滤波 + paint.setTextSize(QMUIDisplayHelper.sp2px(context, 50)); + } + /** * 绘制文字到右下角并压缩图片 */ - public static void drawTextToRightBottom(Context context, final Bitmap bitmap, String name, String date, - String time, IWaterMarkAddListener markAddListener) { + public static void drawTextToRightBottom(final Bitmap bitmap, String name, String date, String time, + IWaterMarkAddListener markAddListener) { Observable.create(new Observable.OnSubscribe() { @Override public void call(Subscriber subscriber) { - //初始化画笔 - Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); - paint.setColor(Color.RED); - paint.setDither(true); // 获取跟清晰的图像采样 - paint.setFilterBitmap(true);// 过滤一些 - paint.setTextSize(QMUIDisplayHelper.sp2px(context, 50)); Rect nameBounds = new Rect(); paint.getTextBounds(name, 0, name.length(), nameBounds); Rect dateBounds = new Rect(); @@ -48,7 +57,7 @@ paint.getTextBounds(time, 0, time.length(), timeBounds); //添加水印 - android.graphics.Bitmap.Config bitmapConfig = bitmap.getConfig(); + Bitmap.Config bitmapConfig = bitmap.getConfig(); if (bitmapConfig == null) { bitmapConfig = Bitmap.Config.RGB_565; } @@ -127,41 +136,4 @@ } }); } - - /** - * 压缩图片 - */ - public static void compressImage(String imagePath, String targetDir, ICompressListener listener) { - Luban.with(BaseApplication.getInstance()) - .load(imagePath) - .ignoreBy(100) - .setTargetDir(targetDir) - .filter(new CompressionPredicate() { - @Override - public boolean apply(String path) { - return !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif")); - } - }) - .setCompressListener(new OnCompressListener() { - - @Override - public void onStart() { - - } - - @Override - public void onSuccess(File file) { - if (file != null) { - listener.onSuccess(file); - } else { - listener.onSuccess(null); - } - } - - @Override - public void onError(Throwable e) { - listener.onError(e); - } - }).launch(); - } } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index aeec792..88e88f6 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -32,7 +32,6 @@ import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpConfig; import com.casic.dcms.utils.SaveKeyValues; import org.jetbrains.annotations.NotNull; @@ -74,9 +73,9 @@ }); interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); OkHttpClient.Builder builder = new OkHttpClient.Builder() - .readTimeout(HttpConfig.HTTP_TIMEOUT, TimeUnit.SECONDS) - .connectTimeout(HttpConfig.HTTP_TIMEOUT, TimeUnit.SECONDS) - .writeTimeout(HttpConfig.HTTP_TIMEOUT, TimeUnit.SECONDS); + .readTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) + .connectTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) + .writeTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS); return builder.addInterceptor(interceptor).build(); }