From d16737702b739d60555720ff171e626a22646931 Mon Sep 17 00:00:00 2001 From: BysevenOffical Date: Fri, 27 Mar 2026 15:04:16 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=9B=B4=E6=94=B9=E5=8C=85?= =?UTF-8?q?=E5=90=8D,=E5=A2=9E=E5=BC=BA=E5=90=8C=E7=B1=BB=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B9=8B=E9=97=B4=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=98=B2=E6=AD=A2=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E5=8C=85=E5=90=8D=E5=AD=98=E5=9C=A8=E7=94=A8=E6=88=B7=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E4=BA=8C=E9=80=89=E4=B8=80=E7=9A=84=E7=AA=98=E5=A2=83?= =?UTF-8?q?=201.=20=E4=B8=BA=E4=BA=86=E4=B8=8D=E8=AE=A9so=E7=82=B8?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E5=BF=85=E8=A6=81=E6=A8=A1=E7=BB=84=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=9C=A8=E6=97=A7=E5=8C=85=E5=90=8D=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E8=AF=B7=E5=8B=BF=E9=9A=8F=E6=84=8F=E7=A7=BB=E5=8A=A8=202.=20?= =?UTF-8?q?=E7=94=B1=E4=BA=8E=E6=9B=B4=E6=94=B9=E4=BA=86=E5=8C=85=E5=90=8D?= =?UTF-8?q?=EF=BC=8Cxp=E7=9A=84init=E8=B7=AF=E5=BE=84=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C`io.github.dragon813.sesame.hook.ApplicationH?= =?UTF-8?q?ook`=203.=20=E6=9B=B4=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84=E4=B8=BA=20`sesam?= =?UTF-8?q?e-GR`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +- app/src/main/AndroidManifest.xml | 16 +-- app/src/main/assets/xposed_init | 2 +- .../sesame/data/AppConfig.java | 8 +- .../sesame/data/ConfigV2.java | 10 +- .../sesame/data/Model.java | 10 +- .../sesame/data/ModelConfig.java | 4 +- .../sesame/data/ModelField.java | 10 +- .../sesame/data/ModelFields.java | 2 +- .../sesame/data/ModelGroup.java | 2 +- .../sesame/data/ModelType.java | 2 +- .../sesame/data/RunType.java | 2 +- .../sesame/data/RuntimeInfo.java | 8 +- .../sesame/data/TokenConfig.java | 14 +-- .../sesame/data/ViewAppInfo.java | 6 +- .../data/modelFieldExt/BooleanModelField.java | 4 +- .../data/modelFieldExt/ChoiceModelField.java | 8 +- .../data/modelFieldExt/EmptyModelField.java | 8 +- .../data/modelFieldExt/IntegerModelField.java | 10 +- .../data/modelFieldExt/ListModelField.java | 8 +- .../SelectAndCountModelField.java | 12 +- .../SelectAndCountOneModelField.java | 14 +-- .../data/modelFieldExt/SelectModelField.java | 12 +- .../modelFieldExt/SelectOneModelField.java | 12 +- .../data/modelFieldExt/StringModelField.java | 8 +- .../data/modelFieldExt/TextModelField.java | 10 +- .../common/SelectModelFieldFunc.java | 2 +- .../sesame/data/task/BaseTask.java | 6 +- .../sesame/data/task/ChildTaskExecutor.java | 2 +- .../sesame/data/task/ModelTask.java | 22 ++-- .../data/task/ProgramChildTaskExecutor.java | 6 +- .../data/task/SystemChildTaskExecutor.java | 8 +- .../sesame/entity/AlipayAnimal.java | 4 +- .../entity/AlipayAntFarmDoFarmTaskList.java | 5 +- .../AlipayAntFarmDrawMachineTaskList.java | 5 +- .../entity/AlipayAntForestHuntTaskList.java | 5 +- .../AlipayAntForestVitalityTaskList.java | 5 +- .../entity/AlipayAntMemberTaskList.java | 7 +- .../entity/AlipayAntOceanAntiepTaskList.java | 5 +- .../entity/AlipayAntOrchardTaskList.java | 5 +- .../entity/AlipayAntSportsTaskList.java | 7 +- .../sesame/entity/AlipayAntStallTaskList.java | 5 +- .../sesame/entity/AlipayBeach.java | 4 +- .../sesame/entity/AlipayForestHunt.java | 4 +- .../sesame/entity/AlipayMarathon.java | 4 +- .../AlipayMemberCreditSesameTaskList.java | 6 +- .../sesame/entity/AlipayNewAncientTree.java | 4 +- .../sesame/entity/AlipayPlantScene.java | 4 +- .../sesame/entity/AlipayReserve.java | 4 +- .../sesame/entity/AlipayTree.java | 4 +- .../sesame/entity/AlipayUser.java | 6 +- .../sesame/entity/AlipayVersion.java | 2 +- .../sesame/entity/AlipayrpcRequest.java | 5 +- .../sesame/entity/AreaCode.java | 6 +- .../sesame/entity/CollectEnergyEntity.java | 2 +- .../sesame/entity/CooperateUser.java | 4 +- .../sesame/entity/CustomOption.java | 2 +- .../sesame/entity/FarmOrnaments.java | 4 +- .../sesame/entity/FriendWatch.java | 6 +- .../sesame/entity/GameCenterMallItem.java | 4 +- .../sesame/entity/IdAndName.java | 4 +- .../sesame/entity/KVNode.java | 2 +- .../sesame/entity/MemberBenefit.java | 4 +- .../sesame/entity/PromiseSimpleTemplate.java | 4 +- .../sesame/entity/RpcEntity.java | 2 +- .../sesame/entity/UserEntity.java | 4 +- .../sesame/entity/VitalityBenefit.java | 4 +- .../sesame/entity/WalkPath.java | 4 +- .../sesame/hook/AlipayMiniMarkHandler.java | 5 +- .../sesame/hook/AlipayMiniMarkHelper.java | 4 +- .../sesame/hook/ApplicationHook.java | 73 ++++++------ .../sesame/hook/AuthCodeHandler.java | 4 +- .../sesame/hook/AuthCodeHelper.java | 4 +- .../sesame/hook/BaseCaptchaHandler.java | 8 +- .../sesame/hook/BaseHandler.java | 4 +- .../sesame/hook/Captcha1Handler.java | 2 +- .../sesame/hook/Captcha2Handler.java | 2 +- .../sesame/hook/CaptchaHook.java | 6 +- .../sesame/hook/CompatHelpers.java | 6 +- .../sesame/hook/DebugHandler.java | 4 +- .../sesame/hook/HttpHandler.java | 2 +- .../sesame/hook/ModuleHttpServer.java | 4 +- .../sesame/hook/ModuleHttpServerManager.java | 4 +- .../sesame/hook/MotionEventSimulator.java | 6 +- .../sesame/hook/RpcRequest.java | 2 +- .../sesame/hook/ServerCommon.java | 2 +- .../sesame/hook/SimplePageManager.java | 11 +- .../sesame/hook/SimpleViewImage.java | 6 +- .../sesame/hook/SimpleXpathParser.java | 28 ++--- .../sesame/hook/SlideCoordinates.java | 2 +- .../sesame/hook/Toast.java | 6 +- .../sesame/hook/ViewHierarchyAnalyzer.java | 4 +- .../sesame/hook/XpCompatEngine.java | 2 +- .../sesame/model/base/ModelOrder.java | 43 +++++++ .../sesame/model/base/TaskCommon.java | 6 +- .../model/common/rpcCall/BaseTaskRpcCall.java | 8 +- .../model/extensions/ExtensionsHandle.java | 24 ++-- .../sesame/model/extensions/TestRpc.java | 2 +- .../sesame/model/extensions/TestRpcCall.java | 4 +- .../model/normal/answerAI/AnswerAI.java | 20 ++-- .../normal/answerAI/AnswerAIInterface.java | 2 +- .../model/normal/answerAI/GeminiAI.java | 6 +- .../model/normal/answerAI/TongyiAI.java | 6 +- .../sesame/model/normal/base/BaseModel.java | 32 +++--- .../model/task/ancientTree/AncientTree.java | 24 ++-- .../task/ancientTree/AncientTreeRpcCall.java | 4 +- .../model/task/antBookRead/AntBookRead.java | 18 +-- .../task/antBookRead/AntBookReadRpcCall.java | 6 +- .../sesame/model/task/antDodo/AntDodo.java | 34 +++--- .../model/task/antDodo/AntDodoRpcCall.java | 6 +- .../sesame/model/task/antFarm/AntFarm.java | 53 ++++----- .../model/task/antFarm/AntFarmRpcCall.java | 12 +- .../model/task/antFarm/DadaDailyRpcCall.java | 4 +- .../task/antForest/AntForestRpcCall.java | 18 ++- .../model/task/antForest/AntForestV2.java | 106 +++++++++--------- .../model/task/antForest/EcoLifeRpcCall.java | 4 +- .../task/antForest/ForestChouChouLe.java | 19 ++-- .../antForest/GameIntervalCalculator.java | 4 +- .../task/antForest/GreenLifeRpcCall.java | 6 +- .../model/task/antForest/Privilege.java | 16 +-- .../model/task/antForest/WhackMole.java | 10 +- .../sesame/model/task/antGame/GameTask.java | 11 +- .../model/task/antMember/AntInsurance.java | 8 +- .../task/antMember/AntInsuranceRpcCall.java | 4 +- .../model/task/antMember/AntMember.java | 43 ++++--- .../task/antMember/AntMemberRpcCall.java | 8 +- .../model/task/antMember/MerchantService.java | 12 +- .../antMember/MerchantServiceRpcCall.java | 6 +- .../sesame/model/task/antOcean/AntOcean.java | 46 ++++---- .../model/task/antOcean/AntOceanRpcCall.java | 11 +- .../model/task/antOrchard/AntOrchard.java | 52 ++++----- .../task/antOrchard/AntOrchardRpcCall.java | 8 +- .../model/task/antSports/AntSports.java | 54 +++++---- .../task/antSports/AntSportsRpcCall.java | 8 +- .../sesame/model/task/antStall/AntStall.java | 35 +++--- .../model/task/antStall/AntStallRpcCall.java | 8 +- .../model/task/consumeGold/ConsumeGold.java | 14 +-- .../task/consumeGold/ConsumeGoldRpcCall.java | 4 +- .../model/task/greenFinance/GreenFinance.java | 20 ++-- .../greenFinance/GreenFinanceRpcCall.java | 8 +- .../model/task/omegakoiTown/OmegakoiTown.java | 14 +-- .../omegakoiTown/OmegakoiTownRpcCall.java | 4 +- .../task/protectEcology/CooperateRpcCall.java | 4 +- .../task/protectEcology/ProtectEcology.java | 40 +++---- .../protectEcology/ProtectOceanRpcCall.java | 6 +- .../protectEcology/ProtectTreeRpcCall.java | 4 +- .../model/task/readingDada/ReadingDada.java | 12 +- .../task/readingDada/ReadingDadaRpcCall.java | 6 +- .../sesame/rpc/bridge/NewRpcBridge.java | 18 +-- .../sesame/rpc/bridge/OldRpcBridge.java | 14 +-- .../sesame/rpc/bridge/RpcBridge.java | 4 +- .../sesame/rpc/bridge/RpcVersion.java | 2 +- .../intervallimit/DefaultIntervalLimit.java | 2 +- .../FixedOrRangeIntervalLimit.java | 2 +- .../rpc/intervallimit/IntervalLimit.java | 2 +- .../rpc/intervallimit/RpcIntervalLimit.java | 6 +- .../sesame/ui/BaseActivity.java | 8 +- .../sesame/ui/ChoiceDialog.java | 6 +- .../sesame/ui/ExtensionsActivity.java | 10 +- .../sesame/ui/HtmlViewerActivity.java | 9 +- .../sesame/ui/ListAdapter.java | 10 +- .../sesame/ui/ListDialog.java | 66 +++++------ .../sesame/ui/MainActivity.java | 32 +++--- .../sesame/ui/MyWebView.java | 3 +- .../sesame/ui/NewSettingsActivity.java | 102 +++++++++-------- .../sesame/ui/ObjReference.java | 2 +- .../sesame/ui/ObjSyncReference.java | 2 +- .../sesame/ui/OptionsAdapter.java | 2 +- .../sesame/ui/SettingsActivity.java | 17 +-- .../sesame/ui/StringDialog.java | 8 +- .../sesame/ui/WatermarkView.java | 4 +- .../sesame/ui/dto/ModelDto.java | 2 +- .../sesame/ui/dto/ModelFieldInfoDto.java | 4 +- .../sesame/ui/dto/ModelFieldShowDto.java | 4 +- .../sesame/ui/dto/ModelGroupDto.java | 2 +- .../sesame/util/AverageMath.java | 2 +- .../sesame/util/CircularFifoQueue.java | 2 +- .../sesame/util/ClassUtil.java | 2 +- .../sesame/util/FileUtil.java | 12 +- .../sesame/util/HanziToPinyin.java | 2 +- .../sesame/util/JsonUtil.java | 2 +- .../sesame/util/LanguageUtil.java | 4 +- .../sesame/util/ListUtil.java | 2 +- .../sesame/util/Log.java | 4 +- .../sesame/util/MessageUtil.java | 11 +- .../sesame/util/NotificationUtil.java | 6 +- .../sesame/util/PermissionUtil.java | 6 +- .../sesame/util/RandomUtil.java | 2 +- .../sesame/util/Statistics.java | 4 +- .../sesame/util/Status.java | 10 +- .../sesame/util/StringUtil.java | 2 +- .../sesame/util/ThreadUtil.java | 2 +- .../sesame/util/TimeUtil.java | 3 +- .../sesame/util/ToastUtil.java | 4 +- .../sesame/util/TypeUtil.java | 2 +- .../sesame/util/WatermarkUtil.java | 2 +- .../sesame/util/idMap/AnimalIdMap.java | 8 +- .../util/idMap/AntFarmDoFarmTaskListMap.java | 8 +- .../idMap/AntFarmDrawMachineTaskListMap.java | 8 +- .../util/idMap/AntForestHuntTaskListMap.java | 8 +- .../idMap/AntForestVitalityTaskListMap.java | 8 +- .../util/idMap/AntMemberTaskListMap.java | 8 +- .../util/idMap/AntOceanAntiepTaskListMap.java | 8 +- .../util/idMap/AntOrchardTaskListMap.java | 8 +- .../util/idMap/AntSportsTaskListMap.java | 8 +- .../util/idMap/AntStallTaskListMap.java | 8 +- .../sesame/util/idMap/BeachIdMap.java | 8 +- .../sesame/util/idMap/CooperationIdMap.java | 8 +- .../sesame/util/idMap/FarmOrnamentsIdMap.java | 8 +- .../sesame/util/idMap/ForestHuntIdMap.java | 8 +- .../util/idMap/GameCenterMallItemMap.java | 8 +- .../sesame/util/idMap/MarathonIdMap.java | 8 +- .../sesame/util/idMap/MemberBenefitIdMap.java | 8 +- .../idMap/MemberCreditSesameTaskListMap.java | 8 +- .../util/idMap/NewAncientTreeIdMap.java | 8 +- .../sesame/util/idMap/PlantSceneIdMap.java | 8 +- .../idMap/PromiseSimpleTemplateIdMap.java | 8 +- .../sesame/util/idMap/ReserveIdMap.java | 8 +- .../sesame/util/idMap/TreeIdMap.java | 8 +- .../sesame/util/idMap/UserIdMap.java | 12 +- .../util/idMap/VitalityBenefitIdMap.java | 8 +- .../sesame/util/idMap/WalkPathIdMap.java | 8 +- .../sesame/util/idMap/rpcRequestMap.java | 8 +- .../lazyimmortal/sesame/BuildConfig.java | 21 ++++ .../sesame/model/base/ModelOrder.java | 43 ------- .../lazyimmortal/sesame/util/LibraryUtil.java | 4 +- .../main/res/layout/activity_html_viewer.xml | 2 +- 227 files changed, 1115 insertions(+), 1161 deletions(-) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/AppConfig.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/ConfigV2.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/Model.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/ModelConfig.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/ModelField.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/ModelFields.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/ModelGroup.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/ModelType.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/RunType.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/RuntimeInfo.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/TokenConfig.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/ViewAppInfo.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/BooleanModelField.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/ChoiceModelField.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/EmptyModelField.java (90%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/IntegerModelField.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/ListModelField.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/SelectAndCountModelField.java (90%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/SelectAndCountOneModelField.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/SelectModelField.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/SelectOneModelField.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/StringModelField.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/TextModelField.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/modelFieldExt/common/SelectModelFieldFunc.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/task/BaseTask.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/task/ChildTaskExecutor.java (83%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/task/ModelTask.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/task/ProgramChildTaskExecutor.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/data/task/SystemChildTaskExecutor.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAnimal.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntFarmDoFarmTaskList.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntFarmDrawMachineTaskList.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntForestHuntTaskList.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntForestVitalityTaskList.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntMemberTaskList.java (74%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntOceanAntiepTaskList.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntOrchardTaskList.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntSportsTaskList.java (74%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayAntStallTaskList.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayBeach.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayForestHunt.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayMarathon.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayMemberCreditSesameTaskList.java (79%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayNewAncientTree.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayPlantScene.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayReserve.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayTree.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayUser.java (86%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayVersion.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AlipayrpcRequest.java (83%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/AreaCode.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/CollectEnergyEntity.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/CooperateUser.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/CustomOption.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/FarmOrnaments.java (83%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/FriendWatch.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/GameCenterMallItem.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/IdAndName.java (91%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/KVNode.java (85%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/MemberBenefit.java (83%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/PromiseSimpleTemplate.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/RpcEntity.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/UserEntity.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/VitalityBenefit.java (83%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/entity/WalkPath.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/AlipayMiniMarkHandler.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/AlipayMiniMarkHelper.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/ApplicationHook.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/AuthCodeHandler.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/AuthCodeHelper.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/BaseCaptchaHandler.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/BaseHandler.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/Captcha1Handler.java (90%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/Captcha2Handler.java (90%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/CaptchaHook.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/CompatHelpers.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/DebugHandler.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/HttpHandler.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/ModuleHttpServer.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/ModuleHttpServerManager.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/MotionEventSimulator.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/RpcRequest.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/ServerCommon.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/SimplePageManager.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/SimpleViewImage.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/SimpleXpathParser.java (75%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/SlideCoordinates.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/Toast.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/ViewHierarchyAnalyzer.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/hook/XpCompatEngine.java (94%) create mode 100644 app/src/main/java/io/github/dragon813/sesame/model/base/ModelOrder.java rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/base/TaskCommon.java (77%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/common/rpcCall/BaseTaskRpcCall.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/extensions/ExtensionsHandle.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/extensions/TestRpc.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/extensions/TestRpcCall.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/normal/answerAI/AnswerAI.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/normal/answerAI/AnswerAIInterface.java (91%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/normal/answerAI/GeminiAI.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/normal/answerAI/TongyiAI.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/normal/base/BaseModel.java (90%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/ancientTree/AncientTree.java (90%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/ancientTree/AncientTreeRpcCall.java (93%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antBookRead/AntBookRead.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antBookRead/AntBookReadRpcCall.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antDodo/AntDodo.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antDodo/AntDodoRpcCall.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antFarm/AntFarm.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antFarm/AntFarmRpcCall.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antFarm/DadaDailyRpcCall.java (85%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/AntForestRpcCall.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/AntForestV2.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/EcoLifeRpcCall.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/ForestChouChouLe.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/GameIntervalCalculator.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/GreenLifeRpcCall.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/Privilege.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antForest/WhackMole.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antGame/GameTask.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antMember/AntInsurance.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antMember/AntInsuranceRpcCall.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antMember/AntMember.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antMember/AntMemberRpcCall.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antMember/MerchantService.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antMember/MerchantServiceRpcCall.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antOcean/AntOcean.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antOcean/AntOceanRpcCall.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antOrchard/AntOrchard.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antOrchard/AntOrchardRpcCall.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antSports/AntSports.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antSports/AntSportsRpcCall.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antStall/AntStall.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/antStall/AntStallRpcCall.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/consumeGold/ConsumeGold.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/consumeGold/ConsumeGoldRpcCall.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/greenFinance/GreenFinance.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/greenFinance/GreenFinanceRpcCall.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/omegakoiTown/OmegakoiTown.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/omegakoiTown/OmegakoiTownRpcCall.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/protectEcology/CooperateRpcCall.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/protectEcology/ProtectEcology.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/protectEcology/ProtectOceanRpcCall.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/protectEcology/ProtectTreeRpcCall.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/readingDada/ReadingDada.java (85%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/model/task/readingDada/ReadingDadaRpcCall.java (84%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/bridge/NewRpcBridge.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/bridge/OldRpcBridge.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/bridge/RpcBridge.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/bridge/RpcVersion.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/intervallimit/DefaultIntervalLimit.java (81%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/intervallimit/FixedOrRangeIntervalLimit.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/intervallimit/IntervalLimit.java (66%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/rpc/intervallimit/RpcIntervalLimit.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/BaseActivity.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/ChoiceDialog.java (77%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/ExtensionsActivity.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/HtmlViewerActivity.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/ListAdapter.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/ListDialog.java (91%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/MainActivity.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/MyWebView.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/NewSettingsActivity.java (86%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/ObjReference.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/ObjSyncReference.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/OptionsAdapter.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/SettingsActivity.java (96%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/StringDialog.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/WatermarkView.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/dto/ModelDto.java (92%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/dto/ModelFieldInfoDto.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/dto/ModelFieldShowDto.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/ui/dto/ModelGroupDto.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/AverageMath.java (94%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/CircularFifoQueue.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/ClassUtil.java (91%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/FileUtil.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/HanziToPinyin.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/JsonUtil.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/LanguageUtil.java (89%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/ListUtil.java (90%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/Log.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/MessageUtil.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/NotificationUtil.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/PermissionUtil.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/RandomUtil.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/Statistics.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/Status.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/StringUtil.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/ThreadUtil.java (97%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/TimeUtil.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/ToastUtil.java (83%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/TypeUtil.java (99%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/WatermarkUtil.java (98%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AnimalIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntFarmDoFarmTaskListMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntFarmDrawMachineTaskListMap.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntForestHuntTaskListMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntForestVitalityTaskListMap.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntMemberTaskListMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntOceanAntiepTaskListMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntOrchardTaskListMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntSportsTaskListMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/AntStallTaskListMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/BeachIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/CooperationIdMap.java (86%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/FarmOrnamentsIdMap.java (86%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/ForestHuntIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/GameCenterMallItemMap.java (86%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/MarathonIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/MemberBenefitIdMap.java (86%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/MemberCreditSesameTaskListMap.java (88%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/NewAncientTreeIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/PlantSceneIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/PromiseSimpleTemplateIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/ReserveIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/TreeIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/UserIdMap.java (95%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/VitalityBenefitIdMap.java (86%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/WalkPathIdMap.java (87%) rename app/src/main/java/io/github/{lazyimmortal => dragon813}/sesame/util/idMap/rpcRequestMap.java (87%) create mode 100644 app/src/main/java/io/github/lazyimmortal/sesame/BuildConfig.java delete mode 100644 app/src/main/java/io/github/lazyimmortal/sesame/model/base/ModelOrder.java diff --git a/app/build.gradle b/app/build.gradle index 790d3b04..a42aa2c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,9 +19,9 @@ android { def buildTime = new Date().format("yyyy-MM-dd HH:mm:ss", TimeZone.getTimeZone("Asia/Shanghai")) compileSdk 34 - namespace 'io.github.lazyimmortal.sesame' + namespace 'io.github.dragon813.sesame' defaultConfig { - applicationId "io.github.lazyimmortal.sesame" + applicationId "io.github.dragon813.sesame" minSdk 21 //noinspection ExpiredTargetSdkVersion targetSdk 34 @@ -54,6 +54,7 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.debug } } applicationVariants.configureEach { variant -> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1cb285da..19326adb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="io.github.dragon813.sesame"> @@ -40,7 +40,7 @@ @@ -53,7 +53,7 @@ android:name=".ui.MainActivityAlias" android:enabled="true" android:exported="true" - android:targetActivity="io.github.lazyimmortal.sesame.ui.MainActivity"> + android:targetActivity="io.github.dragon813.sesame.ui.MainActivity"> @@ -61,28 +61,28 @@ diff --git a/app/src/main/assets/xposed_init b/app/src/main/assets/xposed_init index 1157f07b..830e0e26 100644 --- a/app/src/main/assets/xposed_init +++ b/app/src/main/assets/xposed_init @@ -1 +1 @@ -io.github.lazyimmortal.sesame.hook.ApplicationHook +io.github.dragon813.sesame.hook.ApplicationHook diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/AppConfig.java b/app/src/main/java/io/github/dragon813/sesame/data/AppConfig.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/AppConfig.java rename to app/src/main/java/io/github/dragon813/sesame/data/AppConfig.java index 98998b74..88d3c721 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/AppConfig.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/AppConfig.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import android.annotation.SuppressLint; import android.app.Application; @@ -6,9 +6,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonMappingException; import lombok.Data; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; import java.io.File; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/ConfigV2.java b/app/src/main/java/io/github/dragon813/sesame/data/ConfigV2.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/ConfigV2.java rename to app/src/main/java/io/github/dragon813/sesame/data/ConfigV2.java index 8f73292e..ce7ba9d5 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/ConfigV2.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/ConfigV2.java @@ -1,12 +1,12 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.UserEntity; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.UserEntity; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.io.File; import java.util.HashMap; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/Model.java b/app/src/main/java/io/github/dragon813/sesame/data/Model.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/Model.java rename to app/src/main/java/io/github/dragon813/sesame/data/Model.java index f04963e1..2b56385a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/Model.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/Model.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -11,10 +11,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.model.base.ModelOrder; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.model.base.ModelOrder; +import io.github.dragon813.sesame.util.Log; import lombok.Getter; public abstract class Model { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelConfig.java b/app/src/main/java/io/github/dragon813/sesame/data/ModelConfig.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/ModelConfig.java rename to app/src/main/java/io/github/dragon813/sesame/data/ModelConfig.java index 360a783e..1f122bc1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelConfig.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/ModelConfig.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import lombok.Data; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; import java.io.Serializable; import java.util.Map; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/ModelField.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/ModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/ModelField.java index 87748f95..134722ab 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/ModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import android.content.Context; import android.view.Gravity; @@ -15,10 +15,10 @@ import java.lang.reflect.Type; import java.util.Objects; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.ToastUtil; -import io.github.lazyimmortal.sesame.util.TypeUtil; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.ToastUtil; +import io.github.dragon813.sesame.util.TypeUtil; import lombok.Data; @Data diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelFields.java b/app/src/main/java/io/github/dragon813/sesame/data/ModelFields.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/ModelFields.java rename to app/src/main/java/io/github/dragon813/sesame/data/ModelFields.java index 8833b3f9..034daa00 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelFields.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/ModelFields.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import java.util.LinkedHashMap; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelGroup.java b/app/src/main/java/io/github/dragon813/sesame/data/ModelGroup.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/ModelGroup.java rename to app/src/main/java/io/github/dragon813/sesame/data/ModelGroup.java index 34f8926b..8f96c4ce 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelGroup.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/ModelGroup.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import lombok.Getter; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelType.java b/app/src/main/java/io/github/dragon813/sesame/data/ModelType.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/ModelType.java rename to app/src/main/java/io/github/dragon813/sesame/data/ModelType.java index 482ea297..8f458026 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/ModelType.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/ModelType.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/RunType.java b/app/src/main/java/io/github/dragon813/sesame/data/RunType.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/RunType.java rename to app/src/main/java/io/github/dragon813/sesame/data/RunType.java index 683f32bf..47332bec 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/RunType.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/RunType.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/RuntimeInfo.java b/app/src/main/java/io/github/dragon813/sesame/data/RuntimeInfo.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/RuntimeInfo.java rename to app/src/main/java/io/github/dragon813/sesame/data/RuntimeInfo.java index 6bde6d76..f8de3b89 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/RuntimeInfo.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/RuntimeInfo.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import org.json.JSONException; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.Objects; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/TokenConfig.java b/app/src/main/java/io/github/dragon813/sesame/data/TokenConfig.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/TokenConfig.java rename to app/src/main/java/io/github/dragon813/sesame/data/TokenConfig.java index b09a04fd..97dd4991 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/TokenConfig.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/TokenConfig.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import android.os.Build; @@ -19,12 +19,12 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.TimeUtil; import lombok.Data; @Data diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/ViewAppInfo.java b/app/src/main/java/io/github/dragon813/sesame/data/ViewAppInfo.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/ViewAppInfo.java rename to app/src/main/java/io/github/dragon813/sesame/data/ViewAppInfo.java index b7ca1e74..7f1e3c26 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/ViewAppInfo.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/ViewAppInfo.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data; +package io.github.dragon813.sesame.data; import android.content.ContentResolver; import android.content.Context; @@ -9,8 +9,8 @@ import android.os.Bundle; import lombok.Getter; import lombok.Setter; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.util.Log; public final class ViewAppInfo { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/BooleanModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/BooleanModelField.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/BooleanModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/BooleanModelField.java index e9b6d8ff..4ac9a1c1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/BooleanModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/BooleanModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; @@ -6,7 +6,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.Switch; -import io.github.lazyimmortal.sesame.data.ModelField; +import io.github.dragon813.sesame.data.ModelField; public class BooleanModelField extends ModelField { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/ChoiceModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/ChoiceModelField.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/ChoiceModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/ChoiceModelField.java index 6c4672b1..3056e63e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/ChoiceModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/ChoiceModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; @@ -10,9 +10,9 @@ import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.ui.ChoiceDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.ui.ChoiceDialog; public class ChoiceModelField extends ModelField { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/EmptyModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/EmptyModelField.java similarity index 90% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/EmptyModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/EmptyModelField.java index 788b80c4..3571faad 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/EmptyModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/EmptyModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.app.AlertDialog; import android.content.Context; @@ -12,9 +12,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.util.ToastUtil; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.util.ToastUtil; public class EmptyModelField extends ModelField { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/IntegerModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/IntegerModelField.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/IntegerModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/IntegerModelField.java index d88a1bb1..466cf3c2 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/IntegerModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/IntegerModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; @@ -11,10 +11,10 @@ import androidx.core.content.ContextCompat; import lombok.Getter; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.ui.StringDialog; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.ui.StringDialog; +import io.github.dragon813.sesame.util.Log; @Getter public class IntegerModelField extends ModelField { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/ListModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/ListModelField.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/ListModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/ListModelField.java index 232ec8ef..05d43f4e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/ListModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/ListModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; import android.view.Gravity; @@ -10,9 +10,9 @@ import androidx.core.content.ContextCompat; import com.fasterxml.jackson.core.type.TypeReference; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.ui.StringDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.ui.StringDialog; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectAndCountModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectAndCountModelField.java similarity index 90% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectAndCountModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectAndCountModelField.java index e4234532..e8b1112c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectAndCountModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectAndCountModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; @@ -10,11 +10,11 @@ import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.entity.IdAndName; -import io.github.lazyimmortal.sesame.ui.ListDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.entity.IdAndName; +import io.github.dragon813.sesame.ui.ListDialog; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectAndCountOneModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectAndCountOneModelField.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectAndCountOneModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectAndCountOneModelField.java index 5487053d..964af570 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectAndCountOneModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectAndCountOneModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; import android.view.Gravity; @@ -9,12 +9,12 @@ import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.entity.IdAndName; -import io.github.lazyimmortal.sesame.entity.KVNode; -import io.github.lazyimmortal.sesame.ui.ListDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.entity.IdAndName; +import io.github.dragon813.sesame.entity.KVNode; +import io.github.dragon813.sesame.ui.ListDialog; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectModelField.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectModelField.java index 28182823..5fd95a79 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; @@ -10,11 +10,11 @@ import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.entity.IdAndName; -import io.github.lazyimmortal.sesame.ui.ListDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.entity.IdAndName; +import io.github.dragon813.sesame.ui.ListDialog; import java.util.List; import java.util.Set; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectOneModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectOneModelField.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectOneModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectOneModelField.java index 88c5ee68..43920c70 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/SelectOneModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/SelectOneModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; import android.view.Gravity; @@ -9,11 +9,11 @@ import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.entity.IdAndName; -import io.github.lazyimmortal.sesame.ui.ListDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.entity.IdAndName; +import io.github.dragon813.sesame.ui.ListDialog; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/StringModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/StringModelField.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/StringModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/StringModelField.java index 30c82923..e29eeccd 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/StringModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/StringModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; @@ -10,9 +10,9 @@ import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.ui.StringDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.ui.StringDialog; public class StringModelField extends ModelField { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/TextModelField.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/TextModelField.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/TextModelField.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/TextModelField.java index 89936bf4..57f8b6cb 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/TextModelField.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/TextModelField.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt; +package io.github.dragon813.sesame.data.modelFieldExt; import android.content.Context; @@ -13,10 +13,10 @@ import androidx.core.content.ContextCompat; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.ui.HtmlViewerActivity; -import io.github.lazyimmortal.sesame.ui.StringDialog; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.ui.HtmlViewerActivity; +import io.github.dragon813.sesame.ui.StringDialog; public class TextModelField extends ModelField { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/common/SelectModelFieldFunc.java b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/common/SelectModelFieldFunc.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/common/SelectModelFieldFunc.java rename to app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/common/SelectModelFieldFunc.java index 375ed8b3..edfdf910 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/modelFieldExt/common/SelectModelFieldFunc.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/modelFieldExt/common/SelectModelFieldFunc.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.modelFieldExt.common; +package io.github.dragon813.sesame.data.modelFieldExt.common; import java.util.LinkedHashMap; import java.util.Map; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/BaseTask.java b/app/src/main/java/io/github/dragon813/sesame/data/task/BaseTask.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/task/BaseTask.java rename to app/src/main/java/io/github/dragon813/sesame/data/task/BaseTask.java index 5a2ad7b5..0360e5c1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/BaseTask.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/task/BaseTask.java @@ -1,9 +1,9 @@ -package io.github.lazyimmortal.sesame.data.task; +package io.github.dragon813.sesame.data.task; import android.os.Build; import lombok.Getter; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.ThreadUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.ThreadUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/ChildTaskExecutor.java b/app/src/main/java/io/github/dragon813/sesame/data/task/ChildTaskExecutor.java similarity index 83% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/task/ChildTaskExecutor.java rename to app/src/main/java/io/github/dragon813/sesame/data/task/ChildTaskExecutor.java index f02fae04..bb6a9a8e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/ChildTaskExecutor.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/task/ChildTaskExecutor.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.data.task; +package io.github.dragon813.sesame.data.task; public interface ChildTaskExecutor { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/ModelTask.java b/app/src/main/java/io/github/dragon813/sesame/data/task/ModelTask.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/task/ModelTask.java rename to app/src/main/java/io/github/dragon813/sesame/data/task/ModelTask.java index fd8f03d3..72bc806b 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/ModelTask.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/task/ModelTask.java @@ -1,19 +1,19 @@ -package io.github.lazyimmortal.sesame.data.task; +package io.github.dragon813.sesame.data.task; -import static io.github.lazyimmortal.sesame.model.normal.base.BaseModel.taskRpcRequest; +import static io.github.dragon813.sesame.model.normal.base.BaseModel.taskRpcRequest; import android.os.Build; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import lombok.Getter; -import io.github.lazyimmortal.sesame.data.Model; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelType; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.StringUtil; +import io.github.dragon813.sesame.data.Model; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelType; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.StringUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/ProgramChildTaskExecutor.java b/app/src/main/java/io/github/dragon813/sesame/data/task/ProgramChildTaskExecutor.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/task/ProgramChildTaskExecutor.java rename to app/src/main/java/io/github/dragon813/sesame/data/task/ProgramChildTaskExecutor.java index 2924a383..64c7d84d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/ProgramChildTaskExecutor.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/task/ProgramChildTaskExecutor.java @@ -1,8 +1,8 @@ -package io.github.lazyimmortal.sesame.data.task; +package io.github.dragon813.sesame.data.task; import android.os.Build; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.ThreadUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.ThreadUtil; import java.util.Map; import java.util.concurrent.*; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/SystemChildTaskExecutor.java b/app/src/main/java/io/github/dragon813/sesame/data/task/SystemChildTaskExecutor.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/data/task/SystemChildTaskExecutor.java rename to app/src/main/java/io/github/dragon813/sesame/data/task/SystemChildTaskExecutor.java index c133fb68..f182d4fb 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/data/task/SystemChildTaskExecutor.java +++ b/app/src/main/java/io/github/dragon813/sesame/data/task/SystemChildTaskExecutor.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.data.task; +package io.github.dragon813.sesame.data.task; import android.os.Build; import android.os.Handler; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.ThreadUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.ThreadUtil; import java.util.Map; import java.util.concurrent.*; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAnimal.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAnimal.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAnimal.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAnimal.java index 690de209..77a4797e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAnimal.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAnimal.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; -import io.github.lazyimmortal.sesame.util.idMap.AnimalIdMap; +import io.github.dragon813.sesame.util.idMap.AnimalIdMap; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntFarmDoFarmTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntFarmDoFarmTaskList.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntFarmDoFarmTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntFarmDoFarmTaskList.java index 42cae411..654c2989 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntFarmDoFarmTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntFarmDoFarmTaskList.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDoFarmTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntFarmDoFarmTaskListMap; public class AlipayAntFarmDoFarmTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntFarmDrawMachineTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntFarmDrawMachineTaskList.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntFarmDrawMachineTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntFarmDrawMachineTaskList.java index a750d34b..a6c9f25d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntFarmDrawMachineTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntFarmDrawMachineTaskList.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDrawMachineTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntFarmDrawMachineTaskListMap; public class AlipayAntFarmDrawMachineTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntForestHuntTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntForestHuntTaskList.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntForestHuntTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntForestHuntTaskList.java index 344cf965..f9c0845b 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntForestHuntTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntForestHuntTaskList.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntForestHuntTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntForestHuntTaskListMap; public class AlipayAntForestHuntTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntForestVitalityTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntForestVitalityTaskList.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntForestVitalityTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntForestVitalityTaskList.java index c0bd353d..3334bb58 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntForestVitalityTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntForestVitalityTaskList.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntForestVitalityTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntForestVitalityTaskListMap; public class AlipayAntForestVitalityTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntMemberTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntMemberTaskList.java similarity index 74% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntMemberTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntMemberTaskList.java index 1ddac119..ce57b9a9 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntMemberTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntMemberTaskList.java @@ -1,13 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntMemberTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.ForestHuntIdMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberCreditSesameTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntMemberTaskListMap; public class AlipayAntMemberTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntOceanAntiepTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntOceanAntiepTaskList.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntOceanAntiepTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntOceanAntiepTaskList.java index 3aa519fc..3cb3f8d5 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntOceanAntiepTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntOceanAntiepTaskList.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntOceanAntiepTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntOceanAntiepTaskListMap; public class AlipayAntOceanAntiepTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntOrchardTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntOrchardTaskList.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntOrchardTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntOrchardTaskList.java index a8badd5d..b226c92d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntOrchardTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntOrchardTaskList.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntOrchardTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntOrchardTaskListMap; public class AlipayAntOrchardTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntSportsTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntSportsTaskList.java similarity index 74% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntSportsTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntSportsTaskList.java index 4938c59f..045abd4f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntSportsTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntSportsTaskList.java @@ -1,13 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntSportsTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.ForestHuntIdMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberCreditSesameTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntSportsTaskListMap; public class AlipayAntSportsTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntStallTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntStallTaskList.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntStallTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntStallTaskList.java index 9bc7109e..f2d71fc1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayAntStallTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayAntStallTaskList.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.AntStallTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntStallTaskListMap; public class AlipayAntStallTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayBeach.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayBeach.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayBeach.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayBeach.java index f1e4ee2f..112fe722 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayBeach.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayBeach.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; -import io.github.lazyimmortal.sesame.util.idMap.BeachIdMap; +import io.github.dragon813.sesame.util.idMap.BeachIdMap; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayForestHunt.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayForestHunt.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayForestHunt.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayForestHunt.java index 6e1ede4d..04bdac01 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayForestHunt.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayForestHunt.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.idMap.ForestHuntIdMap; +import io.github.dragon813.sesame.util.idMap.ForestHuntIdMap; public class AlipayForestHunt extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayMarathon.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayMarathon.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayMarathon.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayMarathon.java index 61454ada..6f48ca3a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayMarathon.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayMarathon.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.MarathonIdMap; +import io.github.dragon813.sesame.util.idMap.MarathonIdMap; public class AlipayMarathon extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayMemberCreditSesameTaskList.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayMemberCreditSesameTaskList.java similarity index 79% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayMemberCreditSesameTaskList.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayMemberCreditSesameTaskList.java index f81b3150..65f4e911 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayMemberCreditSesameTaskList.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayMemberCreditSesameTaskList.java @@ -1,12 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.ForestHuntIdMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberCreditSesameTaskListMap; +import io.github.dragon813.sesame.util.idMap.MemberCreditSesameTaskListMap; public class AlipayMemberCreditSesameTaskList extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayNewAncientTree.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayNewAncientTree.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayNewAncientTree.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayNewAncientTree.java index f3d90afc..9323bf32 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayNewAncientTree.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayNewAncientTree.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.NewAncientTreeIdMap; +import io.github.dragon813.sesame.util.idMap.NewAncientTreeIdMap; public class AlipayNewAncientTree extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayPlantScene.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayPlantScene.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayPlantScene.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayPlantScene.java index 1c47368e..52e2d725 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayPlantScene.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayPlantScene.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.idMap.PlantSceneIdMap; +import io.github.dragon813.sesame.util.idMap.PlantSceneIdMap; public class AlipayPlantScene extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayReserve.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayReserve.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayReserve.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayReserve.java index 0852bca5..37eb4fdc 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayReserve.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayReserve.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; -import io.github.lazyimmortal.sesame.util.idMap.ReserveIdMap; +import io.github.dragon813.sesame.util.idMap.ReserveIdMap; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayTree.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayTree.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayTree.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayTree.java index a447f40b..bc050a00 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayTree.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayTree.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.TreeIdMap; +import io.github.dragon813.sesame.util.idMap.TreeIdMap; public class AlipayTree extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayUser.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayUser.java similarity index 86% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayUser.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayUser.java index c5b8207d..9a1743d2 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayUser.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayUser.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayVersion.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayVersion.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayVersion.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayVersion.java index d6cbfad7..34551264 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayVersion.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayVersion.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import lombok.Getter; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayrpcRequest.java b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayrpcRequest.java similarity index 83% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayrpcRequest.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AlipayrpcRequest.java index 467ee497..12c37356 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AlipayrpcRequest.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AlipayrpcRequest.java @@ -1,11 +1,10 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.util.idMap.PlantSceneIdMap; -import io.github.lazyimmortal.sesame.util.idMap.rpcRequestMap; +import io.github.dragon813.sesame.util.idMap.rpcRequestMap; public class AlipayrpcRequest extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AreaCode.java b/app/src/main/java/io/github/dragon813/sesame/entity/AreaCode.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/AreaCode.java rename to app/src/main/java/io/github/dragon813/sesame/entity/AreaCode.java index e9bad22b..44b17ee1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/AreaCode.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/AreaCode.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import org.json.JSONArray; import org.json.JSONException; @@ -7,8 +7,8 @@ import java.util.ArrayList; import java.util.List; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.Log; public class AreaCode extends IdAndName { private static final String TAG = AreaCode.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/CollectEnergyEntity.java b/app/src/main/java/io/github/dragon813/sesame/entity/CollectEnergyEntity.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/CollectEnergyEntity.java rename to app/src/main/java/io/github/dragon813/sesame/entity/CollectEnergyEntity.java index 318913b3..5fe91fac 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/CollectEnergyEntity.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/CollectEnergyEntity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import lombok.Getter; import lombok.Setter; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/CooperateUser.java b/app/src/main/java/io/github/dragon813/sesame/entity/CooperateUser.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/CooperateUser.java rename to app/src/main/java/io/github/dragon813/sesame/entity/CooperateUser.java index b21acef2..1aac4d8e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/CooperateUser.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/CooperateUser.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; -import io.github.lazyimmortal.sesame.util.idMap.CooperationIdMap; +import io.github.dragon813.sesame.util.idMap.CooperationIdMap; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/CustomOption.java b/app/src/main/java/io/github/dragon813/sesame/entity/CustomOption.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/CustomOption.java rename to app/src/main/java/io/github/dragon813/sesame/entity/CustomOption.java index e130e4dc..a0fc4d7c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/CustomOption.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/CustomOption.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/FarmOrnaments.java b/app/src/main/java/io/github/dragon813/sesame/entity/FarmOrnaments.java similarity index 83% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/FarmOrnaments.java rename to app/src/main/java/io/github/dragon813/sesame/entity/FarmOrnaments.java index 57b72d25..020e6fd7 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/FarmOrnaments.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/FarmOrnaments.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.FarmOrnamentsIdMap; +import io.github.dragon813.sesame.util.idMap.FarmOrnamentsIdMap; public class FarmOrnaments extends IdAndName{ diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/FriendWatch.java b/app/src/main/java/io/github/dragon813/sesame/entity/FriendWatch.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/FriendWatch.java rename to app/src/main/java/io/github/dragon813/sesame/entity/FriendWatch.java index d4ce4957..417a6a8b 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/FriendWatch.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/FriendWatch.java @@ -1,9 +1,9 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import org.json.JSONException; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.ArrayList; import java.util.Calendar; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/GameCenterMallItem.java b/app/src/main/java/io/github/dragon813/sesame/entity/GameCenterMallItem.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/GameCenterMallItem.java rename to app/src/main/java/io/github/dragon813/sesame/entity/GameCenterMallItem.java index 298a4d18..d7b26ed4 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/GameCenterMallItem.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/GameCenterMallItem.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.GameCenterMallItemMap; +import io.github.dragon813.sesame.util.idMap.GameCenterMallItemMap; public class GameCenterMallItem extends IdAndName { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/IdAndName.java b/app/src/main/java/io/github/dragon813/sesame/entity/IdAndName.java similarity index 91% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/IdAndName.java rename to app/src/main/java/io/github/dragon813/sesame/entity/IdAndName.java index 9651829c..ca9bfd26 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/IdAndName.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/IdAndName.java @@ -1,8 +1,8 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; -import io.github.lazyimmortal.sesame.util.HanziToPinyin; +import io.github.dragon813.sesame.util.HanziToPinyin; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/KVNode.java b/app/src/main/java/io/github/dragon813/sesame/entity/KVNode.java similarity index 85% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/KVNode.java rename to app/src/main/java/io/github/dragon813/sesame/entity/KVNode.java index 15ace225..e89a29fb 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/KVNode.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/KVNode.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.io.Serializable; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/MemberBenefit.java b/app/src/main/java/io/github/dragon813/sesame/entity/MemberBenefit.java similarity index 83% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/MemberBenefit.java rename to app/src/main/java/io/github/dragon813/sesame/entity/MemberBenefit.java index f41e426f..6c7ad86c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/MemberBenefit.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/MemberBenefit.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.MemberBenefitIdMap; +import io.github.dragon813.sesame.util.idMap.MemberBenefitIdMap; public class MemberBenefit extends IdAndName { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/PromiseSimpleTemplate.java b/app/src/main/java/io/github/dragon813/sesame/entity/PromiseSimpleTemplate.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/PromiseSimpleTemplate.java rename to app/src/main/java/io/github/dragon813/sesame/entity/PromiseSimpleTemplate.java index 93a284ba..4d851dcc 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/PromiseSimpleTemplate.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/PromiseSimpleTemplate.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.PromiseSimpleTemplateIdMap; +import io.github.dragon813.sesame.util.idMap.PromiseSimpleTemplateIdMap; public class PromiseSimpleTemplate extends IdAndName { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/RpcEntity.java b/app/src/main/java/io/github/dragon813/sesame/entity/RpcEntity.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/RpcEntity.java rename to app/src/main/java/io/github/dragon813/sesame/entity/RpcEntity.java index cc83d082..90d7d2fa 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/RpcEntity.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/RpcEntity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import lombok.Getter; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/UserEntity.java b/app/src/main/java/io/github/dragon813/sesame/entity/UserEntity.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/UserEntity.java rename to app/src/main/java/io/github/dragon813/sesame/entity/UserEntity.java index 5ca56986..eaf2de89 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/UserEntity.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/UserEntity.java @@ -1,8 +1,8 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import lombok.Data; import lombok.Getter; -import io.github.lazyimmortal.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.StringUtil; @Getter public class UserEntity { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/VitalityBenefit.java b/app/src/main/java/io/github/dragon813/sesame/entity/VitalityBenefit.java similarity index 83% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/VitalityBenefit.java rename to app/src/main/java/io/github/dragon813/sesame/entity/VitalityBenefit.java index f2310013..754fe42a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/VitalityBenefit.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/VitalityBenefit.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.VitalityBenefitIdMap; +import io.github.dragon813.sesame.util.idMap.VitalityBenefitIdMap; public class VitalityBenefit extends IdAndName { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/entity/WalkPath.java b/app/src/main/java/io/github/dragon813/sesame/entity/WalkPath.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/entity/WalkPath.java rename to app/src/main/java/io/github/dragon813/sesame/entity/WalkPath.java index a2d27a0c..b9219dd5 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/entity/WalkPath.java +++ b/app/src/main/java/io/github/dragon813/sesame/entity/WalkPath.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.entity; +package io.github.dragon813.sesame.entity; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import io.github.lazyimmortal.sesame.util.idMap.WalkPathIdMap; +import io.github.dragon813.sesame.util.idMap.WalkPathIdMap; public class WalkPath extends IdAndName { private static List list; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AlipayMiniMarkHandler.java b/app/src/main/java/io/github/dragon813/sesame/hook/AlipayMiniMarkHandler.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/AlipayMiniMarkHandler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/AlipayMiniMarkHandler.java index 2de34da6..eca2d056 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AlipayMiniMarkHandler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/AlipayMiniMarkHandler.java @@ -1,6 +1,5 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; -import io.github.lazyimmortal.sesame.hook.AlipayMiniMarkHelper; import fi.iki.elonen.NanoHTTPD; import java.util.Map; @@ -8,7 +7,7 @@ * 支付宝小程序标记处理器 * 提供获取支付宝小程序标记的接口（对应原Kotlin的AlipayMiniMarkHandler） */ -public class AlipayMiniMarkHandler implements io.github.lazyimmortal.sesame.hook.HttpHandler { +public class AlipayMiniMarkHandler implements io.github.dragon813.sesame.hook.HttpHandler { /** * 处理HTTP请求 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AlipayMiniMarkHelper.java b/app/src/main/java/io/github/dragon813/sesame/hook/AlipayMiniMarkHelper.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/AlipayMiniMarkHelper.java rename to app/src/main/java/io/github/dragon813/sesame/hook/AlipayMiniMarkHelper.java index 68e7a372..9b28e0ce 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AlipayMiniMarkHelper.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/AlipayMiniMarkHelper.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import de.robv.android.xposed.XposedHelpers; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.Log; /** * 支付宝小程序游戏获取alipayminimark diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ApplicationHook.java b/app/src/main/java/io/github/dragon813/sesame/hook/ApplicationHook.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/ApplicationHook.java rename to app/src/main/java/io/github/dragon813/sesame/hook/ApplicationHook.java index 6f5c4730..a4b5b745 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ApplicationHook.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/ApplicationHook.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; -import static io.github.lazyimmortal.sesame.hook.SimplePageManager.addHandler; -import static io.github.lazyimmortal.sesame.hook.SimplePageManager.enableWindowMonitoring; +import static io.github.dragon813.sesame.hook.SimplePageManager.addHandler; +import static io.github.dragon813.sesame.hook.SimplePageManager.enableWindowMonitoring; import android.annotation.SuppressLint; import android.app.Activity; @@ -15,19 +15,15 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Build; -import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import android.app.AlertDialog; import de.robv.android.xposed.XC_MethodHook; -import androidx.fragment.app.Fragment; - import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.callbacks.XC_LoadPackage; @@ -47,41 +43,38 @@ import java.util.concurrent.atomic.AtomicInteger; import de.robv.android.xposed.IXposedHookLoadPackage; -import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XC_MethodReplacement; -import de.robv.android.xposed.XposedHelpers; -import de.robv.android.xposed.callbacks.XC_LoadPackage; -import io.github.lazyimmortal.sesame.BuildConfig; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.Model; -import io.github.lazyimmortal.sesame.data.RunType; -import io.github.lazyimmortal.sesame.data.TokenConfig; -import io.github.lazyimmortal.sesame.data.ViewAppInfo; -import io.github.lazyimmortal.sesame.data.task.BaseTask; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayVersion; -import io.github.lazyimmortal.sesame.entity.FriendWatch; -import io.github.lazyimmortal.sesame.entity.RpcEntity; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.extensions.TestRpc; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.model.task.antMember.AntMemberRpcCall; -import io.github.lazyimmortal.sesame.rpc.bridge.NewRpcBridge; -import io.github.lazyimmortal.sesame.rpc.bridge.OldRpcBridge; -import io.github.lazyimmortal.sesame.rpc.bridge.RpcBridge; -import io.github.lazyimmortal.sesame.rpc.bridge.RpcVersion; -import io.github.lazyimmortal.sesame.rpc.intervallimit.RpcIntervalLimit; -import io.github.lazyimmortal.sesame.util.ClassUtil; -import io.github.lazyimmortal.sesame.util.FileUtil; +import io.github.dragon813.sesame.BuildConfig; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.Model; +import io.github.dragon813.sesame.data.RunType; +import io.github.dragon813.sesame.data.TokenConfig; +import io.github.dragon813.sesame.data.ViewAppInfo; +import io.github.dragon813.sesame.data.task.BaseTask; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayVersion; +import io.github.dragon813.sesame.entity.FriendWatch; +import io.github.dragon813.sesame.entity.RpcEntity; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.extensions.TestRpc; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.model.task.antMember.AntMemberRpcCall; +import io.github.dragon813.sesame.rpc.bridge.NewRpcBridge; +import io.github.dragon813.sesame.rpc.bridge.OldRpcBridge; +import io.github.dragon813.sesame.rpc.bridge.RpcBridge; +import io.github.dragon813.sesame.rpc.bridge.RpcVersion; +import io.github.dragon813.sesame.rpc.intervallimit.RpcIntervalLimit; +import io.github.dragon813.sesame.util.ClassUtil; +import io.github.dragon813.sesame.util.FileUtil; import io.github.lazyimmortal.sesame.util.LibraryUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.NotificationUtil; -import io.github.lazyimmortal.sesame.util.PermissionUtil; -import io.github.lazyimmortal.sesame.util.Statistics; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.NotificationUtil; +import io.github.dragon813.sesame.util.PermissionUtil; +import io.github.dragon813.sesame.util.Statistics; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import lombok.Getter; public class ApplicationHook implements IXposedHookLoadPackage { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AuthCodeHandler.java b/app/src/main/java/io/github/dragon813/sesame/hook/AuthCodeHandler.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/AuthCodeHandler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/AuthCodeHandler.java index 7c9f9d45..e25e55e5 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AuthCodeHandler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/AuthCodeHandler.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import fi.iki.elonen.NanoHTTPD; import java.util.Map; @@ -6,7 +6,7 @@ * OAuth2 授权码处理器 * 提供获取 OAuth2 授权码的接口（对应原Kotlin的AuthCodeHandler） */ -public class AuthCodeHandler implements io.github.lazyimmortal.sesame.hook.HttpHandler { +public class AuthCodeHandler implements io.github.dragon813.sesame.hook.HttpHandler { /** * 处理HTTP请求 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AuthCodeHelper.java b/app/src/main/java/io/github/dragon813/sesame/hook/AuthCodeHelper.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/AuthCodeHelper.java rename to app/src/main/java/io/github/dragon813/sesame/hook/AuthCodeHelper.java index 8547de1f..e08a9db9 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/AuthCodeHelper.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/AuthCodeHelper.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import de.robv.android.xposed.XposedHelpers; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.Log; import java.util.HashMap; import java.util.Collections; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/BaseCaptchaHandler.java b/app/src/main/java/io/github/dragon813/sesame/hook/BaseCaptchaHandler.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/BaseCaptchaHandler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/BaseCaptchaHandler.java index b7bb33bb..3bc812c1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/BaseCaptchaHandler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/BaseCaptchaHandler.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import android.annotation.SuppressLint; import android.app.Activity; @@ -9,9 +9,9 @@ import java.util.Random; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.idMap.UserIdMap; /** * 验证码处理程序的基类，提供处理滑动验证码的通用逻辑。 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/BaseHandler.java b/app/src/main/java/io/github/dragon813/sesame/hook/BaseHandler.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/BaseHandler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/BaseHandler.java index 4342dba5..d904a453 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/BaseHandler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/BaseHandler.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,7 +10,7 @@ * HTTP处理器基类（模板方法模式） * 统一处理鉴权、异常和请求方法分发（对应原Kotlin的BaseHandler） */ -public abstract class BaseHandler implements io.github.lazyimmortal.sesame.hook.HttpHandler { +public abstract class BaseHandler implements io.github.dragon813.sesame.hook.HttpHandler { private final String secretToken; protected final ObjectMapper mapper; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/Captcha1Handler.java b/app/src/main/java/io/github/dragon813/sesame/hook/Captcha1Handler.java similarity index 90% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/Captcha1Handler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/Captcha1Handler.java index e49e9647..e4602d01 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/Captcha1Handler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/Captcha1Handler.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; /** * 验证码处理器 - 处理目标应用验证码页面 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/Captcha2Handler.java b/app/src/main/java/io/github/dragon813/sesame/hook/Captcha2Handler.java similarity index 90% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/Captcha2Handler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/Captcha2Handler.java index af1345e1..757efb04 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/Captcha2Handler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/Captcha2Handler.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; /** * 验证码处理器 - 处理目标应用验证码页面 * 使用精简版框架自动识别和处理各种验证码场景 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/CaptchaHook.java b/app/src/main/java/io/github/dragon813/sesame/hook/CaptchaHook.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/CaptchaHook.java rename to app/src/main/java/io/github/dragon813/sesame/hook/CaptchaHook.java index ef64d528..b09e6cd0 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/CaptchaHook.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/CaptchaHook.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import android.app.Dialog; import android.content.Context; @@ -8,11 +8,9 @@ import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedHelpers; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.Log; import java.lang.reflect.Field; -import java.lang.reflect.Method; /** * 支付宝滑块验证码Hook工具类（UI层拦截） diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/CompatHelpers.java b/app/src/main/java/io/github/dragon813/sesame/hook/CompatHelpers.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/CompatHelpers.java rename to app/src/main/java/io/github/dragon813/sesame/hook/CompatHelpers.java index 7b61b661..5a10e8af 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/CompatHelpers.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/CompatHelpers.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedHelpers; @@ -28,7 +28,7 @@ public static void findAndHookMethod(Class clazz, String methodName, Object.. Object[] paramTypes = dropLast(parameterTypesAndCallback); Method method = findMethodExact(clazz, methodName, paramTypes); - io.github.lazyimmortal.sesame.hook.XpCompatEngine.hookMethod(method, callback); + io.github.dragon813.sesame.hook.XpCompatEngine.hookMethod(method, callback); } /** @@ -44,7 +44,7 @@ public static void findAndHookConstructor(String className, ClassLoader classLoa Class clazz = XposedHelpers.findClass(className, classLoader); Constructor constructor = findConstructorExact(clazz, classLoader, paramTypes); - io.github.lazyimmortal.sesame.hook.XpCompatEngine.hookMethod(constructor, callback); + io.github.dragon813.sesame.hook.XpCompatEngine.hookMethod(constructor, callback); } /** diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/DebugHandler.java b/app/src/main/java/io/github/dragon813/sesame/hook/DebugHandler.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/DebugHandler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/DebugHandler.java index 9401a4b9..7f644801 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/DebugHandler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/DebugHandler.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import fi.iki.elonen.NanoHTTPD; @@ -9,7 +9,7 @@ * 调试接口处理器（继承BaseHandler，处理RPC调试请求） * 对应原Kotlin的DebugHandler */ -public class DebugHandler extends io.github.lazyimmortal.sesame.hook.BaseHandler { +public class DebugHandler extends io.github.dragon813.sesame.hook.BaseHandler { /** * 构造方法（调用父类BaseHandler的构造器传入鉴权Token） diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/HttpHandler.java b/app/src/main/java/io/github/dragon813/sesame/hook/HttpHandler.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/HttpHandler.java rename to app/src/main/java/io/github/dragon813/sesame/hook/HttpHandler.java index b8c1671d..700e2471 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/HttpHandler.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/HttpHandler.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import fi.iki.elonen.NanoHTTPD; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ModuleHttpServer.java b/app/src/main/java/io/github/dragon813/sesame/hook/ModuleHttpServer.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/ModuleHttpServer.java rename to app/src/main/java/io/github/dragon813/sesame/hook/ModuleHttpServer.java index c6564500..05fdcda2 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ModuleHttpServer.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/ModuleHttpServer.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.Log; import fi.iki.elonen.NanoHTTPD; import java.io.DataInputStream; import java.io.IOException; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ModuleHttpServerManager.java b/app/src/main/java/io/github/dragon813/sesame/hook/ModuleHttpServerManager.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/ModuleHttpServerManager.java rename to app/src/main/java/io/github/dragon813/sesame/hook/ModuleHttpServerManager.java index cdb2a29a..2738e514 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ModuleHttpServerManager.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/ModuleHttpServerManager.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.Log; import fi.iki.elonen.NanoHTTPD; /** diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/MotionEventSimulator.java b/app/src/main/java/io/github/dragon813/sesame/hook/MotionEventSimulator.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/MotionEventSimulator.java rename to app/src/main/java/io/github/dragon813/sesame/hook/MotionEventSimulator.java index bcbbb380..87263141 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/MotionEventSimulator.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/MotionEventSimulator.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import android.os.Handler; import android.os.Looper; @@ -9,8 +9,8 @@ import java.util.Random; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.TimeUtil; /** * 模拟系统级 MotionEvent 的工具类. diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/RpcRequest.java b/app/src/main/java/io/github/dragon813/sesame/hook/RpcRequest.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/RpcRequest.java rename to app/src/main/java/io/github/dragon813/sesame/hook/RpcRequest.java index 13e3ef90..637151d2 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/RpcRequest.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/RpcRequest.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ServerCommon.java b/app/src/main/java/io/github/dragon813/sesame/hook/ServerCommon.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/ServerCommon.java rename to app/src/main/java/io/github/dragon813/sesame/hook/ServerCommon.java index 7c51441d..638f6a06 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ServerCommon.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/ServerCommon.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SimplePageManager.java b/app/src/main/java/io/github/dragon813/sesame/hook/SimplePageManager.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/SimplePageManager.java rename to app/src/main/java/io/github/dragon813/sesame/hook/SimplePageManager.java index 4def273b..ad9f2615 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SimplePageManager.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/SimplePageManager.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import android.annotation.SuppressLint; import android.app.Activity; @@ -15,7 +15,6 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Iterator; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import de.robv.android.xposed.XC_MethodHook; @@ -49,7 +48,7 @@ public class SimplePageManager { * Activity焦点处理器接口 */ public interface ActivityFocusHandler { - boolean handleActivity(Activity activity, io.github.lazyimmortal.sesame.hook.SimpleViewImage root); + boolean handleActivity(Activity activity, io.github.dragon813.sesame.hook.SimpleViewImage root); } static { @@ -113,7 +112,7 @@ public static void enableWindowMonitoring() { * 尝试在对话框中查找视图 */ @SuppressLint("UseCompatLoadingForDrawables") - public static io.github.lazyimmortal.sesame.hook.SimpleViewImage tryGetTopView(String xpath) { + public static io.github.dragon813.sesame.hook.SimpleViewImage tryGetTopView(String xpath) { // 清理空引用 Iterator> iterator = dialogs.iterator(); while (iterator.hasNext()) { @@ -134,8 +133,8 @@ public static io.github.lazyimmortal.sesame.hook.SimpleViewImage tryGetTopView(S Log.d(TAG, " - 对话框: " + dialog.getClass().getName() + ", 正在显示: " + dialog.isShowing()); debugPrintAllTextViews(decorView, 0); - io.github.lazyimmortal.sesame.hook.SimpleViewImage viewImage = new io.github.lazyimmortal.sesame.hook.SimpleViewImage(decorView); - ArrayList results = (ArrayList) SimpleXpathParser.evaluate(viewImage, xpath); + io.github.dragon813.sesame.hook.SimpleViewImage viewImage = new io.github.dragon813.sesame.hook.SimpleViewImage(decorView); + ArrayList results = (ArrayList) SimpleXpathParser.evaluate(viewImage, xpath); if (!results.isEmpty()) { return results.get(0); } diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SimpleViewImage.java b/app/src/main/java/io/github/dragon813/sesame/hook/SimpleViewImage.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/SimpleViewImage.java rename to app/src/main/java/io/github/dragon813/sesame/hook/SimpleViewImage.java index eb1bb1b5..04854b7f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SimpleViewImage.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/SimpleViewImage.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import android.view.View; import android.view.ViewGroup; @@ -127,11 +127,11 @@ public List getChildren() { * 根据XPath查找单个元素 */ public SimpleViewImage xpath2One(String xpath) { - List results = io.github.lazyimmortal.sesame.hook.SimpleXpathParser.evaluate(this, xpath); + List results = io.github.dragon813.sesame.hook.SimpleXpathParser.evaluate(this, xpath); if (!results.isEmpty()) { return results.get(0); } - return io.github.lazyimmortal.sesame.hook.SimplePageManager.tryGetTopView(xpath); + return io.github.dragon813.sesame.hook.SimplePageManager.tryGetTopView(xpath); } /** diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SimpleXpathParser.java b/app/src/main/java/io/github/dragon813/sesame/hook/SimpleXpathParser.java similarity index 75% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/SimpleXpathParser.java rename to app/src/main/java/io/github/dragon813/sesame/hook/SimpleXpathParser.java index 5b4eda99..76da965b 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SimpleXpathParser.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/SimpleXpathParser.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import java.util.ArrayList; import java.util.List; @@ -34,8 +34,8 @@ private SimpleXpathParser() { /** * 解析并执行 XPath 查询 */ - public static List evaluate(io.github.lazyimmortal.sesame.hook.SimpleViewImage root, String xpath) { - List results = new ArrayList<>(); + public static List evaluate(io.github.dragon813.sesame.hook.SimpleViewImage root, String xpath) { + List results = new ArrayList<>(); // 匹配 contains 语法 java.util.regex.Matcher matcher = XPATH_PATTERN.matcher(xpath); @@ -68,14 +68,14 @@ public static List evaluate( /** * 查找匹配指定类名和属性的元素 */ - private static List findElements( - io.github.lazyimmortal.sesame.hook.SimpleViewImage root, + private static List findElements( + io.github.dragon813.sesame.hook.SimpleViewImage root, String className, String attrName, String attrValue, boolean contains ) { - List results = new ArrayList<>(); + List results = new ArrayList<>(); findElementsRecursive(root, className, attrName, attrValue, contains, results); return results; } @@ -84,12 +84,12 @@ private static List findElem * 递归查找元素 */ private static void findElementsRecursive( - io.github.lazyimmortal.sesame.hook.SimpleViewImage node, + io.github.dragon813.sesame.hook.SimpleViewImage node, String className, String attrName, String attrValue, boolean contains, - List results + List results ) { String nodeType = node.getType(); @@ -111,7 +111,7 @@ private static void findElementsRecursive( } // 递归遍历子节点 - for (io.github.lazyimmortal.sesame.hook.SimpleViewImage child : node.getChildren()) { + for (io.github.dragon813.sesame.hook.SimpleViewImage child : node.getChildren()) { findElementsRecursive(child, className, attrName, attrValue, contains, results); } } @@ -119,8 +119,8 @@ private static void findElementsRecursive( /** * 查找指定类名的元素 */ - private static List findElementsByTag(io.github.lazyimmortal.sesame.hook.SimpleViewImage root, String className) { - List results = new ArrayList<>(); + private static List findElementsByTag(io.github.dragon813.sesame.hook.SimpleViewImage root, String className) { + List results = new ArrayList<>(); findElementsByTagRecursive(root, className, results); return results; } @@ -129,9 +129,9 @@ private static List findElem * 递归查找指定类名的元素 */ private static void findElementsByTagRecursive( - io.github.lazyimmortal.sesame.hook.SimpleViewImage node, + io.github.dragon813.sesame.hook.SimpleViewImage node, String className, - List results + List results ) { // 匹配类名（支持通配符 *） if (node.getType().equals(className) || "*".equals(className)) { @@ -139,7 +139,7 @@ private static void findElementsByTagRecursive( } // 递归遍历子节点 - for (io.github.lazyimmortal.sesame.hook.SimpleViewImage child : node.getChildren()) { + for (io.github.dragon813.sesame.hook.SimpleViewImage child : node.getChildren()) { findElementsByTagRecursive(child, className, results); } } diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SlideCoordinates.java b/app/src/main/java/io/github/dragon813/sesame/hook/SlideCoordinates.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/SlideCoordinates.java rename to app/src/main/java/io/github/dragon813/sesame/hook/SlideCoordinates.java index 45fdbf34..5d187de6 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/SlideCoordinates.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/SlideCoordinates.java @@ -1,5 +1,5 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import lombok.Getter; @Getter diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/Toast.java b/app/src/main/java/io/github/dragon813/sesame/hook/Toast.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/Toast.java rename to app/src/main/java/io/github/dragon813/sesame/hook/Toast.java index 45307f7e..72a3b4db 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/Toast.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/Toast.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import android.content.Context; import android.os.Handler; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.util.Log; public class Toast { private static final String TAG = Toast.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ViewHierarchyAnalyzer.java b/app/src/main/java/io/github/dragon813/sesame/hook/ViewHierarchyAnalyzer.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/ViewHierarchyAnalyzer.java rename to app/src/main/java/io/github/dragon813/sesame/hook/ViewHierarchyAnalyzer.java index 6fdd8f73..4af0ee30 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/ViewHierarchyAnalyzer.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/ViewHierarchyAnalyzer.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import android.util.Log; import android.view.View; @@ -66,7 +66,7 @@ public static void logViewHierarchy(View view, int depth) { * @param slideTextView "滑动验证"文本视图的 SimpleViewImage 包装器。 * @return 找到的滑块视图，如果未找到则返回 null。 */ - public static View findActualSliderView(io.github.lazyimmortal.sesame.hook.SimpleViewImage slideTextView) { + public static View findActualSliderView(io.github.dragon813.sesame.hook.SimpleViewImage slideTextView) { View originView = slideTextView.getOriginView(); if (!(originView.getParent() instanceof ViewGroup)) { return null; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/hook/XpCompatEngine.java b/app/src/main/java/io/github/dragon813/sesame/hook/XpCompatEngine.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/hook/XpCompatEngine.java rename to app/src/main/java/io/github/dragon813/sesame/hook/XpCompatEngine.java index 64d435fc..f04fc640 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/hook/XpCompatEngine.java +++ b/app/src/main/java/io/github/dragon813/sesame/hook/XpCompatEngine.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.hook; +package io.github.dragon813.sesame.hook; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedBridge; diff --git a/app/src/main/java/io/github/dragon813/sesame/model/base/ModelOrder.java b/app/src/main/java/io/github/dragon813/sesame/model/base/ModelOrder.java new file mode 100644 index 00000000..f417c8e6 --- /dev/null +++ b/app/src/main/java/io/github/dragon813/sesame/model/base/ModelOrder.java @@ -0,0 +1,43 @@ +package io.github.dragon813.sesame.model.base; + +import java.util.ArrayList; +import java.util.List; + +import io.github.dragon813.sesame.data.Model; +import io.github.dragon813.sesame.model.extensions.ExtensionsHandle; +import io.github.dragon813.sesame.model.normal.answerAI.AnswerAI; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.model.task.antDodo.AntDodo; +import io.github.dragon813.sesame.model.task.antFarm.AntFarm; +import io.github.dragon813.sesame.model.task.antForest.AntForestV2; +import io.github.dragon813.sesame.model.task.antMember.AntMember; +import io.github.dragon813.sesame.model.task.antOcean.AntOcean; +import io.github.dragon813.sesame.model.task.antOrchard.AntOrchard; +import io.github.dragon813.sesame.model.task.antSports.AntSports; +import io.github.dragon813.sesame.model.task.antStall.AntStall; +import io.github.dragon813.sesame.model.task.greenFinance.GreenFinance; +import io.github.dragon813.sesame.model.task.protectEcology.ProtectEcology; +import lombok.Getter; + +public class ModelOrder { + + @Getter + private static final List> clazzList = new ArrayList<>(); + + static { + clazzList.add(BaseModel.class); + clazzList.add(AntForestV2.class); + clazzList.add(AntFarm.class); + clazzList.add(AntStall.class); + clazzList.add(AntOrchard.class); + clazzList.add(ProtectEcology.class); + clazzList.add(AntDodo.class); + clazzList.add(AntOcean.class); + clazzList.add(AntSports.class); + clazzList.add(AntMember.class); + clazzList.add(GreenFinance.class); + clazzList.add(AnswerAI.class); + + ExtensionsHandle.handleAlphaRequest("ModelOrder", "addExtensionsClass", clazzList); + } +} \ No newline at end of file diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/base/TaskCommon.java b/app/src/main/java/io/github/dragon813/sesame/model/base/TaskCommon.java similarity index 77% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/base/TaskCommon.java rename to app/src/main/java/io/github/dragon813/sesame/model/base/TaskCommon.java index 547fc8da..7ebebaf4 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/base/TaskCommon.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/base/TaskCommon.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.base; +package io.github.dragon813.sesame.model.base; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.util.TimeUtil; public class TaskCommon { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/common/rpcCall/BaseTaskRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/common/rpcCall/BaseTaskRpcCall.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/common/rpcCall/BaseTaskRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/common/rpcCall/BaseTaskRpcCall.java index 689e5188..d5d480e0 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/common/rpcCall/BaseTaskRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/common/rpcCall/BaseTaskRpcCall.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.model.common.rpcCall; +package io.github.dragon813.sesame.model.common.rpcCall; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; /** * 公共任务处理 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/ExtensionsHandle.java b/app/src/main/java/io/github/dragon813/sesame/model/extensions/ExtensionsHandle.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/ExtensionsHandle.java rename to app/src/main/java/io/github/dragon813/sesame/model/extensions/ExtensionsHandle.java index 0f854e8b..54d7e33f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/ExtensionsHandle.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/extensions/ExtensionsHandle.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.extensions; +package io.github.dragon813.sesame.model.extensions; import org.json.JSONArray; import org.json.JSONObject; @@ -6,16 +6,16 @@ import java.util.Iterator; import java.util.Objects; -import io.github.lazyimmortal.sesame.data.TokenConfig; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.model.task.antSports.AntSportsRpcCall; -import io.github.lazyimmortal.sesame.model.task.protectEcology.ProtectTreeRpcCall; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.idMap.WalkPathIdMap; +import io.github.dragon813.sesame.data.TokenConfig; +import io.github.dragon813.sesame.hook.Toast; +import io.github.dragon813.sesame.model.task.antSports.AntSportsRpcCall; +import io.github.dragon813.sesame.model.task.protectEcology.ProtectTreeRpcCall; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.idMap.WalkPathIdMap; public class ExtensionsHandle { private static final String TAG = ExtensionsHandle.class.getSimpleName(); @@ -55,7 +55,7 @@ public static void handleRequest(String type, String fun, Object data) { public static Object handleAlphaRequest(String type, String fun, Object data) { try { - return Class.forName("io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandleAlpha") + return Class.forName("io.github.dragon813.sesame.model.extensions.ExtensionsHandleAlpha") .getMethod("handleAlphaRequest", String.class, String.class, Object.class) .invoke(null, type, fun, data); } catch (Exception e) { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/TestRpc.java b/app/src/main/java/io/github/dragon813/sesame/model/extensions/TestRpc.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/TestRpc.java rename to app/src/main/java/io/github/dragon813/sesame/model/extensions/TestRpc.java index 60dcb427..e378e983 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/TestRpc.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/extensions/TestRpc.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.extensions; +package io.github.dragon813.sesame.model.extensions; public class TestRpc { private static final String TAG = TestRpc.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/TestRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/extensions/TestRpcCall.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/TestRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/extensions/TestRpcCall.java index a20b3b8f..65337cbd 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/extensions/TestRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/extensions/TestRpcCall.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.model.extensions; +package io.github.dragon813.sesame.model.extensions; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class TestRpcCall { private static final String VERSION = "20240704"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/AnswerAI.java b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/AnswerAI.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/AnswerAI.java rename to app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/AnswerAI.java index 43b8780f..55d2e4de 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/AnswerAI.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/AnswerAI.java @@ -1,13 +1,13 @@ -package io.github.lazyimmortal.sesame.model.normal.answerAI; - -import io.github.lazyimmortal.sesame.data.Model; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.TokenConfig; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.StringModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.TextModelField; -import io.github.lazyimmortal.sesame.util.Log; +package io.github.dragon813.sesame.model.normal.answerAI; + +import io.github.dragon813.sesame.data.Model; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.TokenConfig; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.StringModelField; +import io.github.dragon813.sesame.data.modelFieldExt.TextModelField; +import io.github.dragon813.sesame.util.Log; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/AnswerAIInterface.java b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/AnswerAIInterface.java similarity index 91% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/AnswerAIInterface.java rename to app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/AnswerAIInterface.java index c1f1ea09..abb58c10 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/AnswerAIInterface.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/AnswerAIInterface.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.normal.answerAI; +package io.github.dragon813.sesame.model.normal.answerAI; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/GeminiAI.java b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/GeminiAI.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/GeminiAI.java rename to app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/GeminiAI.java index 8ba80643..9f818d09 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/GeminiAI.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/GeminiAI.java @@ -1,12 +1,12 @@ -package io.github.lazyimmortal.sesame.model.normal.answerAI; +package io.github.dragon813.sesame.model.normal.answerAI; import okhttp3.*; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.Log; import java.util.List; -import static io.github.lazyimmortal.sesame.util.JsonUtil.getValueByPath; +import static io.github.dragon813.sesame.util.JsonUtil.getValueByPath; /** * GenAI帮助类 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/TongyiAI.java b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/TongyiAI.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/TongyiAI.java rename to app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/TongyiAI.java index f41ef2ea..19d43e67 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/answerAI/TongyiAI.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/normal/answerAI/TongyiAI.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.normal.answerAI; +package io.github.dragon813.sesame.model.normal.answerAI; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; import okhttp3.*; import org.json.JSONArray; import org.json.JSONObject; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/base/BaseModel.java b/app/src/main/java/io/github/dragon813/sesame/model/normal/base/BaseModel.java similarity index 90% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/normal/base/BaseModel.java rename to app/src/main/java/io/github/dragon813/sesame/model/normal/base/BaseModel.java index 63997aab..a7e98ab7 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/normal/base/BaseModel.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/normal/base/BaseModel.java @@ -1,6 +1,5 @@ -package io.github.lazyimmortal.sesame.model.normal.base; +package io.github.dragon813.sesame.model.normal.base; -import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -8,23 +7,22 @@ import java.util.LinkedHashSet; import java.util.Map; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectAndCountModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.entity.AlipayrpcRequest; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.model.task.antForest.AntForestRpcCall; +import io.github.dragon813.sesame.data.modelFieldExt.SelectAndCountModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.entity.AlipayrpcRequest; +import io.github.dragon813.sesame.hook.ApplicationHook; import lombok.Getter; -import io.github.lazyimmortal.sesame.data.Model; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.IntegerModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ListModelField; -import io.github.lazyimmortal.sesame.model.task.protectEcology.ProtectEcology; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.*; +import io.github.dragon813.sesame.data.Model; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.IntegerModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ListModelField; +import io.github.dragon813.sesame.model.task.protectEcology.ProtectEcology; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.*; /** * 基础配置模块 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/ancientTree/AncientTree.java b/app/src/main/java/io/github/dragon813/sesame/model/task/ancientTree/AncientTree.java similarity index 90% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/ancientTree/AncientTree.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/ancientTree/AncientTree.java index d8a4ee01..d2918ec2 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/ancientTree/AncientTree.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/ancientTree/AncientTree.java @@ -1,19 +1,19 @@ -package io.github.lazyimmortal.sesame.model.task.ancientTree; +package io.github.dragon813.sesame.model.task.ancientTree; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AreaCode; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AreaCode; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.TimeUtil; import java.text.SimpleDateFormat; import java.util.Collection; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/ancientTree/AncientTreeRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/ancientTree/AncientTreeRpcCall.java similarity index 93% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/ancientTree/AncientTreeRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/ancientTree/AncientTreeRpcCall.java index adb07bd1..07c49182 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/ancientTree/AncientTreeRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/ancientTree/AncientTreeRpcCall.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.model.task.ancientTree; +package io.github.dragon813.sesame.model.task.ancientTree; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class AncientTreeRpcCall { private static final String VERSION = "20230522"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antBookRead/AntBookRead.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antBookRead/AntBookRead.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antBookRead/AntBookRead.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antBookRead/AntBookRead.java index 1faf9e2b..048ac49c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antBookRead/AntBookRead.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antBookRead/AntBookRead.java @@ -1,15 +1,15 @@ -package io.github.lazyimmortal.sesame.model.task.antBookRead; +package io.github.dragon813.sesame.model.task.antBookRead; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.data.RuntimeInfo; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.StringUtil; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.data.RuntimeInfo; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.StringUtil; public class AntBookRead extends ModelTask { private static final String TAG = AntBookRead.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antBookRead/AntBookReadRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antBookRead/AntBookReadRpcCall.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antBookRead/AntBookReadRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antBookRead/AntBookReadRpcCall.java index 9705653a..b195355f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antBookRead/AntBookReadRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antBookRead/AntBookReadRpcCall.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.task.antBookRead; +package io.github.dragon813.sesame.model.task.antBookRead; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; /** * @author cwj851 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antDodo/AntDodo.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antDodo/AntDodo.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antDodo/AntDodo.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antDodo/AntDodo.java index b3893132..d5897edf 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antDodo/AntDodo.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antDodo/AntDodo.java @@ -1,24 +1,24 @@ -package io.github.lazyimmortal.sesame.model.task.antDodo; +package io.github.dragon813.sesame.model.task.antDodo; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.entity.CustomOption; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.task.antFarm.AntFarm.TaskStatus; -import io.github.lazyimmortal.sesame.model.task.antForest.AntForestV2; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.entity.CustomOption; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.task.antFarm.AntFarm.TaskStatus; +import io.github.dragon813.sesame.model.task.antForest.AntForestV2; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.LinkedHashSet; import java.util.Objects; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antDodo/AntDodoRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antDodo/AntDodoRpcCall.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antDodo/AntDodoRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antDodo/AntDodoRpcCall.java index bb68b415..1f219fe4 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antDodo/AntDodoRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antDodo/AntDodoRpcCall.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.task.antDodo; +package io.github.dragon813.sesame.model.task.antDodo; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; public class AntDodoRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/AntFarm.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/AntFarm.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/AntFarm.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/AntFarm.java index 298a88ac..2a882557 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/AntFarm.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/AntFarm.java @@ -1,36 +1,37 @@ -package io.github.lazyimmortal.sesame.model.task.antFarm; +package io.github.dragon813.sesame.model.task.antFarm; import android.os.Build; -import io.github.lazyimmortal.sesame.entity.AlipayAntFarmDoFarmTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntFarmDrawMachineTaskList; -import io.github.lazyimmortal.sesame.entity.GameCenterMallItem; -import io.github.lazyimmortal.sesame.model.task.antGame.GameTask; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDoFarmTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDrawMachineTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.GameCenterMallItemMap; +import io.github.dragon813.sesame.entity.AlipayAntFarmDoFarmTaskList; +import io.github.dragon813.sesame.entity.AlipayAntFarmDrawMachineTaskList; +import io.github.dragon813.sesame.entity.GameCenterMallItem; +import io.github.dragon813.sesame.model.task.antGame.GameTask; +import io.github.dragon813.sesame.util.idMap.AntFarmDoFarmTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntFarmDrawMachineTaskListMap; +import io.github.dragon813.sesame.util.idMap.GameCenterMallItemMap; +import io.github.lazyimmortal.sesame.util.LibraryUtil; import lombok.Getter; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.*; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.TokenConfig; -import io.github.lazyimmortal.sesame.data.modelFieldExt.*; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.entity.CustomOption; -import io.github.lazyimmortal.sesame.entity.FarmOrnaments; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle; -import io.github.lazyimmortal.sesame.model.normal.answerAI.AnswerAI; -import io.github.lazyimmortal.sesame.rpc.intervallimit.RpcIntervalLimit; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.FarmOrnamentsIdMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.*; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.TokenConfig; +import io.github.dragon813.sesame.data.modelFieldExt.*; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.entity.CustomOption; +import io.github.dragon813.sesame.entity.FarmOrnaments; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.extensions.ExtensionsHandle; +import io.github.dragon813.sesame.model.normal.answerAI.AnswerAI; +import io.github.dragon813.sesame.rpc.intervallimit.RpcIntervalLimit; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.FarmOrnamentsIdMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.*; import java.util.concurrent.TimeUnit; @@ -3020,7 +3021,7 @@ private void family() { } // 检查 ExtensionsHandle 是否存在 try { - Class.forName("io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle"); + Class.forName("io.github.dragon813.sesame.model.extensions.ExtensionsHandle"); ExtensionsHandle.handleAlphaRequest("antFarm", "doFamilyTask", null); } catch (ClassNotFoundException e) { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/AntFarmRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/AntFarmRpcCall.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/AntFarmRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/AntFarmRpcCall.java index 0adf29e2..f00080f7 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/AntFarmRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/AntFarmRpcCall.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.task.antFarm; +package io.github.dragon813.sesame.model.task.antFarm; import org.json.JSONArray; import org.json.JSONException; @@ -9,11 +9,11 @@ import java.util.Random; import java.util.UUID; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.idMap.UserIdMap; public class AntFarmRpcCall { private static final String VERSION = "1.8.2302070202.46"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/DadaDailyRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/DadaDailyRpcCall.java similarity index 85% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/DadaDailyRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/DadaDailyRpcCall.java index 0ee1ceca..c666a6bd 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antFarm/DadaDailyRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antFarm/DadaDailyRpcCall.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.model.task.antFarm; +package io.github.dragon813.sesame.model.task.antFarm; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; /** * @author Constanline diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/AntForestRpcCall.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/AntForestRpcCall.java index 9736ce20..22ae49f4 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/AntForestRpcCall.java @@ -1,26 +1,22 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; +package io.github.dragon813.sesame.model.task.antForest; -import static io.github.lazyimmortal.sesame.util.RandomUtil.getRandomString; +import static io.github.dragon813.sesame.util.RandomUtil.getRandomString; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.entity.AlipayVersion; -import io.github.lazyimmortal.sesame.entity.RpcEntity; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.entity.AlipayVersion; +import io.github.dragon813.sesame.entity.RpcEntity; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.StringUtil; import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.Random; -import java.util.stream.Collectors; -import java.util.stream.IntStream; public class AntForestRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestV2.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/AntForestV2.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestV2.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/AntForestV2.java index 79eb81e5..4c80f9a9 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/AntForestV2.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/AntForestV2.java @@ -1,6 +1,4 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; - -import static io.github.lazyimmortal.sesame.model.normal.base.BaseModel.taskRpcRequest; +package io.github.dragon813.sesame.model.task.antForest; import org.json.JSONArray; import org.json.JSONException; @@ -26,57 +24,55 @@ import java.util.regex.Pattern; import de.robv.android.xposed.XposedHelpers; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.RuntimeInfo; -import io.github.lazyimmortal.sesame.data.TokenConfig; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.EmptyModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.IntegerModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ListModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectAndCountModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.StringModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.TextModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayAntForestHuntTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntForestVitalityTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.entity.CollectEnergyEntity; -import io.github.lazyimmortal.sesame.entity.CustomOption; -import io.github.lazyimmortal.sesame.entity.FriendWatch; -import io.github.lazyimmortal.sesame.entity.KVNode; -import io.github.lazyimmortal.sesame.entity.RpcEntity; -import io.github.lazyimmortal.sesame.entity.VitalityBenefit; -import io.github.lazyimmortal.sesame.entity.AlipayForestHunt; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.model.task.antFarm.AntFarm.TaskStatus; -import io.github.lazyimmortal.sesame.model.task.antGame.GameTask; -import io.github.lazyimmortal.sesame.rpc.intervallimit.FixedOrRangeIntervalLimit; -import io.github.lazyimmortal.sesame.rpc.intervallimit.RpcIntervalLimit; -import io.github.lazyimmortal.sesame.ui.ObjReference; -import io.github.lazyimmortal.sesame.util.AverageMath; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.ListUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.NotificationUtil; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.Statistics; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.idMap.AntForestHuntTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntForestVitalityTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; -import io.github.lazyimmortal.sesame.util.idMap.VitalityBenefitIdMap; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.RuntimeInfo; +import io.github.dragon813.sesame.data.TokenConfig; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.EmptyModelField; +import io.github.dragon813.sesame.data.modelFieldExt.IntegerModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ListModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectAndCountModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.modelFieldExt.StringModelField; +import io.github.dragon813.sesame.data.modelFieldExt.TextModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayAntForestHuntTaskList; +import io.github.dragon813.sesame.entity.AlipayAntForestVitalityTaskList; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.entity.CollectEnergyEntity; +import io.github.dragon813.sesame.entity.CustomOption; +import io.github.dragon813.sesame.entity.FriendWatch; +import io.github.dragon813.sesame.entity.KVNode; +import io.github.dragon813.sesame.entity.RpcEntity; +import io.github.dragon813.sesame.entity.VitalityBenefit; +import io.github.dragon813.sesame.entity.AlipayForestHunt; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.Toast; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.extensions.ExtensionsHandle; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.model.task.antFarm.AntFarm.TaskStatus; +import io.github.dragon813.sesame.model.task.antGame.GameTask; +import io.github.dragon813.sesame.rpc.intervallimit.FixedOrRangeIntervalLimit; +import io.github.dragon813.sesame.rpc.intervallimit.RpcIntervalLimit; +import io.github.dragon813.sesame.ui.ObjReference; +import io.github.dragon813.sesame.util.AverageMath; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.NotificationUtil; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.Statistics; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.idMap.AntForestHuntTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntForestVitalityTaskListMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.idMap.VitalityBenefitIdMap; import lombok.Getter; /** @@ -928,7 +924,7 @@ private JSONObject collectSelfEnergy() { JSONObject propertiesObject = selfHomeObject.optJSONObject("properties"); if (propertiesObject != null) { if (Objects.equals("Y", propertiesObject.optString("whackMole"))) { - if (io.github.lazyimmortal.sesame.model.task.antForest.WhackMole.closeWhackMole()) { + if (io.github.dragon813.sesame.model.task.antForest.WhackMole.closeWhackMole()) { Log.record("6秒拼手速关闭成功"); } else { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/EcoLifeRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/EcoLifeRpcCall.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/EcoLifeRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/EcoLifeRpcCall.java index c3a33376..3ffca41c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/EcoLifeRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/EcoLifeRpcCall.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; +package io.github.dragon813.sesame.model.task.antForest; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class EcoLifeRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/ForestChouChouLe.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/ForestChouChouLe.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/ForestChouChouLe.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/ForestChouChouLe.java index 9b64b5cd..cbe5e923 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/ForestChouChouLe.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/ForestChouChouLe.java @@ -1,20 +1,19 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; +package io.github.dragon813.sesame.model.task.antForest; import org.json.JSONArray; import org.json.JSONObject; import java.util.LinkedHashSet; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Statistics; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.idMap.ForestHuntIdMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.hook.Toast; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Statistics; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.idMap.ForestHuntIdMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; public class ForestChouChouLe { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/GameIntervalCalculator.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/GameIntervalCalculator.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/GameIntervalCalculator.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/GameIntervalCalculator.java index 3aa7a491..932ff89d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/GameIntervalCalculator.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/GameIntervalCalculator.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; +package io.github.dragon813.sesame.model.task.antForest; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.RandomUtil; /** * 动态间隔计算器：用于游戏场景下的智能间隔管理 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/GreenLifeRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/GreenLifeRpcCall.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/GreenLifeRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/GreenLifeRpcCall.java index 28a9fd38..6557ae83 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/GreenLifeRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/GreenLifeRpcCall.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; +package io.github.dragon813.sesame.model.task.antForest; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; public class GreenLifeRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/Privilege.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/Privilege.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/Privilege.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/Privilege.java index fd2741cc..cd95674a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/Privilege.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/Privilege.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; +package io.github.dragon813.sesame.model.task.antForest; import org.json.JSONArray; import org.json.JSONException; @@ -7,20 +7,12 @@ import java.util.ArrayList; import java.util.List; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.Status; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; import java.util.Calendar; -import java.util.List; public class Privilege { private static final String TAG = "Privilege"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/WhackMole.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/WhackMole.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/WhackMole.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antForest/WhackMole.java index 4981d6e0..e78b708f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antForest/WhackMole.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antForest/WhackMole.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.task.antForest; +package io.github.dragon813.sesame.model.task.antForest; import android.annotation.SuppressLint; import java.util.ArrayList; @@ -11,11 +11,9 @@ import java.util.concurrent.atomic.AtomicLong; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.model.task.antForest.AntForestRpcCall; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; /** * 6秒拼手速打地鼠 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antGame/GameTask.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antGame/GameTask.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antGame/GameTask.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antGame/GameTask.java index 00e9b0e4..83ddee70 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antGame/GameTask.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antGame/GameTask.java @@ -1,10 +1,9 @@ -package io.github.lazyimmortal.sesame.model.task.antGame; +package io.github.dragon813.sesame.model.task.antGame; -import io.github.lazyimmortal.sesame.hook.AlipayMiniMarkHelper; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.hook.AuthCodeHelper; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.hook.AlipayMiniMarkHelper; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.AuthCodeHelper; +import io.github.dragon813.sesame.util.Log; import org.json.JSONObject; import java.io.BufferedReader; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntInsurance.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntInsurance.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntInsurance.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntInsurance.java index c8b6235f..ebe00798 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntInsurance.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntInsurance.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.task.antMember; +package io.github.dragon813.sesame.model.task.antMember; import org.json.JSONArray; import org.json.JSONObject; @@ -6,9 +6,9 @@ import java.util.Iterator; import java.util.Set; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Status; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Status; public class AntInsurance { private static final String TAG = AntInsurance.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntInsuranceRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntInsuranceRpcCall.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntInsuranceRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntInsuranceRpcCall.java index 43392577..f37f7061 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntInsuranceRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntInsuranceRpcCall.java @@ -1,8 +1,8 @@ -package io.github.lazyimmortal.sesame.model.task.antMember; +package io.github.dragon813.sesame.model.task.antMember; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class AntInsuranceRpcCall { /** diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntMember.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntMember.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntMember.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntMember.java index 57af3d5c..c50cdacc 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntMember.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntMember.java @@ -1,30 +1,29 @@ -package io.github.lazyimmortal.sesame.model.task.antMember; +package io.github.dragon813.sesame.model.task.antMember; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayAntMemberTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayMemberCreditSesameTaskList; -import io.github.lazyimmortal.sesame.entity.MemberBenefit; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle; -import io.github.lazyimmortal.sesame.model.task.antOrchard.AntOrchardRpcCall; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDoFarmTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntMemberTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberBenefitIdMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberCreditSesameTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.PromiseSimpleTemplateIdMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayAntMemberTaskList; +import io.github.dragon813.sesame.entity.AlipayMemberCreditSesameTaskList; +import io.github.dragon813.sesame.entity.MemberBenefit; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.extensions.ExtensionsHandle; +import io.github.dragon813.sesame.model.task.antOrchard.AntOrchardRpcCall; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.AntMemberTaskListMap; +import io.github.dragon813.sesame.util.idMap.MemberBenefitIdMap; +import io.github.dragon813.sesame.util.idMap.MemberCreditSesameTaskListMap; +import io.github.dragon813.sesame.util.idMap.PromiseSimpleTemplateIdMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.HashSet; import java.util.LinkedHashSet; @@ -826,7 +825,7 @@ private void handleGrowthGuideTasks() { private String getWuaByReflection() { try { // 1. 获取AntOrchard类 - Class antOrchardClass = Class.forName("io.github.lazyimmortal.sesame.model.task.antOrchard.AntOrchard"); + Class antOrchardClass = Class.forName("io.github.dragon813.sesame.model.task.antOrchard.AntOrchard"); // 2. 实例化类（若方法是静态的，无需实例化） Object antOrchardInstance = antOrchardClass.newInstance(); // 3. 获取私有方法getWua() diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntMemberRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntMemberRpcCall.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntMemberRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntMemberRpcCall.java index 54958b60..af3fde41 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/AntMemberRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/AntMemberRpcCall.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.model.task.antMember; +package io.github.dragon813.sesame.model.task.antMember; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.entity.RpcEntity; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.entity.RpcEntity; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; public class AntMemberRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/MerchantService.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/MerchantService.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/MerchantService.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antMember/MerchantService.java index 091a6a69..cbe771ae 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/MerchantService.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/MerchantService.java @@ -1,15 +1,15 @@ -package io.github.lazyimmortal.sesame.model.task.antMember; +package io.github.dragon813.sesame.model.task.antMember; import org.json.JSONArray; import org.json.JSONObject; import java.util.Objects; -import io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.model.extensions.ExtensionsHandle; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.TimeUtil; public class MerchantService { private static final String TAG = MerchantService.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/MerchantServiceRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/MerchantServiceRpcCall.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/MerchantServiceRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antMember/MerchantServiceRpcCall.java index f4bc3d42..490771c2 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antMember/MerchantServiceRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antMember/MerchantServiceRpcCall.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.task.antMember; +package io.github.dragon813.sesame.model.task.antMember; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; public class MerchantServiceRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOcean/AntOcean.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antOcean/AntOcean.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOcean/AntOcean.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antOcean/AntOcean.java index 79fa2135..45a08d21 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOcean/AntOcean.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antOcean/AntOcean.java @@ -1,32 +1,30 @@ -package io.github.lazyimmortal.sesame.model.task.antOcean; +package io.github.dragon813.sesame.model.task.antOcean; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayAntOceanAntiepTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.task.antFarm.AntFarm.TaskStatus; -import io.github.lazyimmortal.sesame.model.task.antForest.AntForestRpcCall; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Statistics; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDoFarmTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntOceanAntiepTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayAntOceanAntiepTaskList; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.task.antFarm.AntFarm.TaskStatus; +import io.github.dragon813.sesame.model.task.antForest.AntForestRpcCall; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Statistics; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.idMap.AntOceanAntiepTaskListMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; -import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOcean/AntOceanRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antOcean/AntOceanRpcCall.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOcean/AntOceanRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antOcean/AntOceanRpcCall.java index f9467aa3..0ea95de8 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOcean/AntOceanRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antOcean/AntOceanRpcCall.java @@ -1,14 +1,9 @@ -package io.github.lazyimmortal.sesame.model.task.antOcean; +package io.github.dragon813.sesame.model.task.antOcean; import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.RandomUtil; - -import java.util.Set; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; /** * @author Constanline diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOrchard/AntOrchard.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antOrchard/AntOrchard.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOrchard/AntOrchard.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antOrchard/AntOrchard.java index 9537dcd4..e0fa98c6 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOrchard/AntOrchard.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antOrchard/AntOrchard.java @@ -1,26 +1,24 @@ -package io.github.lazyimmortal.sesame.model.task.antOrchard; +package io.github.dragon813.sesame.model.task.antOrchard; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.entity.AlipayAntOrchardTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayMemberCreditSesameTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayPlantScene; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.IntegerModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectAndCountModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.model.task.antGame.GameTask; -import io.github.lazyimmortal.sesame.model.task.antMember.AntMemberRpcCall; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.entity.AlipayAntOrchardTaskList; +import io.github.dragon813.sesame.entity.AlipayPlantScene; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.hook.Toast; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.IntegerModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectAndCountModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.model.task.antGame.GameTask; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.TimeUtil; import org.json.JSONArray; import org.json.JSONObject; @@ -31,12 +29,10 @@ import java.util.LinkedHashSet; import java.util.Set; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDoFarmTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntOrchardTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberCreditSesameTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.PlantSceneIdMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.AntOrchardTaskListMap; +import io.github.dragon813.sesame.util.idMap.PlantSceneIdMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.*; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOrchard/AntOrchardRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antOrchard/AntOrchardRpcCall.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOrchard/AntOrchardRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antOrchard/AntOrchardRpcCall.java index 46d9e6e1..841098aa 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antOrchard/AntOrchardRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antOrchard/AntOrchardRpcCall.java @@ -1,12 +1,12 @@ -package io.github.lazyimmortal.sesame.model.task.antOrchard; +package io.github.dragon813.sesame.model.task.antOrchard; import android.util.Base64; import java.util.List; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.idMap.UserIdMap; public class AntOrchardRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antSports/AntSports.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antSports/AntSports.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antSports/AntSports.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antSports/AntSports.java index 61705038..77bc6854 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antSports/AntSports.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antSports/AntSports.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.task.antSports; +package io.github.dragon813.sesame.model.task.antSports; import org.json.JSONArray; import org.json.JSONObject; @@ -12,34 +12,30 @@ import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedHelpers; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.TokenConfig; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.IntegerModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayAntSportsTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayMemberCreditSesameTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.entity.WalkPath; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle; -import io.github.lazyimmortal.sesame.model.task.antStall.AntStall; -import io.github.lazyimmortal.sesame.model.task.antStall.AntStallRpcCall; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.idMap.AntSportsTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntStallTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.TokenConfig; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.IntegerModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayAntSportsTaskList; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.entity.WalkPath; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.Toast; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.extensions.ExtensionsHandle; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.idMap.AntSportsTaskListMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; public class AntSports extends ModelTask { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antSports/AntSportsRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antSports/AntSportsRpcCall.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antSports/AntSportsRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antSports/AntSportsRpcCall.java index fd582d26..a7aedc5e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antSports/AntSportsRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antSports/AntSportsRpcCall.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.model.task.antSports; +package io.github.dragon813.sesame.model.task.antSports; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.MessageUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.MessageUtil; public class AntSportsRpcCall { private static final String chInfo = "ch_appcenter__chsub_9patch", timeZone = "Asia/Shanghai", version = "3.0.1" + ".2", alipayAppVersion = "0.0.852", cityCode = "330100", appId = "2021002116659397"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antStall/AntStall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antStall/AntStall.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antStall/AntStall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antStall/AntStall.java index 0bff0a8e..cf264a0f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antStall/AntStall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antStall/AntStall.java @@ -1,25 +1,24 @@ -package io.github.lazyimmortal.sesame.model.task.antStall; +package io.github.dragon813.sesame.model.task.antStall; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.IntegerModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayAntStallTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.model.task.antFarm.AntFarm.TaskStatus; -import io.github.lazyimmortal.sesame.model.task.readingDada.ReadingDada; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDoFarmTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntStallTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.IntegerModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayAntStallTaskList; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.model.task.antFarm.AntFarm.TaskStatus; +import io.github.dragon813.sesame.model.task.readingDada.ReadingDada; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.AntStallTaskListMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antStall/AntStallRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/antStall/AntStallRpcCall.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/antStall/AntStallRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/antStall/AntStallRpcCall.java index 700fcdc6..809aaab1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/antStall/AntStallRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/antStall/AntStallRpcCall.java @@ -1,13 +1,13 @@ -package io.github.lazyimmortal.sesame.model.task.antStall; +package io.github.dragon813.sesame.model.task.antStall; import android.util.Base64; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; -import io.github.lazyimmortal.sesame.util.Status; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; +import io.github.dragon813.sesame.util.Status; import java.util.UUID; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/consumeGold/ConsumeGold.java b/app/src/main/java/io/github/dragon813/sesame/model/task/consumeGold/ConsumeGold.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/consumeGold/ConsumeGold.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/consumeGold/ConsumeGold.java index 9764c497..9d417780 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/consumeGold/ConsumeGold.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/consumeGold/ConsumeGold.java @@ -1,13 +1,13 @@ -package io.github.lazyimmortal.sesame.model.task.consumeGold; +package io.github.dragon813.sesame.model.task.consumeGold; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.data.RuntimeInfo; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.data.RuntimeInfo; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.util.Log; public class ConsumeGold extends ModelTask { private static final String TAG = ConsumeGold.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/consumeGold/ConsumeGoldRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/consumeGold/ConsumeGoldRpcCall.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/consumeGold/ConsumeGoldRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/consumeGold/ConsumeGoldRpcCall.java index 7a51d119..ed1e76bf 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/consumeGold/ConsumeGoldRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/consumeGold/ConsumeGoldRpcCall.java @@ -1,8 +1,8 @@ -package io.github.lazyimmortal.sesame.model.task.consumeGold; +package io.github.dragon813.sesame.model.task.consumeGold; import java.util.UUID; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class ConsumeGoldRpcCall { // private static final String VERSION = "20230522"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/greenFinance/GreenFinance.java b/app/src/main/java/io/github/dragon813/sesame/model/task/greenFinance/GreenFinance.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/greenFinance/GreenFinance.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/greenFinance/GreenFinance.java index c8a4c2d4..ba89eaf2 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/greenFinance/GreenFinance.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/greenFinance/GreenFinance.java @@ -1,16 +1,16 @@ -package io.github.lazyimmortal.sesame.model.task.greenFinance; +package io.github.dragon813.sesame.model.task.greenFinance; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.Status; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.Status; +import io.github.dragon813.sesame.util.TimeUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/greenFinance/GreenFinanceRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/greenFinance/GreenFinanceRpcCall.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/greenFinance/GreenFinanceRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/greenFinance/GreenFinanceRpcCall.java index 3416b352..c40bda94 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/greenFinance/GreenFinanceRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/greenFinance/GreenFinanceRpcCall.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.model.task.greenFinance; +package io.github.dragon813.sesame.model.task.greenFinance; import org.json.JSONArray; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.model.common.rpcCall.BaseTaskRpcCall; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.model.common.rpcCall.BaseTaskRpcCall; +import io.github.dragon813.sesame.util.idMap.UserIdMap; /** * 绿色经营Rpc请求类 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/omegakoiTown/OmegakoiTown.java b/app/src/main/java/io/github/dragon813/sesame/model/task/omegakoiTown/OmegakoiTown.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/omegakoiTown/OmegakoiTown.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/omegakoiTown/OmegakoiTown.java index a2ccf909..f7a4c90e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/omegakoiTown/OmegakoiTown.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/omegakoiTown/OmegakoiTown.java @@ -1,13 +1,13 @@ -package io.github.lazyimmortal.sesame.model.task.omegakoiTown; +package io.github.dragon813.sesame.model.task.omegakoiTown; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.data.RuntimeInfo; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.data.RuntimeInfo; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.util.Log; public class OmegakoiTown extends ModelTask { private static final String TAG = OmegakoiTown.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/omegakoiTown/OmegakoiTownRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/omegakoiTown/OmegakoiTownRpcCall.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/omegakoiTown/OmegakoiTownRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/omegakoiTown/OmegakoiTownRpcCall.java index 47220584..87438420 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/omegakoiTown/OmegakoiTownRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/omegakoiTown/OmegakoiTownRpcCall.java @@ -1,8 +1,8 @@ -package io.github.lazyimmortal.sesame.model.task.omegakoiTown; +package io.github.dragon813.sesame.model.task.omegakoiTown; import java.util.UUID; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class OmegakoiTownRpcCall { private static final String version = "2.0"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/CooperateRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/CooperateRpcCall.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/CooperateRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/CooperateRpcCall.java index 0737d7b1..38830d77 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/CooperateRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/CooperateRpcCall.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.model.task.protectEcology; +package io.github.dragon813.sesame.model.task.protectEcology; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class CooperateRpcCall { private static final String VERSION = "20230501"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectEcology.java b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectEcology.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectEcology.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectEcology.java index a6a94725..2e5b7fcb 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectEcology.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectEcology.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.model.task.protectEcology; +package io.github.dragon813.sesame.model.task.protectEcology; import org.json.JSONArray; import org.json.JSONObject; @@ -9,25 +9,25 @@ import java.util.Objects; import java.util.Set; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.BooleanModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.IntegerModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectAndCountModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayAnimal; -import io.github.lazyimmortal.sesame.entity.AlipayBeach; -import io.github.lazyimmortal.sesame.entity.AlipayMarathon; -import io.github.lazyimmortal.sesame.entity.AlipayNewAncientTree; -import io.github.lazyimmortal.sesame.entity.AlipayReserve; -import io.github.lazyimmortal.sesame.entity.AlipayTree; -import io.github.lazyimmortal.sesame.entity.CooperateUser; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.model.base.TaskCommon; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.*; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.BooleanModelField; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.data.modelFieldExt.IntegerModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectAndCountModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayAnimal; +import io.github.dragon813.sesame.entity.AlipayBeach; +import io.github.dragon813.sesame.entity.AlipayMarathon; +import io.github.dragon813.sesame.entity.AlipayNewAncientTree; +import io.github.dragon813.sesame.entity.AlipayReserve; +import io.github.dragon813.sesame.entity.AlipayTree; +import io.github.dragon813.sesame.entity.CooperateUser; +import io.github.dragon813.sesame.hook.Toast; +import io.github.dragon813.sesame.model.base.TaskCommon; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.*; public class ProtectEcology extends ModelTask { private static final String TAG = ProtectEcology.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectOceanRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectOceanRpcCall.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectOceanRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectOceanRpcCall.java index b3645779..7b880f92 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectOceanRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectOceanRpcCall.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.task.protectEcology; +package io.github.dragon813.sesame.model.task.protectEcology; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.RandomUtil; public class ProtectOceanRpcCall { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectTreeRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectTreeRpcCall.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectTreeRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectTreeRpcCall.java index f537e29f..2c4ebc50 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/protectEcology/ProtectTreeRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/protectEcology/ProtectTreeRpcCall.java @@ -1,8 +1,8 @@ -package io.github.lazyimmortal.sesame.model.task.protectEcology; +package io.github.dragon813.sesame.model.task.protectEcology; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.hook.ApplicationHook; public class ProtectTreeRpcCall { private static final String VERSION = "20230501"; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/readingDada/ReadingDada.java b/app/src/main/java/io/github/dragon813/sesame/model/task/readingDada/ReadingDada.java similarity index 85% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/readingDada/ReadingDada.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/readingDada/ReadingDada.java index d7e67ae9..0b83928b 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/readingDada/ReadingDada.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/readingDada/ReadingDada.java @@ -1,12 +1,12 @@ -package io.github.lazyimmortal.sesame.model.task.readingDada; +package io.github.dragon813.sesame.model.task.readingDada; import org.json.JSONArray; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.model.normal.answerAI.AnswerAI; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.StringUtil; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.model.normal.answerAI.AnswerAI; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.StringUtil; /** * @author Constanline diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/readingDada/ReadingDadaRpcCall.java b/app/src/main/java/io/github/dragon813/sesame/model/task/readingDada/ReadingDadaRpcCall.java similarity index 84% rename from app/src/main/java/io/github/lazyimmortal/sesame/model/task/readingDada/ReadingDadaRpcCall.java rename to app/src/main/java/io/github/dragon813/sesame/model/task/readingDada/ReadingDadaRpcCall.java index 63d5c3f3..10ffd82b 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/task/readingDada/ReadingDadaRpcCall.java +++ b/app/src/main/java/io/github/dragon813/sesame/model/task/readingDada/ReadingDadaRpcCall.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.model.task.readingDada; +package io.github.dragon813.sesame.model.task.readingDada; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.StringUtil; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.StringUtil; /** * @author Constanline diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/NewRpcBridge.java b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/NewRpcBridge.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/NewRpcBridge.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/bridge/NewRpcBridge.java index ccf02fac..ef1a0191 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/NewRpcBridge.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/NewRpcBridge.java @@ -1,14 +1,14 @@ -package io.github.lazyimmortal.sesame.rpc.bridge; +package io.github.dragon813.sesame.rpc.bridge; import de.robv.android.xposed.XposedHelpers; -import io.github.lazyimmortal.sesame.entity.RpcEntity; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.rpc.intervallimit.RpcIntervalLimit; -import io.github.lazyimmortal.sesame.util.ClassUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.NotificationUtil; -import io.github.lazyimmortal.sesame.util.RandomUtil; +import io.github.dragon813.sesame.entity.RpcEntity; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.rpc.intervallimit.RpcIntervalLimit; +import io.github.dragon813.sesame.util.ClassUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.NotificationUtil; +import io.github.dragon813.sesame.util.RandomUtil; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/OldRpcBridge.java b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/OldRpcBridge.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/OldRpcBridge.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/bridge/OldRpcBridge.java index da4a345c..1b98ba3c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/OldRpcBridge.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/OldRpcBridge.java @@ -1,13 +1,13 @@ -package io.github.lazyimmortal.sesame.rpc.bridge; +package io.github.dragon813.sesame.rpc.bridge; import org.json.JSONException; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.RuntimeInfo; -import io.github.lazyimmortal.sesame.entity.RpcEntity; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.rpc.intervallimit.RpcIntervalLimit; -import io.github.lazyimmortal.sesame.util.*; +import io.github.dragon813.sesame.data.RuntimeInfo; +import io.github.dragon813.sesame.entity.RpcEntity; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.rpc.intervallimit.RpcIntervalLimit; +import io.github.dragon813.sesame.util.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/RpcBridge.java b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/RpcBridge.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/RpcBridge.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/bridge/RpcBridge.java index 56edeb36..65ab9bb1 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/RpcBridge.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/RpcBridge.java @@ -1,6 +1,6 @@ -package io.github.lazyimmortal.sesame.rpc.bridge; +package io.github.dragon813.sesame.rpc.bridge; -import io.github.lazyimmortal.sesame.entity.RpcEntity; +import io.github.dragon813.sesame.entity.RpcEntity; public interface RpcBridge { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/RpcVersion.java b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/RpcVersion.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/RpcVersion.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/bridge/RpcVersion.java index 01db1273..492d9ced 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/bridge/RpcVersion.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/bridge/RpcVersion.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.rpc.bridge; +package io.github.dragon813.sesame.rpc.bridge; import lombok.Getter; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/DefaultIntervalLimit.java b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/DefaultIntervalLimit.java similarity index 81% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/DefaultIntervalLimit.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/DefaultIntervalLimit.java index 78d8368a..c4ab48e9 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/DefaultIntervalLimit.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/DefaultIntervalLimit.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.rpc.intervallimit; +package io.github.dragon813.sesame.rpc.intervallimit; import lombok.Data; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/FixedOrRangeIntervalLimit.java b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/FixedOrRangeIntervalLimit.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/FixedOrRangeIntervalLimit.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/FixedOrRangeIntervalLimit.java index edc3c814..e3beb28f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/FixedOrRangeIntervalLimit.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/FixedOrRangeIntervalLimit.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.rpc.intervallimit; +package io.github.dragon813.sesame.rpc.intervallimit; import lombok.Getter; import lombok.Setter; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/IntervalLimit.java b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/IntervalLimit.java similarity index 66% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/IntervalLimit.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/IntervalLimit.java index dd5c8677..6e285220 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/IntervalLimit.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/IntervalLimit.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.rpc.intervallimit; +package io.github.dragon813.sesame.rpc.intervallimit; public interface IntervalLimit { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/RpcIntervalLimit.java b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/RpcIntervalLimit.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/RpcIntervalLimit.java rename to app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/RpcIntervalLimit.java index 4a42e5dc..a5666803 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/rpc/intervallimit/RpcIntervalLimit.java +++ b/app/src/main/java/io/github/dragon813/sesame/rpc/intervallimit/RpcIntervalLimit.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.rpc.intervallimit; +package io.github.dragon813.sesame.rpc.intervallimit; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.TimeUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/BaseActivity.java b/app/src/main/java/io/github/dragon813/sesame/ui/BaseActivity.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/BaseActivity.java rename to app/src/main/java/io/github/dragon813/sesame/ui/BaseActivity.java index 3006472f..4c8a2633 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/BaseActivity.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/BaseActivity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.content.Context; import android.os.Bundle; @@ -8,9 +8,9 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ViewAppInfo; -import io.github.lazyimmortal.sesame.util.LanguageUtil; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ViewAppInfo; +import io.github.dragon813.sesame.util.LanguageUtil; public class BaseActivity extends AppCompatActivity { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ChoiceDialog.java b/app/src/main/java/io/github/dragon813/sesame/ui/ChoiceDialog.java similarity index 77% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/ChoiceDialog.java rename to app/src/main/java/io/github/dragon813/sesame/ui/ChoiceDialog.java index b27c676a..56dd9c30 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ChoiceDialog.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/ChoiceDialog.java @@ -1,9 +1,9 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.content.Context; import androidx.appcompat.app.AlertDialog; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.modelFieldExt.ChoiceModelField; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.modelFieldExt.ChoiceModelField; public class ChoiceDialog { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ExtensionsActivity.java b/app/src/main/java/io/github/dragon813/sesame/ui/ExtensionsActivity.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/ExtensionsActivity.java rename to app/src/main/java/io/github/dragon813/sesame/ui/ExtensionsActivity.java index 1b0ed74f..7b30b1f6 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ExtensionsActivity.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/ExtensionsActivity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.app.AlertDialog; import android.content.Context; @@ -9,9 +9,9 @@ import android.widget.Button; import android.widget.EditText; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.TokenConfig; -import io.github.lazyimmortal.sesame.util.ToastUtil; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.TokenConfig; +import io.github.dragon813.sesame.util.ToastUtil; public class ExtensionsActivity extends BaseActivity { @@ -136,7 +136,7 @@ public void onClick(View view) { @Override public void onClick(View view) { try { - startActivity(new Intent(ExtensionsActivity.this, Class.forName("io.github.lazyimmortal.sesame.ui.AlphaActivity"))); + startActivity(new Intent(ExtensionsActivity.this, Class.forName("io.github.dragon813.sesame.ui.AlphaActivity"))); } catch (Exception e) { ToastUtil.show(ExtensionsActivity.this, "不符合开启资格！"); } diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/HtmlViewerActivity.java b/app/src/main/java/io/github/dragon813/sesame/ui/HtmlViewerActivity.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/HtmlViewerActivity.java rename to app/src/main/java/io/github/dragon813/sesame/ui/HtmlViewerActivity.java index f4401dad..3b3e8b81 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/HtmlViewerActivity.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/HtmlViewerActivity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.annotation.SuppressLint; import android.content.ClipData; @@ -18,10 +18,9 @@ import java.io.File; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.LanguageUtil; -import io.github.lazyimmortal.sesame.util.ToastUtil; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.ToastUtil; public class HtmlViewerActivity extends BaseActivity { MyWebView mWebView; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ListAdapter.java b/app/src/main/java/io/github/dragon813/sesame/ui/ListAdapter.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/ListAdapter.java rename to app/src/main/java/io/github/dragon813/sesame/ui/ListAdapter.java index da39c99e..aab1a7ec 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ListAdapter.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/ListAdapter.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.content.Context; import android.graphics.Color; @@ -7,10 +7,10 @@ import android.widget.BaseAdapter; import android.widget.CheckBox; import android.widget.TextView; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.entity.IdAndName; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.entity.IdAndName; +import io.github.dragon813.sesame.util.Log; import java.util.*; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ListDialog.java b/app/src/main/java/io/github/dragon813/sesame/ui/ListDialog.java similarity index 91% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/ListDialog.java rename to app/src/main/java/io/github/dragon813/sesame/ui/ListDialog.java index 5b85e5c4..62d9c022 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ListDialog.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/ListDialog.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.annotation.SuppressLint; import android.content.Context; @@ -13,38 +13,38 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectAndCountModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectAndCountOneModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectOneModelField; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.entity.AlipayAnimal; -import io.github.lazyimmortal.sesame.entity.AlipayAntFarmDoFarmTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntFarmDrawMachineTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntForestHuntTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntForestVitalityTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntMemberTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntOceanAntiepTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntOrchardTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntSportsTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayAntStallTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayBeach; -import io.github.lazyimmortal.sesame.entity.AlipayMemberCreditSesameTaskList; -import io.github.lazyimmortal.sesame.entity.AlipayPlantScene; -import io.github.lazyimmortal.sesame.entity.AlipayForestHunt; -import io.github.lazyimmortal.sesame.entity.AlipayMarathon; -import io.github.lazyimmortal.sesame.entity.AlipayNewAncientTree; -import io.github.lazyimmortal.sesame.entity.AlipayReserve; -import io.github.lazyimmortal.sesame.entity.AlipayTree; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.entity.AlipayrpcRequest; -import io.github.lazyimmortal.sesame.entity.CooperateUser; -import io.github.lazyimmortal.sesame.entity.FriendWatch; -import io.github.lazyimmortal.sesame.entity.IdAndName; -import io.github.lazyimmortal.sesame.entity.WalkPath; -import io.github.lazyimmortal.sesame.util.ToastUtil; -import io.github.lazyimmortal.sesame.util.idMap.*; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.modelFieldExt.SelectAndCountModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectAndCountOneModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.data.modelFieldExt.SelectOneModelField; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.entity.AlipayAnimal; +import io.github.dragon813.sesame.entity.AlipayAntFarmDoFarmTaskList; +import io.github.dragon813.sesame.entity.AlipayAntFarmDrawMachineTaskList; +import io.github.dragon813.sesame.entity.AlipayAntForestHuntTaskList; +import io.github.dragon813.sesame.entity.AlipayAntForestVitalityTaskList; +import io.github.dragon813.sesame.entity.AlipayAntMemberTaskList; +import io.github.dragon813.sesame.entity.AlipayAntOceanAntiepTaskList; +import io.github.dragon813.sesame.entity.AlipayAntOrchardTaskList; +import io.github.dragon813.sesame.entity.AlipayAntSportsTaskList; +import io.github.dragon813.sesame.entity.AlipayAntStallTaskList; +import io.github.dragon813.sesame.entity.AlipayBeach; +import io.github.dragon813.sesame.entity.AlipayMemberCreditSesameTaskList; +import io.github.dragon813.sesame.entity.AlipayPlantScene; +import io.github.dragon813.sesame.entity.AlipayForestHunt; +import io.github.dragon813.sesame.entity.AlipayMarathon; +import io.github.dragon813.sesame.entity.AlipayNewAncientTree; +import io.github.dragon813.sesame.entity.AlipayReserve; +import io.github.dragon813.sesame.entity.AlipayTree; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.entity.AlipayrpcRequest; +import io.github.dragon813.sesame.entity.CooperateUser; +import io.github.dragon813.sesame.entity.FriendWatch; +import io.github.dragon813.sesame.entity.IdAndName; +import io.github.dragon813.sesame.entity.WalkPath; +import io.github.dragon813.sesame.util.ToastUtil; +import io.github.dragon813.sesame.util.idMap.*; import java.util.List; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/MainActivity.java b/app/src/main/java/io/github/dragon813/sesame/ui/MainActivity.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/MainActivity.java rename to app/src/main/java/io/github/dragon813/sesame/ui/MainActivity.java index 46316daa..12be1088 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/MainActivity.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/MainActivity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; @@ -29,22 +29,22 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.AppConfig; -import io.github.lazyimmortal.sesame.data.RunType; -import io.github.lazyimmortal.sesame.data.ViewAppInfo; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.entity.FriendWatch; -import io.github.lazyimmortal.sesame.entity.UserEntity; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.LanguageUtil; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.AppConfig; +import io.github.dragon813.sesame.data.RunType; +import io.github.dragon813.sesame.data.ViewAppInfo; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.entity.FriendWatch; +import io.github.dragon813.sesame.entity.UserEntity; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.LanguageUtil; import io.github.lazyimmortal.sesame.util.LibraryUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.PermissionUtil; -import io.github.lazyimmortal.sesame.util.Statistics; -import io.github.lazyimmortal.sesame.util.TimeUtil; -import io.github.lazyimmortal.sesame.util.ToastUtil; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.PermissionUtil; +import io.github.dragon813.sesame.util.Statistics; +import io.github.dragon813.sesame.util.TimeUtil; +import io.github.dragon813.sesame.util.ToastUtil; +import io.github.dragon813.sesame.util.idMap.UserIdMap; public class MainActivity extends BaseActivity { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/MyWebView.java b/app/src/main/java/io/github/dragon813/sesame/ui/MyWebView.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/MyWebView.java rename to app/src/main/java/io/github/dragon813/sesame/ui/MyWebView.java index d71b8f6a..9a2f68f7 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/MyWebView.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/MyWebView.java @@ -1,8 +1,7 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.content.Context; import android.util.AttributeSet; -import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/NewSettingsActivity.java b/app/src/main/java/io/github/dragon813/sesame/ui/NewSettingsActivity.java similarity index 86% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/NewSettingsActivity.java rename to app/src/main/java/io/github/dragon813/sesame/ui/NewSettingsActivity.java index 16780c87..39bea652 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/NewSettingsActivity.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/NewSettingsActivity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.annotation.SuppressLint; import android.app.AlertDialog; @@ -28,58 +28,56 @@ import java.util.List; import java.util.Map; -import io.github.lazyimmortal.sesame.BuildConfig; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.AppConfig; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.Model; -import io.github.lazyimmortal.sesame.data.ModelConfig; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.ModelGroup; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle; -import io.github.lazyimmortal.sesame.ui.dto.ModelDto; -import io.github.lazyimmortal.sesame.ui.dto.ModelFieldInfoDto; -import io.github.lazyimmortal.sesame.ui.dto.ModelFieldShowDto; -import io.github.lazyimmortal.sesame.ui.dto.ModelGroupDto; +import io.github.dragon813.sesame.BuildConfig; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.AppConfig; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.Model; +import io.github.dragon813.sesame.data.ModelConfig; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.ModelGroup; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.model.extensions.ExtensionsHandle; +import io.github.dragon813.sesame.ui.dto.ModelDto; +import io.github.dragon813.sesame.ui.dto.ModelFieldInfoDto; +import io.github.dragon813.sesame.ui.dto.ModelFieldShowDto; +import io.github.dragon813.sesame.ui.dto.ModelGroupDto; import io.github.lazyimmortal.sesame.util.AESUtil; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.LanguageUtil; -import io.github.lazyimmortal.sesame.util.LibraryUtil; -import io.github.lazyimmortal.sesame.util.Log; -import io.github.lazyimmortal.sesame.util.StringUtil; -import io.github.lazyimmortal.sesame.util.ToastUtil; -import io.github.lazyimmortal.sesame.util.idMap.AnimalIdMap; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDoFarmTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntFarmDrawMachineTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntForestHuntTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntForestVitalityTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntMemberTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntOceanAntiepTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntOrchardTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntSportsTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.AntStallTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.BeachIdMap; -import io.github.lazyimmortal.sesame.util.idMap.GameCenterMallItemMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberCreditSesameTaskListMap; -import io.github.lazyimmortal.sesame.util.idMap.PlantSceneIdMap; -import io.github.lazyimmortal.sesame.util.idMap.ForestHuntIdMap; -import io.github.lazyimmortal.sesame.util.idMap.CooperationIdMap; -import io.github.lazyimmortal.sesame.util.idMap.FarmOrnamentsIdMap; -import io.github.lazyimmortal.sesame.util.idMap.MarathonIdMap; -import io.github.lazyimmortal.sesame.util.idMap.MemberBenefitIdMap; -import io.github.lazyimmortal.sesame.util.idMap.NewAncientTreeIdMap; -import io.github.lazyimmortal.sesame.util.idMap.PromiseSimpleTemplateIdMap; -import io.github.lazyimmortal.sesame.util.idMap.ReserveIdMap; -import io.github.lazyimmortal.sesame.util.idMap.TreeIdMap; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; -import io.github.lazyimmortal.sesame.util.idMap.VitalityBenefitIdMap; -import io.github.lazyimmortal.sesame.util.idMap.WalkPathIdMap; -import io.github.lazyimmortal.sesame.util.idMap.rpcRequestMap; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.StringUtil; +import io.github.dragon813.sesame.util.ToastUtil; +import io.github.dragon813.sesame.util.idMap.AnimalIdMap; +import io.github.dragon813.sesame.util.idMap.AntFarmDoFarmTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntFarmDrawMachineTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntForestHuntTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntForestVitalityTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntMemberTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntOceanAntiepTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntOrchardTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntSportsTaskListMap; +import io.github.dragon813.sesame.util.idMap.AntStallTaskListMap; +import io.github.dragon813.sesame.util.idMap.BeachIdMap; +import io.github.dragon813.sesame.util.idMap.GameCenterMallItemMap; +import io.github.dragon813.sesame.util.idMap.MemberCreditSesameTaskListMap; +import io.github.dragon813.sesame.util.idMap.PlantSceneIdMap; +import io.github.dragon813.sesame.util.idMap.ForestHuntIdMap; +import io.github.dragon813.sesame.util.idMap.CooperationIdMap; +import io.github.dragon813.sesame.util.idMap.FarmOrnamentsIdMap; +import io.github.dragon813.sesame.util.idMap.MarathonIdMap; +import io.github.dragon813.sesame.util.idMap.MemberBenefitIdMap; +import io.github.dragon813.sesame.util.idMap.NewAncientTreeIdMap; +import io.github.dragon813.sesame.util.idMap.PromiseSimpleTemplateIdMap; +import io.github.dragon813.sesame.util.idMap.ReserveIdMap; +import io.github.dragon813.sesame.util.idMap.TreeIdMap; +import io.github.dragon813.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.util.idMap.VitalityBenefitIdMap; +import io.github.dragon813.sesame.util.idMap.WalkPathIdMap; +import io.github.dragon813.sesame.util.idMap.rpcRequestMap; public class NewSettingsActivity extends BaseActivity { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ObjReference.java b/app/src/main/java/io/github/dragon813/sesame/ui/ObjReference.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/ObjReference.java rename to app/src/main/java/io/github/dragon813/sesame/ui/ObjReference.java index b239d533..fe6ecf09 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ObjReference.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/ObjReference.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import lombok.Data; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ObjSyncReference.java b/app/src/main/java/io/github/dragon813/sesame/ui/ObjSyncReference.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/ObjSyncReference.java rename to app/src/main/java/io/github/dragon813/sesame/ui/ObjSyncReference.java index 474a488c..0f166f2f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/ObjSyncReference.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/ObjSyncReference.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import lombok.Data; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/OptionsAdapter.java b/app/src/main/java/io/github/dragon813/sesame/ui/OptionsAdapter.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/OptionsAdapter.java rename to app/src/main/java/io/github/dragon813/sesame/ui/OptionsAdapter.java index 66a88638..3713189f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/OptionsAdapter.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/OptionsAdapter.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/SettingsActivity.java b/app/src/main/java/io/github/dragon813/sesame/ui/SettingsActivity.java similarity index 96% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/SettingsActivity.java rename to app/src/main/java/io/github/dragon813/sesame/ui/SettingsActivity.java index b2bc37b2..f7795d9a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/SettingsActivity.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.annotation.SuppressLint; import android.app.AlertDialog; @@ -11,13 +11,14 @@ import androidx.core.content.ContextCompat; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.*; -import io.github.lazyimmortal.sesame.data.modelFieldExt.common.SelectModelFieldFunc; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.entity.AlipayUser; -import io.github.lazyimmortal.sesame.util.*; -import io.github.lazyimmortal.sesame.util.idMap.*; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.*; +import io.github.dragon813.sesame.data.modelFieldExt.common.SelectModelFieldFunc; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.entity.AlipayUser; +import io.github.dragon813.sesame.util.*; +import io.github.dragon813.sesame.util.idMap.*; +import io.github.lazyimmortal.sesame.util.LibraryUtil; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/StringDialog.java b/app/src/main/java/io/github/dragon813/sesame/ui/StringDialog.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/StringDialog.java rename to app/src/main/java/io/github/dragon813/sesame/ui/StringDialog.java index 2bf58cc4..2cc9e336 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/StringDialog.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/StringDialog.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.content.Context; import android.content.DialogInterface; @@ -8,9 +8,9 @@ import android.text.InputType; import android.widget.EditText; import androidx.appcompat.app.AlertDialog; -import io.github.lazyimmortal.sesame.R; -import io.github.lazyimmortal.sesame.data.ModelField; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.R; +import io.github.dragon813.sesame.data.ModelField; +import io.github.dragon813.sesame.util.Log; public class StringDialog { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/WatermarkView.java b/app/src/main/java/io/github/dragon813/sesame/ui/WatermarkView.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/WatermarkView.java rename to app/src/main/java/io/github/dragon813/sesame/ui/WatermarkView.java index 0e9958d2..aef36919 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/WatermarkView.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/WatermarkView.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui; +package io.github.dragon813.sesame.ui; import android.content.Context; import android.graphics.Canvas; @@ -10,7 +10,7 @@ import androidx.annotation.Nullable; -import io.github.lazyimmortal.sesame.util.WatermarkUtil; +import io.github.dragon813.sesame.util.WatermarkUtil; /** * 全局水印View diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelDto.java b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelDto.java similarity index 92% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelDto.java rename to app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelDto.java index b10ac07e..eed4b2d4 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelDto.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelDto.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui.dto; +package io.github.dragon813.sesame.ui.dto; import lombok.Data; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelFieldInfoDto.java b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelFieldInfoDto.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelFieldInfoDto.java rename to app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelFieldInfoDto.java index 4c977a0c..c68eff06 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelFieldInfoDto.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelFieldInfoDto.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.ui.dto; +package io.github.dragon813.sesame.ui.dto; import lombok.Data; -import io.github.lazyimmortal.sesame.data.ModelField; +import io.github.dragon813.sesame.data.ModelField; import java.io.Serializable; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelFieldShowDto.java b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelFieldShowDto.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelFieldShowDto.java rename to app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelFieldShowDto.java index 3d3beb9f..4061d2f7 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelFieldShowDto.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelFieldShowDto.java @@ -1,7 +1,7 @@ -package io.github.lazyimmortal.sesame.ui.dto; +package io.github.dragon813.sesame.ui.dto; import lombok.Data; -import io.github.lazyimmortal.sesame.data.ModelField; +import io.github.dragon813.sesame.data.ModelField; import java.io.Serializable; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelGroupDto.java b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelGroupDto.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelGroupDto.java rename to app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelGroupDto.java index b716ee77..0aa0ff8a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/ui/dto/ModelGroupDto.java +++ b/app/src/main/java/io/github/dragon813/sesame/ui/dto/ModelGroupDto.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.ui.dto; +package io.github.dragon813.sesame.ui.dto; import lombok.Data; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/AverageMath.java b/app/src/main/java/io/github/dragon813/sesame/util/AverageMath.java similarity index 94% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/AverageMath.java rename to app/src/main/java/io/github/dragon813/sesame/util/AverageMath.java index 49b29778..04e3ec1f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/AverageMath.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/AverageMath.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; public class AverageMath { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/CircularFifoQueue.java b/app/src/main/java/io/github/dragon813/sesame/util/CircularFifoQueue.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/CircularFifoQueue.java rename to app/src/main/java/io/github/dragon813/sesame/util/CircularFifoQueue.java index bf790c48..dceb1763 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/CircularFifoQueue.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/CircularFifoQueue.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/ClassUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/ClassUtil.java similarity index 91% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/ClassUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/ClassUtil.java index 6962907a..eb206b88 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/ClassUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/ClassUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; public class ClassUtil { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/FileUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/FileUtil.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/FileUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/FileUtil.java index ad2a774e..943b054a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/FileUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/FileUtil.java @@ -1,10 +1,10 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; -import static io.github.lazyimmortal.sesame.util.idMap.UserIdMap.getShowName; +import static io.github.dragon813.sesame.util.idMap.UserIdMap.getShowName; import android.os.Build; import android.os.Environment; -import io.github.lazyimmortal.sesame.hook.Toast; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.hook.Toast; +import io.github.dragon813.sesame.model.normal.base.BaseModel; import java.io.*; import java.nio.channels.FileChannel; import java.nio.file.Files; @@ -16,13 +16,13 @@ public class FileUtil { private static final String TAG = FileUtil.class.getSimpleName(); //路径 - public static final String CONFIG_DIRECTORY_NAME = "sesame"; + public static final String CONFIG_DIRECTORY_NAME = "sesame-GR"; public static final File MAIN_DIRECTORY_FILE = getMainDirectoryFile(); public static final File CONFIG_DIRECTORY_FILE = getConfigDirectoryFile(); public static final File LOG_DIRECTORY_FILE = getLogDirectoryFile(); private static File cityCodeFile; private static File wuaFile; - + // 备份相关配置（可根据需求调整n值，比如n=3则A/B/C循环） private static int BACKUP_MAX_COUNT = 5; // 配置读取失败时的默认值 private static final String BACKUP_DIR_NAME = "bak"; // 备份子目录名 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/HanziToPinyin.java b/app/src/main/java/io/github/dragon813/sesame/util/HanziToPinyin.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/HanziToPinyin.java rename to app/src/main/java/io/github/dragon813/sesame/util/HanziToPinyin.java index f9bd2e83..41b2db99 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/HanziToPinyin.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/HanziToPinyin.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.text.TextUtils; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/JsonUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/JsonUtil.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/JsonUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/JsonUtil.java index b67da674..bb65d32d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/JsonUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/JsonUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.annotation.SuppressLint; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/LanguageUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/LanguageUtil.java similarity index 89% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/LanguageUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/LanguageUtil.java index 79980479..615f12e8 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/LanguageUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/LanguageUtil.java @@ -1,11 +1,11 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.content.Context; import android.content.res.Configuration; import java.util.Locale; -import io.github.lazyimmortal.sesame.data.AppConfig; +import io.github.dragon813.sesame.data.AppConfig; public class LanguageUtil { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/ListUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/ListUtil.java similarity index 90% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/ListUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/ListUtil.java index b3b8ff18..b0050f65 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/ListUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/ListUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import java.util.ArrayList; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/Log.java b/app/src/main/java/io/github/dragon813/sesame/util/Log.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/Log.java rename to app/src/main/java/io/github/dragon813/sesame/util/Log.java index 3a0f1ed8..47a604ee 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/Log.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/Log.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import com.elvishew.xlog.LogLevel; import com.elvishew.xlog.Logger; @@ -8,7 +8,7 @@ import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy; import com.elvishew.xlog.printer.file.clean.NeverCleanStrategy; import com.elvishew.xlog.printer.file.naming.FileNameGenerator; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.model.normal.base.BaseModel; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/MessageUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/MessageUtil.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/MessageUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/MessageUtil.java index 2c0d2761..1d76e50e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/MessageUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/MessageUtil.java @@ -1,12 +1,11 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import org.json.JSONObject; -import io.github.lazyimmortal.sesame.data.ConfigV2; -import io.github.lazyimmortal.sesame.data.ModelFields; -import io.github.lazyimmortal.sesame.data.modelFieldExt.SelectModelField; -import io.github.lazyimmortal.sesame.model.task.antMember.AntMember; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.ConfigV2; +import io.github.dragon813.sesame.data.ModelFields; +import io.github.dragon813.sesame.data.modelFieldExt.SelectModelField; +import io.github.dragon813.sesame.util.idMap.UserIdMap; public class MessageUtil { private static final String TAG = MessageUtil.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/NotificationUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/NotificationUtil.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/NotificationUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/NotificationUtil.java index 3ed52ee2..8e4caba6 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/NotificationUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/NotificationUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.app.*; import android.content.Context; @@ -7,8 +7,8 @@ import android.net.Uri; import android.os.Build; import lombok.Getter; -import io.github.lazyimmortal.sesame.data.RuntimeInfo; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.data.RuntimeInfo; +import io.github.dragon813.sesame.model.normal.base.BaseModel; public class NotificationUtil { private static Context context; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/PermissionUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/PermissionUtil.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/PermissionUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/PermissionUtil.java index e3f8012f..62ea7afd 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/PermissionUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/PermissionUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.app.AlarmManager; import android.content.ActivityNotFoundException; @@ -11,8 +11,8 @@ import android.os.PowerManager; import android.provider.Settings; import androidx.appcompat.app.AppCompatActivity; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.model.task.antForest.AntForestRpcCall; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.model.task.antForest.AntForestRpcCall; public class PermissionUtil { private static final String TAG = AntForestRpcCall.class.getSimpleName(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/RandomUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/RandomUtil.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/RandomUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/RandomUtil.java index 8ff2ff9d..7a84ff1a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/RandomUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/RandomUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import java.util.Random; import java.util.UUID; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/Statistics.java b/app/src/main/java/io/github/dragon813/sesame/util/Statistics.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/Statistics.java rename to app/src/main/java/io/github/dragon813/sesame/util/Statistics.java index 6dc1c24a..13a383ba 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/Statistics.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/Statistics.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.content.Context; @@ -7,7 +7,7 @@ import java.io.File; import java.util.Calendar; -import io.github.lazyimmortal.sesame.R; +import io.github.dragon813.sesame.R; import lombok.Data; @Data diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/Status.java b/app/src/main/java/io/github/dragon813/sesame/util/Status.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/Status.java rename to app/src/main/java/io/github/dragon813/sesame/util/Status.java index fa7b6609..9bd3511a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/Status.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/Status.java @@ -1,13 +1,13 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import com.fasterxml.jackson.databind.JsonMappingException; import lombok.Data; -import io.github.lazyimmortal.sesame.data.task.ModelTask; -import io.github.lazyimmortal.sesame.model.task.antFarm.AntFarm; -import io.github.lazyimmortal.sesame.model.task.antForest.AntForestV2; -import io.github.lazyimmortal.sesame.util.idMap.UserIdMap; +import io.github.dragon813.sesame.data.task.ModelTask; +import io.github.dragon813.sesame.model.task.antFarm.AntFarm; +import io.github.dragon813.sesame.model.task.antForest.AntForestV2; +import io.github.dragon813.sesame.util.idMap.UserIdMap; import java.io.File; import java.util.*; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/StringUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/StringUtil.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/StringUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/StringUtil.java index 00919207..8bae367a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/StringUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/StringUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import java.util.Collection; import java.util.Iterator; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/ThreadUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/ThreadUtil.java similarity index 97% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/ThreadUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/ThreadUtil.java index 0a3674d7..f0903ce3 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/ThreadUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/ThreadUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/TimeUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/TimeUtil.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/TimeUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/TimeUtil.java index ba888d1c..5343a7f6 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/TimeUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/TimeUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.annotation.SuppressLint; @@ -7,7 +7,6 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; /** * @author Constanline diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/ToastUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/ToastUtil.java similarity index 83% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/ToastUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/ToastUtil.java index f9b61ed3..4ff86b4e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/ToastUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/ToastUtil.java @@ -1,9 +1,9 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import android.content.Context; import android.widget.Toast; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; +import io.github.dragon813.sesame.model.normal.base.BaseModel; public class ToastUtil { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/TypeUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/TypeUtil.java similarity index 99% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/TypeUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/TypeUtil.java index ba64ab76..51c87c8c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/TypeUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/TypeUtil.java @@ -1,5 +1,5 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/WatermarkUtil.java b/app/src/main/java/io/github/dragon813/sesame/util/WatermarkUtil.java similarity index 98% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/WatermarkUtil.java rename to app/src/main/java/io/github/dragon813/sesame/util/WatermarkUtil.java index 41c5c54f..140d1265 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/WatermarkUtil.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/WatermarkUtil.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util; +package io.github.dragon813.sesame.util; /** * 水印工具类 diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AnimalIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AnimalIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AnimalIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AnimalIdMap.java index aae3bb7d..173d654d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AnimalIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AnimalIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AnimalIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntFarmDoFarmTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntFarmDoFarmTaskListMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntFarmDoFarmTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntFarmDoFarmTaskListMap.java index e072c633..bf40af47 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntFarmDoFarmTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntFarmDoFarmTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntFarmDoFarmTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntFarmDrawMachineTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntFarmDrawMachineTaskListMap.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntFarmDrawMachineTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntFarmDrawMachineTaskListMap.java index 71f94e1a..6510176e 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntFarmDrawMachineTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntFarmDrawMachineTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntFarmDrawMachineTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntForestHuntTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntForestHuntTaskListMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntForestHuntTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntForestHuntTaskListMap.java index 23478127..493d73d4 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntForestHuntTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntForestHuntTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntForestHuntTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntForestVitalityTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntForestVitalityTaskListMap.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntForestVitalityTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntForestVitalityTaskListMap.java index a5897708..c11ac0dc 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntForestVitalityTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntForestVitalityTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntForestVitalityTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntMemberTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntMemberTaskListMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntMemberTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntMemberTaskListMap.java index 15616295..ce521407 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntMemberTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntMemberTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntMemberTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntOceanAntiepTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntOceanAntiepTaskListMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntOceanAntiepTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntOceanAntiepTaskListMap.java index 4fce86f4..69b99f5c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntOceanAntiepTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntOceanAntiepTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntOceanAntiepTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntOrchardTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntOrchardTaskListMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntOrchardTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntOrchardTaskListMap.java index 466ee03d..21bf3b63 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntOrchardTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntOrchardTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntOrchardTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntSportsTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntSportsTaskListMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntSportsTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntSportsTaskListMap.java index 336abe37..94e8d498 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntSportsTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntSportsTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntSportsTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntStallTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntStallTaskListMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntStallTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/AntStallTaskListMap.java index 27ca22d8..6026a75f 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/AntStallTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/AntStallTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class AntStallTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/BeachIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/BeachIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/BeachIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/BeachIdMap.java index 463115ae..cc9cda7d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/BeachIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/BeachIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class BeachIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/CooperationIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/CooperationIdMap.java similarity index 86% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/CooperationIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/CooperationIdMap.java index 6922b0c8..f2187b7a 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/CooperationIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/CooperationIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class CooperationIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/FarmOrnamentsIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/FarmOrnamentsIdMap.java similarity index 86% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/FarmOrnamentsIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/FarmOrnamentsIdMap.java index b74941f4..3f877d77 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/FarmOrnamentsIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/FarmOrnamentsIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class FarmOrnamentsIdMap { private static final Map idMap = new ConcurrentHashMap<>(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/ForestHuntIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/ForestHuntIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/ForestHuntIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/ForestHuntIdMap.java index 379895ff..f91b6362 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/ForestHuntIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/ForestHuntIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class ForestHuntIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/GameCenterMallItemMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/GameCenterMallItemMap.java similarity index 86% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/GameCenterMallItemMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/GameCenterMallItemMap.java index f849b88c..13f2a398 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/GameCenterMallItemMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/GameCenterMallItemMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class GameCenterMallItemMap { private static final Map idMap = new ConcurrentHashMap<>(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MarathonIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/MarathonIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MarathonIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/MarathonIdMap.java index 5888ff6c..3322eecf 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MarathonIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/MarathonIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class MarathonIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MemberBenefitIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/MemberBenefitIdMap.java similarity index 86% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MemberBenefitIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/MemberBenefitIdMap.java index 62b2ad21..ebe57f5d 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MemberBenefitIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/MemberBenefitIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class MemberBenefitIdMap { private static final Map idMap = new ConcurrentHashMap<>(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MemberCreditSesameTaskListMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/MemberCreditSesameTaskListMap.java similarity index 88% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MemberCreditSesameTaskListMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/MemberCreditSesameTaskListMap.java index a62b138a..23577734 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/MemberCreditSesameTaskListMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/MemberCreditSesameTaskListMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class MemberCreditSesameTaskListMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/NewAncientTreeIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/NewAncientTreeIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/NewAncientTreeIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/NewAncientTreeIdMap.java index b2f3d67f..c20edb45 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/NewAncientTreeIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/NewAncientTreeIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class NewAncientTreeIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/PlantSceneIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/PlantSceneIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/PlantSceneIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/PlantSceneIdMap.java index fb8802fa..161d4b5c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/PlantSceneIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/PlantSceneIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class PlantSceneIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/PromiseSimpleTemplateIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/PromiseSimpleTemplateIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/PromiseSimpleTemplateIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/PromiseSimpleTemplateIdMap.java index ad7e5406..05a608ee 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/PromiseSimpleTemplateIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/PromiseSimpleTemplateIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class PromiseSimpleTemplateIdMap { private static final Map idMap = new ConcurrentHashMap<>(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/ReserveIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/ReserveIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/ReserveIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/ReserveIdMap.java index 7235f174..23dec6ff 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/ReserveIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/ReserveIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class ReserveIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/TreeIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/TreeIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/TreeIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/TreeIdMap.java index f80a132d..8e916095 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/TreeIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/TreeIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class TreeIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/UserIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/UserIdMap.java similarity index 95% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/UserIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/UserIdMap.java index f5031449..68b49d6c 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/UserIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/UserIdMap.java @@ -1,14 +1,14 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; import de.robv.android.xposed.XposedHelpers; import lombok.Getter; -import io.github.lazyimmortal.sesame.entity.UserEntity; -import io.github.lazyimmortal.sesame.hook.ApplicationHook; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.entity.UserEntity; +import io.github.dragon813.sesame.hook.ApplicationHook; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; import java.lang.reflect.Field; import java.util.*; diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/VitalityBenefitIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/VitalityBenefitIdMap.java similarity index 86% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/VitalityBenefitIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/VitalityBenefitIdMap.java index b93832dc..05458f97 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/VitalityBenefitIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/VitalityBenefitIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class VitalityBenefitIdMap { private static final Map idMap = new ConcurrentHashMap<>(); diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/WalkPathIdMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/WalkPathIdMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/WalkPathIdMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/WalkPathIdMap.java index 1731b538..98f5c926 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/WalkPathIdMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/WalkPathIdMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class WalkPathIdMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/rpcRequestMap.java b/app/src/main/java/io/github/dragon813/sesame/util/idMap/rpcRequestMap.java similarity index 87% rename from app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/rpcRequestMap.java rename to app/src/main/java/io/github/dragon813/sesame/util/idMap/rpcRequestMap.java index 06b1e7d6..124a21dd 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/idMap/rpcRequestMap.java +++ b/app/src/main/java/io/github/dragon813/sesame/util/idMap/rpcRequestMap.java @@ -1,4 +1,4 @@ -package io.github.lazyimmortal.sesame.util.idMap; +package io.github.dragon813.sesame.util.idMap; import com.fasterxml.jackson.core.type.TypeReference; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lazyimmortal.sesame.util.FileUtil; -import io.github.lazyimmortal.sesame.util.JsonUtil; -import io.github.lazyimmortal.sesame.util.Log; +import io.github.dragon813.sesame.util.FileUtil; +import io.github.dragon813.sesame.util.JsonUtil; +import io.github.dragon813.sesame.util.Log; public class rpcRequestMap { diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/BuildConfig.java b/app/src/main/java/io/github/lazyimmortal/sesame/BuildConfig.java new file mode 100644 index 00000000..af069284 --- /dev/null +++ b/app/src/main/java/io/github/lazyimmortal/sesame/BuildConfig.java @@ -0,0 +1,21 @@ +// ⚠️ 注意：这个类只是转发到真正的 BuildConfig，避免重复维护字段 +package io.github.lazyimmortal.sesame; + +// 导入真正的自动生成的 BuildConfig +public final class BuildConfig { + + // ===== 转发自动生成的字段 ===== + public static final boolean DEBUG = io.github.dragon813.sesame.BuildConfig.DEBUG; + public static final String APPLICATION_ID = "io.github.dragon813.sesame"; + public static final String BUILD_TYPE = io.github.dragon813.sesame.BuildConfig.BUILD_TYPE; + public static final int VERSION_CODE = io.github.dragon813.sesame.BuildConfig.VERSION_CODE; + public static final String VERSION_NAME = io.github.dragon813.sesame.BuildConfig.VERSION_NAME; + + // ===== 转发你自定义的字段 ===== + public static final String GIT_COMMIT_HASH = io.github.dragon813.sesame.BuildConfig.GIT_COMMIT_HASH; + public static final String GIT_BRANCH_NAME = io.github.dragon813.sesame.BuildConfig.GIT_BRANCH_NAME; + public static final String BUILD_TIME = io.github.dragon813.sesame.BuildConfig.BUILD_TIME; + + // ===== 防止实例化 ===== + private BuildConfig() {} +} \ No newline at end of file diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/model/base/ModelOrder.java b/app/src/main/java/io/github/lazyimmortal/sesame/model/base/ModelOrder.java deleted file mode 100644 index 817ef923..00000000 --- a/app/src/main/java/io/github/lazyimmortal/sesame/model/base/ModelOrder.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.github.lazyimmortal.sesame.model.base; - -import java.util.ArrayList; -import java.util.List; - -import io.github.lazyimmortal.sesame.data.Model; -import io.github.lazyimmortal.sesame.model.extensions.ExtensionsHandle; -import io.github.lazyimmortal.sesame.model.normal.answerAI.AnswerAI; -import io.github.lazyimmortal.sesame.model.normal.base.BaseModel; -import io.github.lazyimmortal.sesame.model.task.antDodo.AntDodo; -import io.github.lazyimmortal.sesame.model.task.antFarm.AntFarm; -import io.github.lazyimmortal.sesame.model.task.antForest.AntForestV2; -import io.github.lazyimmortal.sesame.model.task.antMember.AntMember; -import io.github.lazyimmortal.sesame.model.task.antOcean.AntOcean; -import io.github.lazyimmortal.sesame.model.task.antOrchard.AntOrchard; -import io.github.lazyimmortal.sesame.model.task.antSports.AntSports; -import io.github.lazyimmortal.sesame.model.task.antStall.AntStall; -import io.github.lazyimmortal.sesame.model.task.greenFinance.GreenFinance; -import io.github.lazyimmortal.sesame.model.task.protectEcology.ProtectEcology; -import lombok.Getter; - -public class ModelOrder { - - @Getter - private static final List> clazzList = new ArrayList<>(); - - static { - clazzList.add(BaseModel.class); - clazzList.add(AntForestV2.class); - clazzList.add(AntFarm.class); - clazzList.add(AntStall.class); - clazzList.add(AntOrchard.class); - clazzList.add(ProtectEcology.class); - clazzList.add(AntDodo.class); - clazzList.add(AntOcean.class); - clazzList.add(AntSports.class); - clazzList.add(AntMember.class); - clazzList.add(GreenFinance.class); - clazzList.add(AnswerAI.class); - - ExtensionsHandle.handleAlphaRequest("ModelOrder", "addExtensionsClass", clazzList); - } -} \ No newline at end of file diff --git a/app/src/main/java/io/github/lazyimmortal/sesame/util/LibraryUtil.java b/app/src/main/java/io/github/lazyimmortal/sesame/util/LibraryUtil.java index aa84dfee..38bbf5eb 100644 --- a/app/src/main/java/io/github/lazyimmortal/sesame/util/LibraryUtil.java +++ b/app/src/main/java/io/github/lazyimmortal/sesame/util/LibraryUtil.java @@ -5,7 +5,9 @@ import org.json.JSONObject; -import io.github.lazyimmortal.sesame.BuildConfig; +import io.github.dragon813.sesame.BuildConfig; +import io.github.dragon813.sesame.util.Log; +import io.github.dragon813.sesame.util.ToastUtil; public class LibraryUtil { private static final String TAG = LibraryUtil.class.getSimpleName(); diff --git a/app/src/main/res/layout/activity_html_viewer.xml b/app/src/main/res/layout/activity_html_viewer.xml index 04ffd92e..3e3b8e7a 100644 --- a/app/src/main/res/layout/activity_html_viewer.xml +++ b/app/src/main/res/layout/activity_html_viewer.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> -