gaojian/oasystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在线预览附件地址修改

Browse Source
This commit is contained in:
adam 2022-06-15 17:01:44 +08:00
parent 647aafc47f
commit 9a81549aa9
9 changed files with 73 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/oa-1.0.4.apk → app/release/oa-1.0.5.apk
View File

Binary file not shown.

4
app/release/output-metadata.json
View File

@ -10,8 +10,8 @@
{
"type": "SINGLE",
"filters": [],
"versionCode": 4,
"versionName": "1.0.4",
"versionCode": 5,
"versionName": "1.0.5",
"outputFile": "app-release.apk"
}
]

6
baselib/src/main/java/com/tenlionsoft/baselib/core/db/UserDao.java
View File

@ -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<UserDatabaseBean> 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<UserDatabaseBean> queryByDeptIdAndKeyWord(String deptId, String keyword);
@Query("SELECT * FROM db_user WHERE userName LIKE (:name)")
List<UserDatabaseBean> getUsersLikeName(String name);
@Query("SELECT * FROM db_user WHERE userName LIKE '%' || :name || '%'")
@Query("SELECT * FROM db_user WHERE userName LIKE '%' || (:name) || '%'")
List<UserDatabaseBean> getUsersLikeNameSync(String name);
}

4
baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
View File

@ -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;//相机图片

17
baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/PreviewFileActivity.java
View File

@ -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<String, String> header = new HashMap<>();
header.put("token", UserLgUtils.getToken());
mWvWeb.loadUrl(BaseUrlApi.PREVIEW_URL + url, header);
mLlContent.addView(mWvWeb);
}

BIN
baselib/src/main/res/drawable-xhdpi/dialog_meeting_qr_bg.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

113
baselib/src/main/res/layout/dialog_meeting_qr.xml
View File

@ -1,81 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="vertical"
tools:background="@color/black_70">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="会议签到码"
android:textColor="@color/black"
android:textSize="18sp" />
<ImageView
android:id="@+id/iv_confirm"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:src="@drawable/ic_close_gray" />
</RelativeLayout>
android:background="@color/transparent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_margin="10dp"
android:background="@drawable/dialog_meeting_qr_bg"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_qr"
android:layout_width="250dp"
android:layout_height="250dp"
android:layout_gravity="center"
android:layout_marginTop="5dp"
tools:scaleType="fitXY"
tools:src="@drawable/ic_main_title_bg" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="打开App点击扫码\n扫描上方二维码进行签到"
android:textColor="@color/gray_text"
android:textSize="10sp" />
android:background="@color/white"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_qr"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_marginTop="5dp"
tools:scaleType="fitXY"
tools:src="@drawable/ic_main_title_bg" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:clickable="true"
android:focusable="true"
android:padding="10dp"
android:text="保存到相册"
android:textColor="@color/red_ff" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/iv_confirm"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:src="@drawable/ic_oa_flow_center_close" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:clickable="true"
android:focusable="true"
android:padding="10dp"
android:text="保存到相册"
android:textColor="@color/red_ff" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

4
build.gradle
View File

@ -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'

6
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/schedule/ScheduleAddActivity.java
View File

@ -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);