@nakamura-123/pages 1.1.17 → 1.1.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/component/Basic/Badge5s.js +18 -30
- package/dist/component/Basic/BasicContents.js +38 -39
- package/dist/component/Basic/BasicProgressBar.js +16 -17
- package/dist/component/Basic/BasicSetting.js +14 -15
- package/dist/component/Basic/MiniTestCard.js +32 -33
- package/dist/component/Basic/Paw5s.js +9 -13
- package/dist/component/Basic/SelectedExamCnt.js +14 -15
- package/dist/component/Basic/SubCategoryLeft.js +5 -6
- package/dist/component/Basic/SubCategoryList.js +49 -62
- package/dist/component/Boot/SelectRange.js +18 -21
- package/dist/component/Boot/ToggleRange.js +11 -14
- package/dist/component/Coin/AppReviews.js +9 -10
- package/dist/component/Coin/CatchCopy.js +6 -6
- package/dist/component/Coin/CoinCheck.js +18 -54
- package/dist/component/Coin/CoinFnc.js +210 -282
- package/dist/component/Coin/CoinPageComponent.d.ts +1 -0
- package/dist/component/Coin/CoinPageComponent.js +22 -22
- package/dist/component/Coin/ReceiptFnc.js +3 -3
- package/dist/component/Coin/Recommend.js +10 -10
- package/dist/component/Coin/WaitingPayBanner.js +8 -9
- package/dist/component/Discription.js +6 -7
- package/dist/component/Grade/AllTags.js +12 -12
- package/dist/component/Grade/BasicBadge.js +20 -32
- package/dist/component/Grade/GradeCard/ChangeWeeklyModal.js +8 -10
- package/dist/component/Grade/GradeCard/ChangeWeeklyTargetBtn.js +21 -22
- package/dist/component/Grade/GradeCard/DatePickerModal.js +17 -19
- package/dist/component/Grade/GradeCard/GradeCard.js +19 -20
- package/dist/component/Grade/GradeCard/Square3sGrade.js +16 -17
- package/dist/component/Grade/GradeCard/TargetDate.js +19 -20
- package/dist/component/Grade/GradeCard/WeeklyAchivedRate.js +7 -8
- package/dist/component/Grade/GradeCard/WeeklyProgress.js +19 -29
- package/dist/component/Grade/JAllTags.js +16 -16
- package/dist/component/Grade/QuizCntGraph.js +31 -45
- package/dist/component/Grade/ShareBtn.js +30 -68
- package/dist/component/Grade/Square4s.js +14 -15
- package/dist/component/Grade/UnitCircles.js +18 -23
- package/dist/component/Grade/YearCircles.js +17 -22
- package/dist/component/Guide.js +6 -7
- package/dist/component/Home/OpeningMsg.js +14 -14
- package/dist/component/OnlineInput/OnlineInputFnc.js +6 -6
- package/dist/component/OnlineInput/OnlineSaveBtn.js +7 -8
- package/dist/component/OnlineInput/OnlineSavedList.js +13 -14
- package/dist/component/OnlineInput/PasswardModal.js +64 -110
- package/dist/component/OnlineInput/PasswordIdModal.js +40 -80
- package/dist/component/QuizSet/QuizOptionDrill.js +29 -42
- package/dist/component/Result/AdCard.js +21 -16
- package/dist/component/Result/CharaCard.js +15 -16
- package/dist/component/Result/LessonTitle.js +10 -10
- package/dist/component/Result/QuizFlatList.js +26 -30
- package/dist/component/Result/ScoreCircle.js +8 -9
- package/dist/component/SelectRange/SelectYearRange.js +22 -34
- package/dist/component/SettingBtns/QuizOptionSelector.js +16 -17
- package/dist/component/SettingBtns/Range.js +9 -9
- package/dist/component/SettingBtns/TransBtn.js +17 -17
- package/dist/component/TabAnimeView.js +9 -10
- package/dist/component/Tag5s.js +10 -14
- package/dist/component/TagBadge5s.js +16 -17
- package/dist/component/TagBadge5sPress.js +14 -15
- package/dist/component/TestPage/AverageBar.js +12 -24
- package/dist/component/TestPage/BarChartContainer.js +30 -31
- package/dist/component/TestPage/ChartControl.js +5 -6
- package/dist/component/TestPage/Square3s.js +12 -13
- package/dist/functions/badgeBasicFnc.js +22 -42
- package/dist/functions/badgeDailyFnc.js +24 -35
- package/dist/functions/badgeFilter.js +16 -18
- package/dist/functions/badgeFnc.js +24 -33
- package/dist/functions/createQuizFncD.js +33 -33
- package/dist/functions/createQuizFncJ.js +27 -33
- package/dist/functions/gradeFnc.js +48 -87
- package/dist/functions/oldStorageFnc.js +77 -200
- package/dist/functions/questionFilterD.js +19 -28
- package/dist/functions/questionFilterJ.js +9 -9
- package/dist/functions/questionFormatD.js +34 -47
- package/dist/functions/questionFormatJ.js +30 -41
- package/dist/functions/tagFncD.js +37 -39
- package/dist/functions/tagFncJ.js +16 -19
- package/dist/functions/testFnc.js +6 -7
- package/dist/hooks/BadgeHook.js +24 -35
- package/dist/hooks/ExitQuizHook.js +21 -21
- package/dist/hooks/basicHook.js +12 -12
- package/dist/hooks/quizActionHook.js +44 -57
- package/dist/hooks/quizHook.d.ts +2 -1
- package/dist/hooks/quizHook.js +58 -48
- package/dist/index.js +25 -25
- package/dist/page/BadgePage.js +26 -29
- package/dist/page/BasicPage.js +23 -25
- package/dist/page/BootPage.js +48 -53
- package/dist/page/CoinPage.d.ts +1 -0
- package/dist/page/CoinPage.js +90 -144
- package/dist/page/FAQPage.js +23 -23
- package/dist/page/GetBadgePage.js +35 -71
- package/dist/page/GradePage.js +26 -27
- package/dist/page/GuidePage.js +28 -33
- package/dist/page/HistoryPage.js +25 -33
- package/dist/page/HomePage.d.ts +1 -0
- package/dist/page/HomePage.js +62 -108
- package/dist/page/ImgZoom.js +8 -9
- package/dist/page/InformationPage.js +15 -15
- package/dist/page/JDetailSettingPage.js +23 -25
- package/dist/page/OnlineInputPage.js +19 -20
- package/dist/page/QuizPage.js +25 -26
- package/dist/page/QuizSettingPage.js +19 -19
- package/dist/page/QuizSetupPage.js +40 -43
- package/dist/page/ReportPage.js +55 -94
- package/dist/page/ResultPage.js +55 -103
- package/dist/page/SettingPage.js +35 -40
- package/dist/page/TestPage.js +41 -44
- package/dist/quiz/QuizContentsDrill.js +17 -18
- package/dist/quiz/QuizContentsJLPT.js +8 -9
- package/dist/quiz/Title.js +22 -22
- package/dist/quiz/answer/Answer.js +20 -20
- package/dist/quiz/answer/BlangGuide.js +10 -10
- package/dist/quiz/answer/BlankAnswer.js +11 -12
- package/dist/quiz/answer/BlankBtn.js +10 -10
- package/dist/quiz/answer/CheckButton.js +6 -9
- package/dist/quiz/answer/ChoiceView.js +15 -30
- package/dist/quiz/answer/Input/CollapseExplain.js +10 -11
- package/dist/quiz/answer/Input/InputAnswerBtn.js +9 -9
- package/dist/quiz/answer/Input/InputBox.js +17 -18
- package/dist/quiz/answer/Input/InputCounter.js +6 -7
- package/dist/quiz/answer/Input/InputFnc.js +10 -19
- package/dist/quiz/answer/Input/InputSaveSelector.js +12 -13
- package/dist/quiz/answer/Input/InputTab.js +12 -13
- package/dist/quiz/answer/Input/InputWarnning.js +13 -14
- package/dist/quiz/answer/InputGuide.js +10 -10
- package/dist/quiz/answer/InputNav.js +38 -39
- package/dist/quiz/answer/MultiChoice.js +20 -22
- package/dist/quiz/answer/MultiGuide.js +10 -10
- package/dist/quiz/answer/MultiNextBtn.js +13 -14
- package/dist/quiz/answer/NormalChoice.js +29 -42
- package/dist/quiz/answer/NormalMultiGuide.js +11 -12
- package/dist/quiz/answer/styles/getChoiceStyle.js +4 -4
- package/dist/quiz/check/Check.js +17 -18
- package/dist/quiz/check/NextQuizBtn.js +18 -19
- package/dist/quiz/check/SelectTag.js +36 -51
- package/dist/quiz/common/MyTextqqyy.js +29 -47
- package/dist/quiz/common/PageContainerWrap.js +14 -15
- package/dist/quiz/common/RenderImgOrText.js +17 -18
- package/dist/quiz/common/RubyText.js +21 -35
- package/dist/quiz/common/ZoomableImage.js +6 -9
- package/dist/quiz/explain/CorrectedBar.js +13 -14
- package/dist/quiz/explain/Explain.js +9 -10
- package/dist/quiz/explain/ExplainLogic.js +17 -23
- package/dist/quiz/explain/MovieBtn.js +10 -11
- package/dist/quiz/explain/MultiExplain.js +12 -24
- package/dist/quiz/explain/NormalExplain.js +29 -30
- package/dist/quiz/function/choiceFnc.js +2 -2
- package/dist/quiz/jAnswer/JAnswer.js +24 -26
- package/dist/quiz/jAnswer/JAnswerContents.js +12 -27
- package/dist/quiz/jQuestion/JQuestion.js +12 -13
- package/dist/quiz/jQuestion/JQuestionBottomText.js +14 -15
- package/dist/quiz/jQuestion/JQuestionText.js +13 -14
- package/dist/quiz/jQuestion/QuizCnt.js +9 -9
- package/dist/quiz/jQuestion/TimeLimit.js +23 -25
- package/dist/quiz/question/FillDiagram.js +12 -13
- package/dist/quiz/question/Question.js +25 -26
- package/dist/quiz/question/QuestionFormats.js +29 -45
- package/dist/quiz/question/QuestionReference.js +7 -7
- package/dist/quiz/question/SearchYoutue.js +10 -11
- package/dist/quiz/save/QuizSaveData.js +18 -19
- package/dist/quiz/setting/Above3BtnJ.js +25 -30
- package/dist/quiz/setting/Bottom3Btn.js +25 -30
- package/dist/quiz/setting/GuideBtn.js +19 -22
- package/dist/quiz/setting/RepeatBtn.js +27 -34
- package/dist/quiz/setting/ReturnBtn.js +8 -20
- package/dist/quiz/setting/ReturnSaveBtn.js +21 -33
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -8,209 +8,150 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
12
|
exports.getAndroidPurchaseState = exports.updateAllFreeState = exports.restorePurchases = exports.handlePurchase = exports.initializeIAP = void 0;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
13
|
+
const react_native_1 = require("react-native");
|
|
14
|
+
const expo_iap_1 = require("expo-iap");
|
|
15
|
+
const stores_1 = require("@nakamura-123/stores");
|
|
16
|
+
const ReceiptFnc_1 = require("./ReceiptFnc");
|
|
44
17
|
// const { pushCoinLog, pushCoinError, pushCoinWarn } = errorAction;
|
|
45
18
|
// 01. IAPの初期化
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
console.log("商品数: ", productList.length);
|
|
64
|
-
productList.forEach(function (product, index) {
|
|
65
|
-
console.log("\u5546\u54C1[".concat(index, "] ID: "), product.id);
|
|
66
|
-
console.log("\u5546\u54C1[".concat(index, "] Title: "), product.title);
|
|
67
|
-
console.log("\u5546\u54C1[".concat(index, "] productId: "), product.productId);
|
|
68
|
-
});
|
|
69
|
-
setProducts && setProducts(productList);
|
|
70
|
-
return [3 /*break*/, 4];
|
|
71
|
-
case 3:
|
|
72
|
-
console.warn("No SKUs provided.");
|
|
73
|
-
_a.label = 4;
|
|
74
|
-
case 4: return [3 /*break*/, 7];
|
|
75
|
-
case 5:
|
|
76
|
-
err_1 = _a.sent();
|
|
77
|
-
console.error("IAP Initialization Error: ", err_1);
|
|
78
|
-
console.error("エラーの詳細: ", err_1 instanceof Error ? err_1.message : String(err_1));
|
|
79
|
-
return [3 /*break*/, 7];
|
|
80
|
-
case 6:
|
|
81
|
-
setLoading && setLoading(false);
|
|
82
|
-
return [7 /*endfinally*/];
|
|
83
|
-
case 7: return [2 /*return*/];
|
|
19
|
+
const initializeIAP = (paymentItems, setProducts, setLoading) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
+
try {
|
|
21
|
+
const result = yield (0, expo_iap_1.initConnection)();
|
|
22
|
+
console.log("IAP接続結果: ", result);
|
|
23
|
+
// アイテムリストを取得
|
|
24
|
+
const itemSkus = paymentItems || [];
|
|
25
|
+
console.log("Item SKUs: ", itemSkus);
|
|
26
|
+
if (itemSkus.length > 0) {
|
|
27
|
+
const productList = yield (0, expo_iap_1.fetchProducts)({ skus: itemSkus });
|
|
28
|
+
console.log("Product List: ", productList);
|
|
29
|
+
console.log("商品数: ", productList.length);
|
|
30
|
+
productList.forEach((product, index) => {
|
|
31
|
+
console.log(`商品[${index}] ID: `, product.id);
|
|
32
|
+
console.log(`商品[${index}] Title: `, product.title);
|
|
33
|
+
console.log(`商品[${index}] productId: `, product.productId);
|
|
34
|
+
});
|
|
35
|
+
setProducts && setProducts(productList);
|
|
84
36
|
}
|
|
85
|
-
|
|
86
|
-
|
|
37
|
+
else {
|
|
38
|
+
console.warn("No SKUs provided.");
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
catch (err) {
|
|
42
|
+
console.error("IAP Initialization Error: ", err);
|
|
43
|
+
console.error("エラーの詳細: ", err instanceof Error ? err.message : String(err));
|
|
44
|
+
}
|
|
45
|
+
finally {
|
|
46
|
+
setLoading && setLoading(false);
|
|
47
|
+
}
|
|
48
|
+
});
|
|
87
49
|
exports.initializeIAP = initializeIAP;
|
|
88
50
|
// 11. 購入処理
|
|
89
|
-
|
|
90
|
-
return
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
}
|
|
163
|
-
// dispatch(
|
|
164
|
-
// pushCoinError({ title: "購入処理中にエラーが発生しました", log:jerr })
|
|
165
|
-
// );
|
|
166
|
-
alert("購入に失敗しました。\nしばらく時間を置いた後、もう一度実行してみてください。もしそれでも購入できない場合は「よくある質問」をご確認いただくか、必要に応じて「お問い合わせフォーム」からご連絡ください。");
|
|
167
|
-
return null; // 失敗時はnullを返す
|
|
168
|
-
})];
|
|
51
|
+
const handlePurchase = (productId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
return new Promise((resolve, reject) => {
|
|
53
|
+
console.log("購入開始: ", productId);
|
|
54
|
+
// リスナーを設定
|
|
55
|
+
const purchaseUpdateSubscription = (0, expo_iap_1.purchaseUpdatedListener)((purchase) => {
|
|
56
|
+
console.log("購入成功レスポンス: ", purchase);
|
|
57
|
+
purchaseUpdateSubscription.remove();
|
|
58
|
+
purchaseErrorSubscription.remove();
|
|
59
|
+
// 購入データの検証
|
|
60
|
+
if (!purchase) {
|
|
61
|
+
reject(new Error("無効な購入応答"));
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
resolve(purchase);
|
|
65
|
+
});
|
|
66
|
+
const purchaseErrorSubscription = (0, expo_iap_1.purchaseErrorListener)((error) => {
|
|
67
|
+
console.log("購入エラーレスポンス: ", error);
|
|
68
|
+
purchaseUpdateSubscription.remove();
|
|
69
|
+
purchaseErrorSubscription.remove();
|
|
70
|
+
reject(error);
|
|
71
|
+
});
|
|
72
|
+
// 購入リクエストを開始(結果はリスナーで受け取る)
|
|
73
|
+
(0, expo_iap_1.requestPurchase)({
|
|
74
|
+
request: {
|
|
75
|
+
ios: { sku: productId },
|
|
76
|
+
android: { skus: [productId] },
|
|
77
|
+
},
|
|
78
|
+
type: "inapp",
|
|
79
|
+
}).catch((error) => {
|
|
80
|
+
console.error("購入リクエスト開始エラー: ", error);
|
|
81
|
+
purchaseUpdateSubscription.remove();
|
|
82
|
+
purchaseErrorSubscription.remove();
|
|
83
|
+
reject(error);
|
|
84
|
+
});
|
|
85
|
+
})
|
|
86
|
+
.then((purchase) => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
|
+
console.log("購入検証開始: ", purchase);
|
|
88
|
+
// レシートの取得と検証
|
|
89
|
+
const receipt = purchase.transactionReceipt || purchase.purchaseToken;
|
|
90
|
+
if (!receipt) {
|
|
91
|
+
throw new Error("レシートデータが無効です");
|
|
92
|
+
}
|
|
93
|
+
const isValid = (0, ReceiptFnc_1.validatePurchaseClientSide)(receipt, react_native_1.Platform.OS);
|
|
94
|
+
if (!isValid) {
|
|
95
|
+
throw new Error("購入検証に失敗しました");
|
|
96
|
+
}
|
|
97
|
+
// トランザクションの完了
|
|
98
|
+
if (react_native_1.Platform.OS === "android" &&
|
|
99
|
+
(0, exports.getAndroidPurchaseState)(purchase) === "wait") {
|
|
100
|
+
alert("手続きが完了しました。支払いが完了したら、このページにある「以前購入した方はこちらから復元」をタップしてください。");
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
yield (0, expo_iap_1.finishTransaction)({ purchase, isConsumable: false });
|
|
104
|
+
alert("購入が完了しました!");
|
|
105
|
+
}
|
|
106
|
+
return purchase; // 成功時に購入データを返す
|
|
107
|
+
}))
|
|
108
|
+
.catch((err) => {
|
|
109
|
+
// エラー処理を整理
|
|
110
|
+
console.error("購入エラーの詳細: ", err);
|
|
111
|
+
console.error("エラーメッセージ: ", err instanceof Error ? err.message : String(err));
|
|
112
|
+
console.error("エラーコード: ", err === null || err === void 0 ? void 0 : err.code);
|
|
113
|
+
// ユーザーがキャンセルした場合は静かに終了
|
|
114
|
+
if ((err === null || err === void 0 ? void 0 : err.code) === "E_USER_CANCELLED" ||
|
|
115
|
+
(err === null || err === void 0 ? void 0 : err.code) === "user-cancelled") {
|
|
116
|
+
console.log("ユーザーが購入をキャンセルしました");
|
|
117
|
+
return null;
|
|
118
|
+
}
|
|
119
|
+
// dispatch(
|
|
120
|
+
// pushCoinError({ title: "購入処理中にエラーが発生しました", log:jerr })
|
|
121
|
+
// );
|
|
122
|
+
alert("購入に失敗しました。\nしばらく時間を置いた後、もう一度実行してみてください。もしそれでも購入できない場合は「よくある質問」をご確認いただくか、必要に応じて「お問い合わせフォーム」からご連絡ください。");
|
|
123
|
+
return null; // 失敗時はnullを返す
|
|
169
124
|
});
|
|
170
|
-
});
|
|
125
|
+
});
|
|
171
126
|
exports.handlePurchase = handlePurchase;
|
|
172
127
|
// 21. 購入復元
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
case 4: return [4 /*yield*/, (0, expo_iap_1.getAvailablePurchases)()];
|
|
193
|
-
case 5:
|
|
194
|
-
purchases = _a.sent();
|
|
195
|
-
console.log("取得した購入アイテム: ", purchases);
|
|
196
|
-
// Androidの場合、購入状態をログ出力
|
|
197
|
-
if (react_native_1.Platform.OS === "android" && purchases.length > 0) {
|
|
198
|
-
purchases.forEach(function (purchase, index) {
|
|
199
|
-
if (purchase.platform === "android") {
|
|
200
|
-
console.log("\u8CFC\u5165\u30A2\u30A4\u30C6\u30E0[".concat(index, "] purchaseStateAndroid: "), purchase.purchaseStateAndroid);
|
|
201
|
-
}
|
|
202
|
-
});
|
|
128
|
+
const restorePurchases = (dispatch, isAlert) => __awaiter(void 0, void 0, void 0, function* () {
|
|
129
|
+
try {
|
|
130
|
+
console.log("購入復元開始");
|
|
131
|
+
// 🔧 修正3: IAP接続を確実にする
|
|
132
|
+
try {
|
|
133
|
+
yield (0, expo_iap_1.initConnection)();
|
|
134
|
+
console.log("IAP接続完了");
|
|
135
|
+
}
|
|
136
|
+
catch (connectionError) {
|
|
137
|
+
console.warn("IAP接続は既に確立されています", connectionError);
|
|
138
|
+
}
|
|
139
|
+
// 購入済みアイテムを取得
|
|
140
|
+
const purchases = yield (0, expo_iap_1.getAvailablePurchases)();
|
|
141
|
+
console.log("取得した購入アイテム: ", purchases);
|
|
142
|
+
// Androidの場合、購入状態をログ出力
|
|
143
|
+
if (react_native_1.Platform.OS === "android" && purchases.length > 0) {
|
|
144
|
+
purchases.forEach((purchase, index) => {
|
|
145
|
+
if (purchase.platform === "android") {
|
|
146
|
+
console.log(`購入アイテム[${index}] purchaseStateAndroid: `, purchase.purchaseStateAndroid);
|
|
203
147
|
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
case 7:
|
|
212
|
-
_a.trys.push([7, 12, , 13]);
|
|
213
|
-
receipt = (0, ReceiptFnc_1.unifyReceipt)(purchase);
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
let receipts = [];
|
|
151
|
+
// 各購入を処理
|
|
152
|
+
for (const purchase of purchases) {
|
|
153
|
+
try {
|
|
154
|
+
const receipt = (0, ReceiptFnc_1.unifyReceipt)(purchase);
|
|
214
155
|
if (receipt) {
|
|
215
156
|
console.log("レシート情報: ", {
|
|
216
157
|
productId: receipt.productId,
|
|
@@ -229,98 +170,85 @@ var restorePurchases = function (dispatch, isAlert) { return __awaiter(void 0, v
|
|
|
229
170
|
else {
|
|
230
171
|
console.warn("レシートの統一に失敗(スキップします): ", purchase);
|
|
231
172
|
}
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
case 11: return [3 /*break*/, 13];
|
|
246
|
-
case 12:
|
|
247
|
-
itemError_1 = _a.sent();
|
|
248
|
-
console.error("購入アイテムの処理エラー(次のアイテムへ継続): ", itemError_1);
|
|
173
|
+
// トランザクション完了処理を個別にtry-catchで保護
|
|
174
|
+
if (checkIsAcknowledgedAndroid(purchase)) {
|
|
175
|
+
try {
|
|
176
|
+
yield (0, expo_iap_1.finishTransaction)({ purchase, isConsumable: false });
|
|
177
|
+
console.log("トランザクション完了: ", purchase.productId);
|
|
178
|
+
}
|
|
179
|
+
catch (finishError) {
|
|
180
|
+
console.error("トランザクション完了エラー(継続します): ", finishError);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
catch (itemError) {
|
|
185
|
+
console.error("購入アイテムの処理エラー(次のアイテムへ継続): ", itemError);
|
|
249
186
|
console.error("問題のあるアイテム: ", purchase);
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
case 15:
|
|
259
|
-
_a.trys.push([15, 17, , 18]);
|
|
187
|
+
// エラーが発生してもループを継続
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
// 🔧 修正1(再修正): 購入アイテムがない場合は"none"に更新
|
|
191
|
+
// 通信エラーと区別するため、正常に取得できた場合は常に状態を更新する
|
|
192
|
+
if (receipts.length === 0) {
|
|
193
|
+
console.warn('購入アイテムが見つかりませんでした。状態を"none"に更新します(返金済み等)');
|
|
194
|
+
try {
|
|
260
195
|
dispatch((0, exports.updateAllFreeState)(null));
|
|
261
196
|
// 🔧 重要:Keychainも空にする(返金時に古いデータが残らないように)
|
|
262
|
-
|
|
263
|
-
case 16:
|
|
264
|
-
// 🔧 重要:Keychainも空にする(返金時に古いデータが残らないように)
|
|
265
|
-
_a.sent();
|
|
197
|
+
yield stores_1.coinStorage.replacePurchasedItems([]);
|
|
266
198
|
console.log("Keychainの購入データを削除しました");
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
if (hasWaitingPayment) {
|
|
296
|
-
alert("お支払い手続き中です。\n\n支払いが完了したら、このページにある「以前購入した方はこちらから復元」をタップしてください。");
|
|
297
|
-
}
|
|
298
|
-
else {
|
|
299
|
-
alert("購入アイテムを復元しました!");
|
|
300
|
-
}
|
|
301
|
-
}
|
|
199
|
+
}
|
|
200
|
+
catch (dispatchError) {
|
|
201
|
+
console.error("状態更新エラー(null時): ", dispatchError);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
// dispatch(pushCoinLog({ title: "Receipts", log: receipts }));
|
|
205
|
+
// 復元されたアイテムをストレージに保存
|
|
206
|
+
if (receipts.length > 0) {
|
|
207
|
+
try {
|
|
208
|
+
yield stores_1.coinStorage.replacePurchasedItems(receipts);
|
|
209
|
+
}
|
|
210
|
+
catch (storageError) {
|
|
211
|
+
console.error("ストレージ保存エラー: ", storageError);
|
|
212
|
+
// ストレージ保存に失敗してもユーザーには通知しない(次回復元で再試行)
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
console.log("購入復元完了: ", receipts.length, "件");
|
|
216
|
+
// アラート表示(支払い待ち状態を考慮)
|
|
217
|
+
if (isAlert) {
|
|
218
|
+
try {
|
|
219
|
+
if (receipts.length === 0) {
|
|
220
|
+
alert("購入済みのアイテムがありませんでした");
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
// 支払い待ち状態のアイテムがあるかチェック
|
|
224
|
+
const hasWaitingPayment = receipts.some((receipt) => receipt && !receipt.isPaid);
|
|
225
|
+
if (hasWaitingPayment) {
|
|
226
|
+
alert("お支払い手続き中です。\n\n支払いが完了したら、このページにある「以前購入した方はこちらから復元」をタップしてください。");
|
|
302
227
|
}
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
// アラート表示に失敗してもクラッシュさせない
|
|
228
|
+
else {
|
|
229
|
+
alert("購入アイテムを復元しました!");
|
|
306
230
|
}
|
|
307
231
|
}
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
// dispatch(pushCoinError({ title: "購入復元に失敗しました", log: error }));
|
|
314
|
-
isAlert &&
|
|
315
|
-
alert("購入アイテムの復元に失敗しました。しばらく時間を置いた後、もう一度実行してみてください。もしそれでも購入できない場合は「よくある質問」をご確認いただくか、必要に応じて「お問い合わせフォーム」からご連絡ください。");
|
|
316
|
-
return [2 /*return*/, null]; // エラーが発生した場合もnullを返す
|
|
317
|
-
case 24: return [2 /*return*/];
|
|
232
|
+
}
|
|
233
|
+
catch (alertError) {
|
|
234
|
+
console.error("アラート表示エラー: ", alertError);
|
|
235
|
+
// アラート表示に失敗してもクラッシュさせない
|
|
236
|
+
}
|
|
318
237
|
}
|
|
319
|
-
|
|
320
|
-
}
|
|
238
|
+
return receipts; // 復元アイテムがあればpurchasesを返す
|
|
239
|
+
}
|
|
240
|
+
catch (error) {
|
|
241
|
+
console.error("Restore Error: ", error);
|
|
242
|
+
console.error("エラーの詳細: ", error instanceof Error ? error.message : String(error));
|
|
243
|
+
// dispatch(pushCoinError({ title: "購入復元に失敗しました", log: error }));
|
|
244
|
+
isAlert &&
|
|
245
|
+
alert("購入アイテムの復元に失敗しました。しばらく時間を置いた後、もう一度実行してみてください。もしそれでも購入できない場合は「よくある質問」をご確認いただくか、必要に応じて「お問い合わせフォーム」からご連絡ください。");
|
|
246
|
+
return null; // エラーが発生した場合もnullを返す
|
|
247
|
+
}
|
|
248
|
+
});
|
|
321
249
|
exports.restorePurchases = restorePurchases;
|
|
322
250
|
// 91. AllFreeの状態確認
|
|
323
|
-
|
|
251
|
+
const updateAllFreeState = (receipt) => (dispatch, getState) => {
|
|
324
252
|
var _a, _b, _c;
|
|
325
253
|
try {
|
|
326
254
|
if (receipt === null) {
|
|
@@ -328,22 +256,22 @@ var updateAllFreeState = function (receipt) { return function (dispatch, getStat
|
|
|
328
256
|
dispatch({ type: "setting/updateLastCheckedDate", payload: null });
|
|
329
257
|
return;
|
|
330
258
|
}
|
|
331
|
-
|
|
259
|
+
const state = getState();
|
|
332
260
|
if (!state || !state.app || !state.app.appSetting) {
|
|
333
261
|
console.warn("状態が不正です: app.appSettingが存在しません");
|
|
334
262
|
return;
|
|
335
263
|
}
|
|
336
|
-
|
|
264
|
+
const freeId = (_c = (_b = (_a = state.app.appSetting.setting) === null || _a === void 0 ? void 0 : _a.payment) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.allFreeId;
|
|
337
265
|
if (!freeId) {
|
|
338
266
|
console.warn("allFreeIdが設定されていません");
|
|
339
267
|
return;
|
|
340
268
|
}
|
|
341
|
-
|
|
269
|
+
const { isPaid, productId } = receipt;
|
|
342
270
|
if (!productId) {
|
|
343
271
|
console.warn("レシートにproductIdがありません");
|
|
344
272
|
return;
|
|
345
273
|
}
|
|
346
|
-
|
|
274
|
+
const paymentState = isPaid ? "paid" : "wait";
|
|
347
275
|
if (productId === freeId) {
|
|
348
276
|
dispatch({ type: "setting/updateAllFreeState", payload: paymentState });
|
|
349
277
|
}
|
|
@@ -353,10 +281,10 @@ var updateAllFreeState = function (receipt) { return function (dispatch, getStat
|
|
|
353
281
|
console.error("receipt: ", receipt);
|
|
354
282
|
// エラーをthrowせずにログだけ出力
|
|
355
283
|
}
|
|
356
|
-
};
|
|
284
|
+
};
|
|
357
285
|
exports.updateAllFreeState = updateAllFreeState;
|
|
358
286
|
// 93. purchaseStateAndroidの判定(1: 支払済み, 2: 支払い待ち, その他: キャンセル)
|
|
359
|
-
|
|
287
|
+
const getAndroidPurchaseState = (purchase) => {
|
|
360
288
|
try {
|
|
361
289
|
if (!purchase)
|
|
362
290
|
return "canceled";
|
|
@@ -380,7 +308,7 @@ var getAndroidPurchaseState = function (purchase) {
|
|
|
380
308
|
};
|
|
381
309
|
exports.getAndroidPurchaseState = getAndroidPurchaseState;
|
|
382
310
|
// 94. Androidの後払いアイテムの承認をするか否か
|
|
383
|
-
|
|
311
|
+
const checkIsAcknowledgedAndroid = (purchase) => {
|
|
384
312
|
try {
|
|
385
313
|
if (!purchase)
|
|
386
314
|
return false;
|
|
@@ -388,7 +316,7 @@ var checkIsAcknowledgedAndroid = function (purchase) {
|
|
|
388
316
|
return false; // iOSでは常に未承認(finishは自動で行われる)
|
|
389
317
|
if (purchase.platform !== "android")
|
|
390
318
|
return false;
|
|
391
|
-
|
|
319
|
+
const state = (0, exports.getAndroidPurchaseState)(purchase);
|
|
392
320
|
return state === "paid" && !purchase.isAcknowledgedAndroid;
|
|
393
321
|
}
|
|
394
322
|
catch (error) {
|