页面调整

baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java

@@ -7,8 +7,8 @@ package com.tenlionsoft.baselib.core.retrofit_net;
  */
 public class BaseUrlApi {
 
-        public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */
+//        public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */
-//    public static final String IP = "http://121.36.71.250/";/* 测试IP */
+    public static final String IP = "http://121.36.71.250/";/* 测试IP */
     //    public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */
     public static final String SYS_USERCENTER = "usercenter/";
     public static final String SYS_POPULATION = "population/";/*人口系统*/

baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java

@@ -9,6 +9,7 @@ import android.app.ActivityManager;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Rect;
@@ -41,6 +42,11 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.gyf.immersionbar.ImmersionBar;
 import com.hjq.toast.ToastUtils;
@@ -54,11 +60,6 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
 /**
  * 作者 : Adam on 2018/10/15.
  * 邮箱 : itgaojian@163.com
@@ -116,6 +117,10 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (!isPad()) {
+            //手机界面下锁定横竖屏切换
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
 //        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
         setContentView(R.layout.base_activity);
         //默认隐藏键盘
@@ -177,7 +182,8 @@ public abstract class BaseActivity extends AppCompatActivity {
             deviceInfo = "navigationbar_is_min";
         } else if (brand.equalsIgnoreCase("xiaomi") || brand.equalsIgnoreCase("blackshark")) {
             deviceInfo = "force_fsg_nav_bar";
-        } else if (brand.equalsIgnoreCase("VIVO") || brand.equalsIgnoreCase("OnePlus") || brand.equalsIgnoreCase("OPPO")) {
+        } else if (brand.equalsIgnoreCase("VIVO") || brand.equalsIgnoreCase("OnePlus") || brand.equalsIgnoreCase(
+                "OPPO")) {
             return !ImmersionBar.isGesture(this);
         } else {
             deviceInfo = "noah_navi_mode_value";

oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java

@@ -1,6 +1,7 @@
 package com.tenlionsoft.oamodule.pad.fragments;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -23,6 +24,7 @@ import com.tenlionsoft.baselib.core.widget.base.FragmentUtils;
 import com.tenlionsoft.baselib.core.widget.base.FunctionTitleNumAdapter;
 import com.tenlionsoft.baselib.core.widget.views.CustomStateView;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
+import com.tenlionsoft.baselib.utils.LogUtils;
 import com.tenlionsoft.baselib.utils.TimeUtils;
 import com.tenlionsoft.oamodule.R;
 import com.tenlionsoft.oamodule.R2;
@@ -150,14 +152,7 @@ public class PadOaMainFragment extends BaseFragment {
                             scheduleDetailBean.getScheduleId());
             mPadMainActivity.addFragment(1, fragment);
         });
-        //常用功能
+
-        mFuncBeans = new ArrayList<>();
-        FlexboxLayoutManager flexboxLayoutManager = new FlexboxLayoutManager(mActivity, FlexDirection.ROW,
-                FlexWrap.WRAP);
-        mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140);
-        mRlvFuncs.setLayoutManager(flexboxLayoutManager);
-        mRlvFuncs.setAdapter(mFunctionAdapter);
-        mFunctionAdapter.addOnItemClickListener(this::choosePage);
         //通知公告
         mNoticeListBeanRows = new ArrayList<>();
         mNoticeShowAdapter = new NoticeShowAdapter(mActivity, mNoticeListBeanRows);
@@ -251,10 +246,44 @@ public class PadOaMainFragment extends BaseFragment {
         mPadMainActivity = (PadMainActivity) getActivity();
     }
 
+    @Override
+    public void onConfigurationChanged(@androidx.annotation.NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            //竖屏
+            mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140);
+        } else {
+            //横屏
+            mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20);
+        }
+        mFunctionAdapter.setData(mFuncBeans);
+    }
+
     /**
      * 刷新页面
      */
     private void doRefresh() {
+        //常用功能
+        mFuncBeans = new ArrayList<>();
+        FlexboxLayoutManager flexboxLayoutManager = new FlexboxLayoutManager(mActivity, FlexDirection.ROW,
+                FlexWrap.WRAP);
+        //判断横竖屏
+        Configuration configuration = mActivity.getResources().getConfiguration();
+        int orientation = configuration.orientation;
+        LogUtils.e(orientation);
+        if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+            //竖屏
+            mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 6, 140);
+        } else {
+            //横屏
+            mFunctionAdapter = new FunctionTitleNumAdapter(mActivity, mFuncBeans, 11, 20);
+        }
+
+        mRlvFuncs.setLayoutManager(flexboxLayoutManager);
+        mRlvFuncs.setAdapter(mFunctionAdapter);
+        mFunctionAdapter.addOnItemClickListener(this::choosePage);
+
+
         mCsvSchedule.setState(CustomStateView.STATE_LOAD);
         mCsvFuncs.setState(CustomStateView.STATE_LOAD);
         mCsvNotice.setState(CustomStateView.STATE_LOAD);

oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/oaflow/OaFlowApplyFragment.java

@@ -1,5 +1,7 @@
 package com.tenlionsoft.oamodule.pad.fragments.home.oaflow;
 
