Browse code コンフリクト回避 AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation GroupListActivity NotificationClass RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification ...updateAreaInformation
commit 264933968f0bacf94e6bd7ca3b49f1b693062ce7 2 parents 9d5d390 + 03baa7d k-morimoto authored on 24 Oct 2019

Showing 30 changed files

• +14-10
  ■■■■■
  app/src/main/AndroidManifest.xml
• +21-3
  ■■■■■
  app/src/main/java/com/example/cosmosclient/app/Cosmos.java
• app/src/main/java/com/example/cosmosclient/entities/Group.java
• app/src/main/java/com/example/cosmosclient/entities/GroupListResponse.java
• app/src/main/java/com/example/cosmosclient/entities/RequestList.java
• app/src/main/java/com/example/cosmosclient/entities/Requests.java
• app/src/main/java/com/example/cosmosclient/entities/UserResponse.java
• app/src/main/java/com/example/cosmosclient/entities/jsons/GroupJson.java
• app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
• app/src/main/java/com/example/cosmosclient/resources/UsersRest.java
• app/src/main/java/com/example/cosmosclient/services/CosomosBackgroundService.java
• app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
• app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
• app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
• app/src/main/java/com/example/cosmosclient/views/Cheeses.java
• app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
• app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
• app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java
• app/src/main/java/com/example/cosmosclient/views/ListViewAdapter.java
• app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java
• app/src/main/java/com/example/cosmosclient/views/MemberListAdapter.java
• app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java
• app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
• app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
• app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
• app/src/main/res/layout/activity_signup.xml
• app/src/main/res/layout/item_grid.xml
• app/src/main/res/layout/item_list.xml
• app/src/main/res/layout/list.xml
• app/src/main/res/layout/nav_header_group_list.xml

Ignore Space Show notes View 24 ■■■■■ app/src/main/AndroidManifest.xml

<?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.example.cosmosclient"> <!-- ここからバーコードリーダーのアクセス許可 -->   <application android:name=".app.Cosmos" android:networkSecurityConfig="@xml/network_security_config" android:allowBackup="true" android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> <activity android:name=".views.DisplayGroupIDActivity" android:label="グループIDを表示する" /> <activity android:name=".views.MemberListActivity"></activity>   <activity android:name=".views.MemberListActivity" android:label="グループメンバー" /> <activity android:name=".views.CreateGroupActivity" android:label="グループ作成" /> <activity android:name=".views.AddMemberActivity" android:label="メンバー追加" /> <activity android:name=".views.GroupListActivity" android:label="@string/title_activity_group_list" android:label="グループ一覧" android:theme="@style/AppTheme.NoActionBar"></activity> <service android:name=".services.CosomosBackgroundService" android:exported="false"></service> </application> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />   <uses-permission android:name="android.permission.CAMERA" />   <uses-permission android:name="android.permission.INTERNET" />   </manifest>

Ignore Space Show notes View 24 ■■■■■ app/src/main/java/com/example/cosmosclient/app/Cosmos.java

import com.example.cosmosclient.entities.Location;   import java.util.HashMap;   import java.util.HashMap;   public class Cosmos extends Application { private String token=null; private Group curGroup=null; private HashMap<String, Group> groups = new HashMap<>(); private String uId=null; private HashMap<Integer, AreaInformation> areaInfo = new HashMap<>();   //token処理 public void setToken(String token){ this.token = token; }   public String getToken(){ return token; }   //Group処理 //currentGroup処理 public void setCurrentGroup(Group g){ curGroup = g; setGroup(g); curGroup = groups.get(g.getgId()); }   public Group getCurentGroup(){ return curGroup; }   //Group処理 public void setGroup(Group g) { if (!groups.containsKey(g.getgId())) { String newGid = g.getgId(); groups.put(newGid, g); } }   public Group getGroup(String gId) { return groups.get(gId); }   //uId処理 public void setuId(String uId){ this.uId = uId; }   public String getuId(){ return uId; }

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/Group.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/GroupListResponse.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/RequestList.java 0 → 100644

Show notes View app/src/main/java/com/example/cosmosclient/entities/Requests.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/UserResponse.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/jsons/GroupJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/UsersRest.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/services/CosomosBackgroundService.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/Cheeses.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/ListViewAdapter.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/MemberListAdapter.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/SigninActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/SignupActivity.java

Ignore Space Show notes View app/src/main/res/layout/activity_signup.xml

Ignore Space Show notes View app/src/main/res/layout/item_grid.xml

Ignore Space Show notes View app/src/main/res/layout/item_list.xml

Ignore Space Show notes View app/src/main/res/layout/list.xml

Ignore Space Show notes View app/src/main/res/layout/nav_header_group_list.xml

Show line notes below