diff --git a/app/release/oa-1.0.4.apk b/app/release/oa-1.0.5.apk similarity index 88% rename from app/release/oa-1.0.4.apk rename to app/release/oa-1.0.5.apk index 4bedd61..7b39414 100644 Binary files a/app/release/oa-1.0.4.apk and b/app/release/oa-1.0.5.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index c49f081..74512f2 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 4, - "versionName": "1.0.4", + "versionCode": 5, + "versionName": "1.0.5", "outputFile": "app-release.apk" } ] diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/db/UserDao.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/db/UserDao.java index e670f8a..b5d59b5 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/db/UserDao.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/db/UserDao.java @@ -72,7 +72,7 @@ public interface UserDao { /** * 根据关键字查询联系人 */ - @Query("SELECT * FROM (SELECT * FROM db_user INNER JOIN db_often_contact ON db_often_contact.userId= db_user.userId) WHERE userName LIKE '%' || :keyword || '%' OR userPhone LIKE '%' || :keyword || '%'") + @Query("SELECT * FROM (SELECT * FROM db_user INNER JOIN db_often_contact ON db_often_contact.userId = db_user.userId) WHERE userName LIKE '%' || (:keyword) || '%' OR userPhone LIKE '%' || (:keyword) || '%'") List getOftenContactByKeyword(String keyword); // /** @@ -90,13 +90,13 @@ public interface UserDao { /** * 关键字搜索 */ - @Query("SELECT * FROM db_user WHERE `departmentId`=(:deptId) AND userName LIKE '%' || :keyword || '%' OR userPhone LIKE '%' || :keyword || '%'") + @Query("SELECT * FROM db_user WHERE `departmentId`=(:deptId) AND userName LIKE '%' || (:keyword) || '%' OR userPhone LIKE '%' || (:keyword) || '%'") List queryByDeptIdAndKeyWord(String deptId, String keyword); @Query("SELECT * FROM db_user WHERE userName LIKE (:name)") List getUsersLikeName(String name); - @Query("SELECT * FROM db_user WHERE userName LIKE '%' || :name || '%'") + @Query("SELECT * FROM db_user WHERE userName LIKE '%' || (:name) || '%'") List getUsersLikeNameSync(String name); } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 90724d3..77f7328 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -43,8 +43,8 @@ public class BaseUrlApi { public static final String UPDATE_URL = "version.json"; - public static final String PREVIEW_URL = IP + "onlinePreview?url=";//http://192.168.0.120:8080/systemoa/route/file/download/false/bfa385d4-7547-41d2-b71b-20dcc847cb5f?fullfilename=测试ppt.pptx - + // public static final String PREVIEW_URL = IP + "onlinePreview?url=";//http://192.168.0.120:8080/systemoa/route/file/download/false/bfa385d4-7547-41d2-b71b-20dcc847cb5f?fullfilename=测试ppt.pptx + public static final String PREVIEW_URL = BASE_OA + "approute/onlinefile/onlineFileView/"; //请求码 public static final int PHOTO_REQUEST = 0x2121;//相册图片 public static final int CAMERA_REQUEST = 0x2222;//相机图片 diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/PreviewFileActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/PreviewFileActivity.java index 32522d2..9ab75a5 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/PreviewFileActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/PreviewFileActivity.java @@ -18,8 +18,11 @@ import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.R2; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; -import com.tenlionsoft.baselib.utils.AesUtil; import com.tenlionsoft.baselib.utils.LogUtils; +import com.tenlionsoft.baselib.utils.UserLgUtils; + +import java.util.HashMap; +import java.util.Map; import butterknife.BindView; import butterknife.ButterKnife; @@ -56,13 +59,13 @@ public class PreviewFileActivity extends BaseActivity { ToastUtils.show("数据有误"); finish(); } else { - String previewFileUrl = AesUtil.getPreviewFileUrl(fileName, fileId); - LogUtils.e("生成的文件地址==" + BaseUrlApi.BASE_FILE_URL + previewFileUrl); - if (TextUtils.isEmpty(previewFileUrl)) { +// String previewFileUrl = AesUtil.getPreviewFileUrl(fileName, fileId); +// LogUtils.e("生成的文件地址==" + BaseUrlApi.BASE_FILE_URL + previewFileUrl); + if (TextUtils.isEmpty(fileId)) { ToastUtils.show("文件链接有误"); finish(); } else { - setWebContent(previewFileUrl); + setWebContent(fileId); } } } @@ -118,7 +121,9 @@ public class PreviewFileActivity extends BaseActivity { return super.onJsAlert(view, url, message, result); } }); - mWvWeb.loadUrl(BaseUrlApi.PREVIEW_URL + url); + Map header = new HashMap<>(); + header.put("token", UserLgUtils.getToken()); + mWvWeb.loadUrl(BaseUrlApi.PREVIEW_URL + url, header); mLlContent.addView(mWvWeb); } diff --git a/baselib/src/main/res/drawable-xhdpi/dialog_meeting_qr_bg.9.png b/baselib/src/main/res/drawable-xhdpi/dialog_meeting_qr_bg.9.png new file mode 100644 index 0000000..0a57f8a Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/dialog_meeting_qr_bg.9.png differ diff --git a/baselib/src/main/res/layout/dialog_meeting_qr.xml b/baselib/src/main/res/layout/dialog_meeting_qr.xml index 1c0ce36..38d9c2f 100644 --- a/baselib/src/main/res/layout/dialog_meeting_qr.xml +++ b/baselib/src/main/res/layout/dialog_meeting_qr.xml @@ -1,81 +1,64 @@ - - - - - - - - - - + android:background="@color/transparent" + android:orientation="vertical"> - - + android:background="@color/white" + android:orientation="vertical"> + + + + + + + + + + + + - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 50a7af7..dc17ee6 100644 --- a/build.gradle +++ b/build.gradle @@ -59,8 +59,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 19 gTargetSdkVersion = 30 - gVersionCode = 4 - gVersionName = '1.0.4' + gVersionCode = 5 + gVersionName = '1.0.5' gBuildToolsVersion = "29.0.2" // gVersionCode=26 // gVersionName='1.3.0' diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java index d64a4f7..6716744 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java @@ -138,11 +138,15 @@ public class ScheduleAddActivity extends BaseActivity { */ private void showAddTypeDialog() { AddScheduleTypeDialog dialog = new AddScheduleTypeDialog.Builder(mActivity).build(); - dialog.addOnChangeListener(this::doSaveType); + dialog.addOnChangeListener(type -> { + dialog.HideSoftKeyBoardDialog(mActivity); + doSaveType(type); + }); dialog.show(); } private void doSaveType(String type) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "保存中..."); dialog.show(); RequestBody body = buildTypeParams(type);