+import static com.tenlionsoft.baselib.core.widget.PhotoActivity.TAG_IMGURL;
+
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -26,6 +28,13 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
@@ -86,12 +95,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.core.widget.NestedScrollView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.reactivex.rxjava3.core.Observable;
@@ -101,13 +104,11 @@ import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
-import static com.tenlionsoft.baselib.core.widget.PhotoActivity.TAG_IMGURL;
-
 /**
  * 作者: adam
  * 日期: 2022/6/20 - 10:53
  * 邮箱: itgaojian@163.com
- * 描述:
+ * 描述: 平板页面发起流程
  */
 @Route(path = PathConfig.PATH_MODULE_OA_FRAGMENT_OA_FLOW_APPLY)
 public class OaFlowApplyFragment extends BaseFragment {
@@ -244,7 +245,9 @@ public class OaFlowApplyFragment extends BaseFragment {
             mIsShowOnlyThree = !mIsShowOnlyThree;
             mLogAdapter.setShowOnlyThree(mIsShowOnlyThree);
             //改变箭头方向
-            @SuppressLint("UseCompatLoadingForDrawables") Drawable drawable1 = mActivity.getResources().getDrawable(mIsShowOnlyThree ? R.drawable.ic_close_more_icon : R.drawable.ic_show_more_icon);
+            @SuppressLint("UseCompatLoadingForDrawables") Drawable drawable1 =
+                    mActivity.getResources().getDrawable(mIsShowOnlyThree ? R.drawable.ic_close_more_icon :
+                            R.drawable.ic_show_more_icon);
             drawable1.setBounds(0, 0, drawable1.getMinimumWidth(), drawable1.getMinimumHeight());
             mTvShowMoreLog.setCompoundDrawables(null, null, drawable1, null);
             mTvShowMoreLog.setText(mIsShowOnlyThree ? "展开" : "收起");
@@ -434,7 +437,8 @@ public class OaFlowApplyFragment extends BaseFragment {
         mCsvWeb.setState(CustomStateView.STATE_LOAD);
         mWebChromeClient = new WebChromeClient() {
             @Override
-            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback,
+                                             FileChooserParams fileChooserParams) {
                 LogUtils.e(filePathCallback);
                 if (mFilePathCallback != null) {
                     mFilePathCallback.onReceiveValue(null);
@@ -473,7 +477,9 @@ public class OaFlowApplyFragment extends BaseFragment {
                         LogUtils.e("加载完成");
                         mActivity.runOnUiThread(() -> {
                             WebView webView = mWebView.getWebCreator().getWebView();
-                        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
+                            FrameLayout.LayoutParams params =
+                                    new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
+                                            FrameLayout.LayoutParams.WRAP_CONTENT);
                             webView.setLayoutParams(params);
                         });
                     }
@@ -685,7 +691,8 @@ public class OaFlowApplyFragment extends BaseFragment {
         SaveTransferBean bodyBean = new SaveTransferBean();
         bodyBean.setAssignee(bean.getUserId());
         bodyBean.setReason(content);
-        RequestBody body = RequestBody.create(new Gson().toJson(bodyBean), MediaType.parse("application/json; charset=utf-8"));
+        RequestBody body = RequestBody.create(new Gson().toJson(bodyBean), MediaType.parse("application/json; " +
+                "charset=utf-8"));
         RetrofitManager.getInstance()
                 .create(OAApi.class)
                 .doOaFlowTransfer(mProcessId, mTaskId, body)
@@ -845,7 +852,8 @@ public class OaFlowApplyFragment extends BaseFragment {
         dialog.show();
         SaveTransferBean bodyBean = new SaveTransferBean();
         bodyBean.setReason(content);
-        RequestBody body = RequestBody.create(new Gson().toJson(bodyBean), MediaType.parse("application/json; charset=utf-8"));
+        RequestBody body = RequestBody.create(new Gson().toJson(bodyBean), MediaType.parse("application/json; " +
+                "charset=utf-8"));
         RetrofitManager.getInstance()
                 .create(OAApi.class)
                 .doForcedEnd(mProcessId, mTaskId, body)
@@ -922,7 +930,8 @@ public class OaFlowApplyFragment extends BaseFragment {
         dialog.show();
         SaveTransferBean bodyBean = new SaveTransferBean();
         bodyBean.setReason(content);
-        RequestBody body = RequestBody.create(new Gson().toJson(bodyBean), MediaType.parse("application/json; charset=utf-8"));
+        RequestBody body = RequestBody.create(new Gson().toJson(bodyBean), MediaType.parse("application/json; " +
+                "charset=utf-8"));
         RetrofitManager.getInstance()
                 .create(OAApi.class)
                 .doBackNode(mProcessId, mTaskId, bean.getNodeId(), body)
@@ -983,6 +992,7 @@ public class OaFlowApplyFragment extends BaseFragment {
         @JavascriptInterface
         public void invokeNative(String method, String params) {
             mActivity.runOnUiThread(() -> {
+                LogUtils.e(method + "===" + params);
                 if ("back".equals(method)) {
                     LogUtils.e("关闭");
                     mMainActivity.getPreFragment().mIsRefresh = true;
@@ -1079,7 +1089,8 @@ public class OaFlowApplyFragment extends BaseFragment {
         } else if (3 == addFileBean.getFileType() || 4 == addFileBean.getFileType()) {
             ARouter.getInstance()
                     .build(PathConfig.PATH_MODULE_PLAYER_SIMPLE_VIDEO)
-                .withString("title", addFileBean.getFileName().substring(0, addFileBean.getFileName().lastIndexOf(".")))
+                    .withString("title", addFileBean.getFileName().substring(0,
+                            addFileBean.getFileName().lastIndexOf(".")))
                     .withString("url", BaseUrlApi.BASE_IMG_URL + addFileBean.getId())
                     .withString("type", addFileBean.getFileType() == 4 ? "audio" : "video")
                     .navigation();

oamodule/src/main/res/layout/fragment_pad_oa_main.xml

@@ -61,6 +61,7 @@
                     android:id="@+id/iv_banner"
                     android:layout_width="216dp"
                     android:layout_height="178dp"
+                    android:visibility="gone"
                     android:scaleType="fitXY"
                     android:src="@drawable/ic_empty_data" />
             </LinearLayout>