diff --git a/app/build.gradle b/app/build.gradle index 603c1b1..92c9a7e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 34 - versionCode 10 - versionName "2.2.6" + versionCode 11 + versionName "2.2.7" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities,防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8958977..7bfebf6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -82,7 +82,6 @@ tools:replace="android:allowBackup" tools:targetApi="s"> - @@ -349,18 +348,23 @@ + android:exported="false" + android:screenOrientation="portrait" /> + + android:exported="false" + android:screenOrientation="portrait" /> + android:exported="false" + android:screenOrientation="portrait" /> override fun getToolbar() = binding.toolbarView.toolbar override fun initView() { - initToolbar("关于我们") + initToolbar("关于移动办公") setLeftOnClickListener { finish() } binding.tvServiceAgreement.setOnClickListener { @@ -33,6 +33,11 @@ class AboutMeActivity : BaseActivityOaToolbarViewBinding startActivity(intent) } + binding.tvThirdShareList.setOnClickListener { + val intent = Intent(this, ThirdShareListActivity::class.java) + startActivity(intent) + } + } override fun initData() { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index acb6f39..71ba63f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -188,8 +188,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (BuildConfig.LOG_ERROR) { // 管理员 - binding.etUsername.setText("ZHPS_Admin") - binding.etPassword.setText("Rehome.zhps@996") +// binding.etUsername.setText("ZHPS_Admin") +// binding.etPassword.setText("Rehome.zhps@996") // binding.etUsername.setText("310386") // binding.etPassword.setText("Zhps$cc0386") @@ -248,39 +248,31 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { private fun appLogin() { if (!binding.cbAgreement.isChecked) { - //showToast("请阅读并同意服务协议和隐") - toastviewbymyself.makeText(context, "请阅读并同意服务协议和隐", Toast.LENGTH_LONG) - .show() -// val vibrator = getSystemService(VIBRATOR_SERVICE) as Vibrator -// // 判断手机硬件是否有振动器 -// if(vibrator!=null&&vibrator.hasVibrator()){ -// vibrator.vibrate(250); // 设置手机振动 -// } - //vibrator.cancel();// 关闭振动 - + toastviewbymyself.makeText(context, "请阅读并同意服务协议和隐私保护", Toast.LENGTH_LONG).show() 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)) - val timings: LongArray = longArrayOf(50, 50, 50, 50) - val amplitudes: IntArray = intArrayOf(77, 79, 84, 99) - val repeatIndex = -1 // Do not repeat. - vibrator.vibrate( - VibrationEffect.createWaveform( - timings, - amplitudes, - repeatIndex + 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. + vibrator.vibrate( + VibrationEffect.createWaveform( + timings, + amplitudes, + repeatIndex + ) ) - ) - - ObjectAnimator.ofFloat(binding.llLeftRight, "translationX", -20f, 20f).apply { - duration = 60 - repeatCount = 4 - repeatMode = ValueAnimator.REVERSE - }.start() + 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() { // return json // showLog(json.length.toString()); -// showLog(json); + showLog(json); // showLog(jsonEncrypt); return jsonEncrypt } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PrivacyAgreementActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PrivacyAgreementActivity.kt index 779051e..f804230 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/PrivacyAgreementActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/PrivacyAgreementActivity.kt @@ -23,7 +23,7 @@ class PrivacyAgreementActivity : BaseActivityOaToolbarViewBinding() { + + override fun getViewBinding() = ActivityThirdShareListBinding.inflate(layoutInflater) + + override fun getToolbar()= binding.toolbarView.toolbar + + override fun initView() { + initToolbar("第三方信息共享清单") + setLeftOnClickListener { finish() } + } + + override fun initData() { + + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java index 7745b9b..240fde6 100755 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java +++ b/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); diff --git a/app/src/main/res/layout/activity_about_me.xml b/app/src/main/res/layout/activity_about_me.xml index 62ebb97..c1b10af 100644 --- a/app/src/main/res/layout/activity_about_me.xml +++ b/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" /> + + + diff --git a/app/src/main/res/layout/activity_collect_private_info.xml b/app/src/main/res/layout/activity_collect_private_info.xml index 78fd16a..c8be152 100644 --- a/app/src/main/res/layout/activity_collect_private_info.xml +++ b/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"> - - + + - - - + android:layout_height="100px" + android:drawablePadding="40px" + android:gravity="center_vertical" + android:padding="20px" + android:text="2.手机型号。" + android:textColor="@color/black" + android:textSize="30px" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_third_share_list.xml b/app/src/main/res/layout/activity_third_share_list.xml new file mode 100644 index 0000000..f44f479 --- /dev/null +++ b/app/src/main/res/layout/activity_third_share_list.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 8251245..6926e9a 100755 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/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" />