kanyanat/csa-react-60
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: kanyanat:a549dc1b569c389b20c8a856981f226fb8b8c779
Branches Tags
kanyanat:main
kanyanat:cr/powercondo/merge_update_rn
kanyanat:cr/powercondo/update_react_native
kanyanat:update_rn_version
kanyanat:hotfix/update-sdk-33
kanyanat:release
..
compare: kanyanat:82dfd027b97fa387b4ef0a2d153480c96a583c5b
Branches Tags
kanyanat:cr/powercondo/merge_update_rn
kanyanat:cr/powercondo/update_react_native
kanyanat:update_rn_version
kanyanat:hotfix/update-sdk-33
kanyanat:release
kanyanat:main

No commits in common. "a549dc1b569c389b20c8a856981f226fb8b8c779" and "82dfd027b97fa387b4ef0a2d153480c96a583c5b" have entirely different histories.
a549dc1b56 ... 82dfd027b9

3 changed files with 22 additions and 44 deletions
Show Stats Expand all files Collapse all files

4
ios/csareactrn60.xcodeproj/project.pbxproj
View File

@ -689,7 +689,7 @@
CODE_SIGN_ENTITLEMENTS = csareactrn60/csareactrn60.entitlements; CODE_SIGN_ENTITLEMENTS = csareactrn60/csareactrn60.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 164; CURRENT_PROJECT_VERSION = 162;
DEAD_CODE_STRIPPING = NO; DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 84F3R56BUC; DEVELOPMENT_TEAM = 84F3R56BUC;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 84F3R56BUC; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 84F3R56BUC;
@ -720,7 +720,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 164; CURRENT_PROJECT_VERSION = 162;
DEVELOPMENT_TEAM = 84F3R56BUC; DEVELOPMENT_TEAM = 84F3R56BUC;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 84F3R56BUC; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 84F3R56BUC;
INFOPLIST_FILE = csareactrn60/Info.plist; INFOPLIST_FILE = csareactrn60/Info.plist;

26
ios/csareactrn60/Info.plist
View File

@ -59,30 +59,30 @@
</dict> </dict>
</dict> </dict>
</dict> </dict>
<key>NSAppleMusicUsageDescription</key>
<string>no use</string>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>no use</string>
<key>NSCalendarsUsageDescription</key>
<string>no use</string>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>This app needs access to the camera to take photos to upload profile picture and create support ticket.</string> <string>This app needs access to the camera to take photos to upload profile picture and create support ticket.</string>
<key>NSContactsUsageDescription</key>
<string>no use</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>Access current location.</string> <string>Access current location.</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>Access audio from camera.</string> <string>Access audio from camera.</string>
<key>NSMotionUsageDescription</key>
<string>no use</string>
<key>NSPhotoLibraryAddUsageDescription</key> <key>NSPhotoLibraryAddUsageDescription</key>
<string>Choose a picture for user profile image or save image.</string> <string>Choose a picture for user profile image or save image.</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>
<string>This app needs access to choose photos to upload profile picture and create support ticket.</string> <string>This app needs access to choose photos to upload profile picture and create support ticket.</string>
<key>NSSiriUsageDescription</key> <key>NSContactsUsageDescription</key>
<string>no use</string>
<key>NSCalendarsUsageDescription</key>
<string>no use</string>
<key>NSAppleMusicUsageDescription</key>
<string>no use</string>
<key>NSMotionUsageDescription</key>
<string>no use</string> <string>no use</string>
<key>NSSpeechRecognitionUsageDescription</key> <key>NSSpeechRecognitionUsageDescription</key>
<string>no use</string> <string>no use</string>
<key>NSSiriUsageDescription</key>
<string>no use</string>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>no use</string>
<key>UIAppFonts</key> <key>UIAppFonts</key>
<array> <array>
<string>arial.ttf</string> <string>arial.ttf</string>
@ -164,10 +164,6 @@
<string>Octicons.ttf</string> <string>Octicons.ttf</string>
<string>Zocial.ttf</string> <string>Zocial.ttf</string>
</array> </array>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>

36
src/screens/login/Login.js
View File

@ -40,38 +40,20 @@ class LoginScreen extends Component {
if (this.state.username && this.state.password) { if (this.state.username && this.state.password) {
var regex = /^\d+$/; var regex = /^\d+$/;
const fcmToken = null;
if (regex.test(this.state.username) === true) { if (regex.test(this.state.username) === true) {
console.log('true') console.log('true')
try { const fcm = messaging()
const authStatus = await messaging().requestPermission({ if (!await fcm.hasPermission()) {
alert: true, try {
sound: true, await messaging().requestPermission()
badge: true, } catch (error) {
}); this.setState({
isLoading: false
console.log('authStatus >>> ', authStatus) })
const enabled =
authStatus === messaging.AuthorizationStatus.AUTHORIZED ||
authStatus === messaging.AuthorizationStatus.PROVISIONAL;
if (enabled) {
console.log('Notification permission granted.');
if(Platform.OS === 'android') {
fcmToken = await messaging().getToken();
}else {
fcmToken = await messaging().getAPNSToken();
}
console.log('fcmToken >>>> ', fcmToken)
} else {
console.log('Notification permission denied.');
} }
} catch (error) {
console.error('Failed to request notification permission:', error);
} }
// const fcmToken = await messaging().getAPNSToken() const fcmToken = await messaging().getAPNSToken()
console.log('await messaging().getAPNSToken() <<<<<< ', fcmToken)
let params = { let params = {