2.2.7发布

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.rehome.zhdcoa"
         minSdk 24
         targetSdk 34
-        versionCode 10
+        versionCode 11
-        versionName "2.2.6"
+        versionName "2.2.7"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

app/src/main/AndroidManifest.xml

@@ -82,7 +82,6 @@
         tools:replace="android:allowBackup"
         tools:targetApi="s">
 
-
         <meta-data
             android:name="design_width"
             android:value="768" />
@@ -349,18 +348,23 @@
         <activity
             android:name=".ui.activity.CollectPrivateInfoActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait"
+            android:exported="false"
-            android:exported="false" />
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity.ThirdShareListActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.PrivacyAgreementActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait"
+            android:exported="false"
-            android:exported="false" />
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.ServiceAgreementActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait"
+            android:exported="false"
-            android:exported="false" />
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.UpdatePwdActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"

app/src/main/java/com/rehome/zhdcoa/ui/activity/AboutMeActivity.kt

@@ -15,7 +15,7 @@ class AboutMeActivity : BaseActivityOaToolbarViewBinding<ActivityAboutMeBinding>
 
     override fun getToolbar() = binding.toolbarView.toolbar
     override fun initView() {
-        initToolbar("关于我们")
+        initToolbar("关于移动办公")
         setLeftOnClickListener { finish() }
 
         binding.tvServiceAgreement.setOnClickListener {
@@ -33,6 +33,11 @@ class AboutMeActivity : BaseActivityOaToolbarViewBinding<ActivityAboutMeBinding>
             startActivity(intent)
         }
 
+        binding.tvThirdShareList.setOnClickListener {
+            val intent = Intent(this, ThirdShareListActivity::class.java)
+            startActivity(intent)
+        }
+
     }
 
     override fun initData() {

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -188,8 +188,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (BuildConfig.LOG_ERROR) {
             //        管理员
-            binding.etUsername.setText("ZHPS_Admin")
+//            binding.etUsername.setText("ZHPS_Admin")
-            binding.etPassword.setText("Rehome.zhps@996")
+//            binding.etPassword.setText("Rehome.zhps@996")
 
 //            binding.etUsername.setText("310386")
 //            binding.etPassword.setText("Zhps$cc0386")
@@ -248,22 +248,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
     private fun appLogin() {
         if (!binding.cbAgreement.isChecked) {
-            //showToast("请阅读并同意服务协议和隐")
+            toastviewbymyself.makeText(context, "请阅读并同意服务协议和隐私保护", Toast.LENGTH_LONG).show()
-            toastviewbymyself.makeText(context, "请阅读并同意服务协议和隐", Toast.LENGTH_LONG)
-                .show()
-//            val vibrator = getSystemService(VIBRATOR_SERVICE) as Vibrator
-//            // 判断手机硬件是否有振动器
-//            if(vibrator!=null&&vibrator.hasVibrator()){
-//                vibrator.vibrate(250);  // 设置手机振动
-//            }
-            //vibrator.cancel();// 关闭振动
-
             val vibrator = context.getSystemService(Vibrator::class.java)
 
             // Requires VIBRATE permission
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    //vibrator.vibrate(VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK))
+                    if (vibrator != null && vibrator.hasVibrator()) {
                         val timings: LongArray = longArrayOf(50, 50, 50, 50)
                         val amplitudes: IntArray = intArrayOf(77, 79, 84, 99)
                         val repeatIndex = -1 // Do not repeat.
@@ -275,12 +266,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                             )
                         )
 
-                    ObjectAnimator.ofFloat(binding.llLeftRight, "translationX", -20f, 20f).apply {
+                        ObjectAnimator.ofFloat(binding.llLeftRight, "translationX", -20f, 20f)
+                            .apply {
                                 duration = 60
                                 repeatCount = 4
                                 repeatMode = ValueAnimator.REVERSE
                             }.start()
-
+                    }
                 }
             } else {
                 if (vibrator != null && vibrator.hasVibrator()) {
@@ -462,7 +454,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //        return json
 
 //        showLog(json.length.toString());
-//        showLog(json);
+        showLog(json);
 //        showLog(jsonEncrypt);
         return jsonEncrypt
     }

app/src/main/java/com/rehome/zhdcoa/ui/activity/PrivacyAgreementActivity.kt

@@ -23,7 +23,7 @@ class PrivacyAgreementActivity : BaseActivityOaToolbarViewBinding<ActivityPrivac
 
     override fun getToolbar() = binding.toolbarView.toolbar
     override fun initView() {
-        initToolbar("隐私保护")
+        initToolbar("隐私保护协议")
         setLeftOnClickListener { finish() }
 
         val settings: WebSettings = binding.webView.settings

app/src/main/java/com/rehome/zhdcoa/ui/activity/ThirdShareListActivity.kt

@@ -0,0 +1,26 @@
+package com.rehome.zhdcoa.ui.activity
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.rehome.zhdcoa.R
+import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
+import com.rehome.zhdcoa.databinding.ActivityThirdShareListBinding
+import com.rehome.zhdcoa.weiget.OAToolbar
+
+class ThirdShareListActivity : BaseActivityOaToolbarViewBinding<ActivityThirdShareListBinding>() {
+
+    override fun getViewBinding() = ActivityThirdShareListBinding.inflate(layoutInflater)
+
+    override fun getToolbar()= binding.toolbarView.toolbar
+
+    override fun initView() {
+        initToolbar("第三方信息共享清单")
+        setLeftOnClickListener { finish() }
+    }
+
+    override fun initData() {
+
+    }
+
+
+}

app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java

@@ -308,12 +308,10 @@ public class MineFragment extends BaseLazyFragment {
             }
         });
 
-        //关于我们
+        //关于移动办公
         tv_aboutMe.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                showLog("to aboutMe");
-                Intent intent2 = new Intent(getActivity(), ApplyAboutMeActivity.class);
                 Intent intentAboutMe = new Intent(getActivity(), AboutMeActivity.class);
                 intentAboutMe.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
                 startActivity(intentAboutMe);

app/src/main/res/layout/activity_about_me.xml

@@ -27,7 +27,7 @@
             android:drawablePadding="40px"
             android:gravity="center_vertical"
             android:padding="20px"
-            android:text="服务保护"
+            android:text="服务协议"
             android:textColor="@color/black"
             android:textSize="30px" />
 
@@ -64,6 +64,22 @@
             android:text="收集个人信息明示清单"
             android:textColor="@color/black"
             android:textSize="30px" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="25px" />
+
+        <TextView
+            android:id="@+id/tv_third_share_list"
+            android:layout_width="match_parent"
+            android:layout_height="100px"
+            android:background="@drawable/selector_list_item"
+            android:drawableRight="@drawable/packup"
+            android:drawablePadding="40px"
+            android:gravity="center_vertical"
+            android:padding="20px"
+            android:text="第三方信息共享清单"
+            android:textColor="@color/black"
+            android:textSize="30px" />
     </LinearLayout>
 
 </LinearLayout>

app/src/main/res/layout/activity_collect_private_info.xml

@@ -14,56 +14,52 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="25px" />
 
         <TextView
             android:id="@+id/tv_serviceAgreement"
             android:layout_width="match_parent"
             android:layout_height="100px"
-            android:background="@drawable/selector_list_item"
+            android:background="@color/gray"
-            android:drawableRight="@drawable/packup"
             android:drawablePadding="40px"
-            android:gravity="center_vertical"
+            android:gravity="center"
             android:padding="20px"
-            android:text="服务协议"
+            android:text="收集个人信息清单列表"
             android:textColor="@color/black"
             android:textSize="30px" />
 
-        <View
+    </LinearLayout>
+    <LinearLayout
         android:layout_width="match_parent"
-            android:layout_height="25px" />
+        android:layout_height="match_parent"
+        android:gravity="start"
+        android:orientation="vertical">
 
         <TextView
-            android:id="@+id/tv_privacy"
             android:layout_width="match_parent"
             android:layout_height="100px"
-            android:background="@drawable/selector_list_item"
-            android:drawableRight="@drawable/packup"
             android:drawablePadding="40px"
             android:gravity="center_vertical"
             android:padding="20px"
-            android:text="隐私协议"
+            android:text="1.手机操作系统版本号。"
             android:textColor="@color/black"
             android:textSize="30px" />
-
+        <TextView
-        <View
             android:layout_width="match_parent"
-            android:layout_height="25px" />
+            android:layout_height="100px"
-
+            android:drawablePadding="40px"
+            android:gravity="center_vertical"
+            android:padding="20px"
+            android:text="2.手机型号。"
+            android:textColor="@color/black"
+            android:textSize="30px" />
         <TextView
-            android:id="@+id/tv_private_info"
             android:layout_width="match_parent"
             android:layout_height="100px"
-            android:background="@drawable/selector_list_item"
-            android:drawableRight="@drawable/packup"
             android:drawablePadding="40px"
             android:gravity="center_vertical"
             android:padding="20px"
-            android:text="收集个人信息明示清单"
+            android:text="3.手机唯一标识码。"
             android:textColor="@color/black"
             android:textSize="30px" />
     </LinearLayout>
-
 </LinearLayout>

app/src/main/res/layout/activity_third_share_list.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.activity.ThirdShareListActivity">
+
+    <include
+        android:id="@+id/toolbarView"
+        layout="@layout/layout_base" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_serviceAgreement"
+            android:layout_width="match_parent"
+            android:layout_height="100px"
+            android:background="@color/gray"
+            android:drawablePadding="40px"
+            android:gravity="center"
+            android:padding="20px"
+            android:text="第三方信息共享清单列表"
+            android:textColor="@color/black"
+            android:textSize="30px" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="start"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="40px"
+            android:gravity="center_vertical"
+            android:padding="20px"
+            android:text="1.腾讯浏览服务。(APP内部打开本地Office文档能力,使用位置：管理-培训-学习中心-培训课程/生产岗位课程)"
+            android:textColor="@color/black"
+            android:textSize="30px" />
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/fragment_mine.xml

@@ -43,6 +43,7 @@
                 android:layout_marginStart="3dp"
                 android:layout_gravity="center"
                 android:gravity="center"
+                android:visibility="gone"
                 android:text=""
                 android:textColor="@color/white"
                 android:textSize="30sp" />
@@ -339,7 +340,7 @@
                 android:drawablePadding="40px"
                 android:gravity="center_vertical"
                 android:padding="20px"
-                android:text="关于我们"
+                android:text="关于移动办公"
                 android:textColor="@color/black"
                 android:textSize="30px" />