在线预览附件地址修改

app/release/output-metadata.json

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

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

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

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);
+//            String previewFileUrl = AesUtil.getPreviewFileUrl(fileName, fileId);
-            LogUtils.e("生成的文件地址==" + BaseUrlApi.BASE_FILE_URL + previewFileUrl);
+//            LogUtils.e("生成的文件地址==" + BaseUrlApi.BASE_FILE_URL + previewFileUrl);
-            if (TextUtils.isEmpty(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);
     }
 

baselib/src/main/res/layout/dialog_meeting_qr.xml

@@ -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:background="@color/transparent"
-    android:orientation="vertical"
+    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>
-
 
     <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
+        <LinearLayout
-            android:layout_width="wrap_content"
+            android:id="@+id/ll_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:background="@color/white"
-            android:layout_marginTop="5dp"
+            android:orientation="vertical">
-            android:gravity="center"
+
-            android:text="打开App点击扫码\n扫描上方二维码进行签到"
+            <ImageView
-            android:textColor="@color/gray_text"
+                android:id="@+id/iv_qr"
-            android:textSize="10sp" />
+                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
+</RelativeLayout>
-        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>

build.gradle

@@ -59,8 +59,8 @@ ext {
     gCompileSdkVersion = 30
     gMinSdkVersion = 19
     gTargetSdkVersion = 30
-    gVersionCode = 4
+    gVersionCode = 5
-    gVersionName = '1.0.4'
+    gVersionName = '1.0.5'
     gBuildToolsVersion = "29.0.2"
 //    gVersionCode=26
 //    gVersionName='1.3.0'

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