oneao/workspace
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u

Browse Source
This commit is contained in:
oneao committed 2026-04-24 17:28:11 +08:00
1 parent 07e0001b87
commit 46cbb2f50d
543 files changed
+32576 -4231
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/app/app-rn4/src/app/(tabs)/my/index.tsx
+3 -62
View File
@@ -1,12 +1,12 @@
import React, { useState } from "react";
import React from "react";
import LayoutView from "@/components/layout/view";
import { Text, View } from "react-native";
import { Avatar } from "heroui-native";
import { ChevronRightIcon } from "lucide-react-native";
import { ListGroup, PressableFeedback, Dialog, Button } from "heroui-native";
import { ListGroup, PressableFeedback } from "heroui-native";
import { Ionicons } from "@expo/vector-icons";
import { withUniwind } from "uniwind";
import { useUserStore, useFamilyStore } from "@/store";
import { useUserStore } from "@/store";
import { useRouter } from "expo-router";
const StyledIonicons = withUniwind(Ionicons);
import { buildFileUrl } from "@/utils/file";
@@ -14,19 +14,6 @@ import { buildFileUrl } from "@/utils/file";
export default function My() {
const router = useRouter();
const userStore = useUserStore();
const familyStore = useFamilyStore();
const [openLogout, setOpenLogout] = useState(false);
function handleLogout() {
setOpenLogout(false);
requestAnimationFrame(() => {
userStore.clear();
familyStore.clear();
router.replace("/auth/login");
});
}
return (
<LayoutView>
@@ -92,53 +79,7 @@ export default function My() {
<PressableFeedback.Ripple />
</PressableFeedback>
</ListGroup>
<ListGroup>
<PressableFeedback
onPress={() => {
setOpenLogout(true);
}}
>
<ListGroup.Item>
<ListGroup.ItemPrefix>
<StyledIonicons name="exit-outline" size={22} className="text-foreground" />
</ListGroup.ItemPrefix>
<ListGroup.ItemContent>
<ListGroup.ItemTitle>退出登录</ListGroup.ItemTitle>
</ListGroup.ItemContent>
<ListGroup.ItemSuffix />
</ListGroup.Item>
<PressableFeedback.Ripple />
</PressableFeedback>
</ListGroup>
</View>
<Dialog isOpen={openLogout} onOpenChange={setOpenLogout}>
<Dialog.Portal>
<Dialog.Overlay />
<Dialog.Content>
<View className="flex-row items-center justify-between">
<Dialog.Title>提示</Dialog.Title>
<Dialog.Close variant="ghost" />
</View>
<View className="my-2 gap-1.5">
<Dialog.Description>确认退出当前登录账号么？</Dialog.Description>
</View>
<View className="flex-row justify-end gap-3">
<Button variant="ghost" size="sm" onPress={() => setOpenLogout(false)}>
取消
</Button>
<Button size="sm" onPress={handleLogout}>
确认
</Button>
</View>
</Dialog.Content>
</Dialog.Portal>
</Dialog>
</LayoutView.ScrollView>
</LayoutView>
);
code/app/app-rn4/src/app/auth/login.tsx
+35 -36
View File
@@ -11,8 +11,7 @@ import ExpoQQ from "expo-qq";
import ExpoWeChat from "expo-wechat";
import { useEvent } from "expo";
import { toast } from "sonner-native";
import { loginQqApi, loginWxApi, s3UploadFileApi, saveDataApi } from "@/request/api";
import { isS3Key } from "@/utils/file";
import { loginQqApi, loginWxApi } from "@/request/api";
export default function Login() {
const router = useRouter();
@@ -112,52 +111,52 @@ export default function Login() {
}, [onLoginFinished]);
const handlePostLogin = async (user: any) => {
let finalAvatar = user.avatar || "";
// let finalAvatar = user.avatar || "";
// 统一头像迁移逻辑
const isExternalUrl = finalAvatar && !isS3Key(finalAvatar);
// // 统一头像迁移逻辑
// const isExternalUrl = finalAvatar && !isS3Key(finalAvatar);
if (isExternalUrl) {
userStore.updateToken(user.token);
// if (isExternalUrl) {
// userStore.updateToken(user.token);
try {
const file = {
uri: finalAvatar,
name: `avatar_${Date.now()}.jpg`,
type: "image/jpeg",
};
// try {
// const file = {
// uri: finalAvatar,
// name: `avatar_${Date.now()}.jpg`,
// type: "image/jpeg",
// };
const uploadRes = await s3UploadFileApi([file]);
// const uploadRes = await s3UploadFileApi([file]);
if (uploadRes.isSuccess) {
finalAvatar = uploadRes.data?.[0] || finalAvatar;
// if (uploadRes.isSuccess) {
// finalAvatar = uploadRes.data?.[0] || finalAvatar;
saveDataApi([
{
table_name: "b_user",
key_field: "id",
inserts: [],
deletes: [],
updates: [
{
id: user.userId,
avatar: finalAvatar,
},
],
},
]).catch(console.log);
}
} catch (e) {
console.log("头像迁移失败", e);
}
}
// saveDataApi([
// {
// table_name: "b_user",
// key_field: "id",
// inserts: [],
// deletes: [],
// updates: [
// {
// id: user.userId,
// avatar: finalAvatar,
// },
// ],
// },
// ]).catch(console.log);
// }
// } catch (e) {
// console.log("头像迁移失败", e);
// }
// }
// 统一写入 store
userStore.setUserInfo({
token: user.token,
id: user.userId,
nickname: user.nickname,
avatar: finalAvatar,
avatar: user.avatar,
});
userStore.setAuthExpired(false);
code/app/app-rn4/src/app/family/user.tsx
+200 -14
View File
@@ -1,42 +1,77 @@
import LayoutView from "@/components/layout/view";
import { View, Text, Pressable } from "react-native";
import PageLayout from "@/layouts/PageLayout";
import { Avatar, PressableFeedback } from "heroui-native";
import { Avatar, PressableFeedback, ListGroup, Separator, Button, Dialog } from "heroui-native";
import { loadDataApi, saveDataApi } from "@/request/api";
import { useUserStore } from "@/store";
import { useUserStore, useFamilyStore } from "@/store";
import { useEffect, useState } from "react";
import { CameraIcon } from "lucide-react-native";
import ImagePicker from "react-native-image-crop-picker";
import { s3UploadFileApi } from "@/request/api";
import { buildFileUrl } from "@/utils/file";
import { PhoneIcon, CakeIcon, ContactRoundIcon } from "lucide-react-native";
import { IconQq, IconWeixin } from "@/components/iconfont";
import { useRouter } from "expo-router";
import DateTime from "@/components/DateTime";
export default function UserSetting() {
const router = useRouter();
const userStore = useUserStore();
const familyStore = useFamilyStore();
const [userInfo, setUserInfo] = useState<any>({});
const [bindQq, setBindQq] = useState(false);
const [bindWechat, setBindWechat] = useState(false);
const [openLogout, setOpenLogout] = useState(false);
useEffect(() => {
loadUserInfo();
}, []);
async function loadUserInfo() {
try {
const res = await loadDataApi({
view_name: "b_user",
search_columns: [],
search_condition: `id = ?`,
order_by: "",
args: [userStore.userInfo.id],
});
const userId = userStore.userInfo.id;
if (res.isSuccess && res.data.length > 0) {
const [res, bindRes] = await Promise.all([
loadDataApi({
view_name: "b_user",
search_columns: [],
search_condition: `id = ?`,
order_by: "",
args: [userId],
}),
loadDataApi({
view_name: "b_user_oauth",
search_columns: [],
search_condition: `user_id = ?`,
order_by: "",
args: [userId],
}),
]);
if (res.isSuccess && res.data?.length) {
setUserInfo(res.data[0]);
}
if (bindRes.isSuccess && bindRes.data?.length) {
let hasQQ = false;
let hasWechat = false;
bindRes.data.forEach((item) => {
if (item.type === 1) hasQQ = true;
if (item.type === 0) hasWechat = true;
});
setBindQq(hasQQ);
setBindWechat(hasWechat);
}
} catch (e) {
console.log(e);
}
}
useEffect(() => {
loadUserInfo();
}, []);
// 选择头像
const pickImage = async () => {
try {
const img = await ImagePicker.openPicker({
@@ -82,6 +117,17 @@ export default function UserSetting() {
}
};
// 退出登录
function handleLogout() {
setOpenLogout(false);
requestAnimationFrame(() => {
userStore.clear();
familyStore.clear();
router.replace("/auth/login");
});
}
return (
<PageLayout title="个人设置">
<LayoutView>
@@ -118,10 +164,150 @@ export default function UserSetting() {
<View>
<Text className="text-sm text-muted mb-2 ml-2">基础信息</Text>
<ListGroup className="mb-6">
<PressableFeedback>
<ListGroup.Item>
<ListGroup.ItemPrefix>
<ContactRoundIcon size="22" strokeWidth={1.5} />
{/* <StyledIonicons name="home-outline" size={22} className="text-foreground" /> */}
</ListGroup.ItemPrefix>
<ListGroup.ItemContent>
<ListGroup.ItemTitle>姓名</ListGroup.ItemTitle>
</ListGroup.ItemContent>
<ListGroup.ItemSuffix>
<Text className="text-sm text-muted">{userInfo.name || "-"}</Text>
</ListGroup.ItemSuffix>
</ListGroup.Item>
<PressableFeedback.Ripple />
</PressableFeedback>
<Separator className="mx-4" />
<PressableFeedback>
<ListGroup.Item>
<ListGroup.ItemPrefix>
<PhoneIcon size="22" strokeWidth={1.5} />
</ListGroup.ItemPrefix>
<ListGroup.ItemContent>
<ListGroup.ItemTitle>手机号</ListGroup.ItemTitle>
</ListGroup.ItemContent>
<ListGroup.ItemSuffix>
<Text className="text-sm text-muted">{userInfo.phone || "-"}</Text>
</ListGroup.ItemSuffix>
</ListGroup.Item>
<PressableFeedback.Ripple />
</PressableFeedback>
<Separator className="mx-4" />
<PressableFeedback>
<ListGroup.Item>
<ListGroup.ItemPrefix>
<CakeIcon size="22" strokeWidth={1.5} />
</ListGroup.ItemPrefix>
<ListGroup.ItemContent>
<ListGroup.ItemTitle>生日</ListGroup.ItemTitle>
</ListGroup.ItemContent>
<ListGroup.ItemSuffix>
<Text className="text-sm text-muted">{userInfo.birth_date || "-"}</Text>
</ListGroup.ItemSuffix>
</ListGroup.Item>
<PressableFeedback.Ripple />
</PressableFeedback>
</ListGroup>
<Text className="text-sm text-muted mb-2 ml-2">账号信息</Text>
<ListGroup className="mb-6">
<PressableFeedback>
<ListGroup.Item>
<ListGroup.ItemPrefix>
<IconQq size={22} />
</ListGroup.ItemPrefix>
<ListGroup.ItemContent>
<ListGroup.ItemTitle>QQ</ListGroup.ItemTitle>
</ListGroup.ItemContent>
<ListGroup.ItemSuffix>
<Text className={`text-sm ${bindWechat ? "text-green-500" : "text-muted"}`}>
{bindQq ? "已绑定" : "未绑定"}
</Text>
</ListGroup.ItemSuffix>
</ListGroup.Item>
<PressableFeedback.Ripple />
</PressableFeedback>
<Separator className="mx-4" />
<PressableFeedback>
<ListGroup.Item>
<ListGroup.ItemPrefix>
<IconWeixin size={22} />
</ListGroup.ItemPrefix>
<ListGroup.ItemContent>
<ListGroup.ItemTitle>微信</ListGroup.ItemTitle>
</ListGroup.ItemContent>
<ListGroup.ItemSuffix>
<Text className={`text-sm ${bindWechat ? "text-green-500" : "text-muted"}`}>
{bindWechat ? "已绑定" : "未绑定"}
</Text>
</ListGroup.ItemSuffix>
</ListGroup.Item>
<PressableFeedback.Ripple />
</PressableFeedback>
</ListGroup>
<Text className="text-sm text-muted mb-2 ml-2">其它</Text>
<ListGroup className="mb-6">
<PressableFeedback>
<ListGroup.Item>
<ListGroup.ItemPrefix>
<IconQq size={22} />
</ListGroup.ItemPrefix>
<ListGroup.ItemContent>
<ListGroup.ItemTitle>QQ</ListGroup.ItemTitle>
</ListGroup.ItemContent>
<ListGroup.ItemSuffix>
<Text className={`text-sm text-muted`}>注销账号</Text>
</ListGroup.ItemSuffix>
</ListGroup.Item>
<PressableFeedback.Ripple />
</PressableFeedback>
</ListGroup>
<View className="mt-2">
<Button
variant="danger"
onPress={() => {
setOpenLogout(true);
}}
>
<Button.Label>退出登录</Button.Label>
</Button>
</View>
</View>
</View>
</LayoutView.ScrollView>
</LayoutView>
<Dialog isOpen={openLogout} onOpenChange={setOpenLogout}>
<Dialog.Portal>
<Dialog.Overlay />
<Dialog.Content>
<View className="flex-row items-center justify-between">
<Dialog.Title>提示</Dialog.Title>
<Dialog.Close variant="ghost" />
</View>
<View className="my-2 gap-1.5">
<Dialog.Description>确认退出当前登录账号么？</Dialog.Description>
</View>
<View className="flex-row justify-end gap-3">
<Button variant="ghost" size="sm" onPress={() => setOpenLogout(false)}>
取消
</Button>
<Button size="sm" onPress={handleLogout}>
确认
</Button>
</View>
</Dialog.Content>
</Dialog.Portal>
</Dialog>
</PageLayout>
);
}