Accountの作業

Fork: 0

n-konishi / Cactus-CleanArchitecture

Browse code Accountの作業 CleanArchitecture chenge_design correct_design master onResponse update ...update2
1 parent 18ad36f commit 45dc12026f37cbde6d383816a5e55e2a0e8a5ade n-konishi authored on 24 May 2018

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          app/build.gradle
 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation 'com.android.support:appcompat-v7:27.1.1'
    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
    implementation 'org.apache.commons:commons-lang3:3.6'
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'org.apache.commons:commons-lang3:3.6'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

                Ignore Space
               Show notes
              View
            
          
          9 ■■■■■
          app/src/main/AndroidManifest.xml
         android:name="android.hardware.camera.autofocus"
        android:required="false" />
 
    <application
        android:name=".cactusClient.Cactus"
        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        <!--start-->
        <activity android:name=".cactusClient.MainActivity"
            android:label="@string/app_name"
            android:screenOrientation="landscape">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
            <!--<intent-filter>-->
                <!--<action android:name="android.intent.action.MAIN" />-->
                <!--<category android:name="android.intent.category.LAUNCHER" />-->
            <!--</intent-filter>-->
        </activity>
        <!--end-->
 
    </application>
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
     <application
+        android:name=".cactusClient.Cactus"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         <!--start-->
         <activity android:name=".cactusClient.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
         </activity>
         <!--end-->
     </application>

                Ignore Space
               Show notes
              View
            
          
          52 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
             package org.ntlab.radishforandroidstudio.cactusClient;
 
import android.app.Activity;
import android.app.Application;
import android.os.Bundle;
 
import org.ntlab.radishforandroidstudio.cactusClient.models.AccountsConnection;
 
public class Cactus extends Application {
 
    private AccountsConnection accountsConnection = null;//アカウント関連
 
    public Cactus() {
 
        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
            @Override
            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
 
            }
 
            @Override
            public void onActivityStarted(Activity activity) {
 
            }
 
            @Override
            public void onActivityResumed(Activity activity) {
 
            }
 
            @Override
            public void onActivityPaused(Activity activity) {
 
            }
 
            @Override
            public void onActivityStopped(Activity activity) {
 
            }
 
            @Override
            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
 
            }
 
            @Override
            public void onActivityDestroyed(Activity activity) {
 
            }
        });
    }
 
    //accountの設定
    public AccountsConnection getAccountsConnection() {
//        accountsConnection = new AccountsConnection();
        return accountsConnection;
    }
}
 package org.ntlab.radishforandroidstudio.cactusClient;
+import android.app.Activity;
 import android.app.Application;
+import android.os.Bundle;
+import org.ntlab.radishforandroidstudio.cactusClient.models.AccountsConnection;
 public class Cactus extends Application {
+    private AccountsConnection accountsConnection = null;//アカウント関連
+    public Cactus() {
+        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
+            @Override
+            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+            }
+            @Override
+            public void onActivityStarted(Activity activity) {
+            }
+            @Override
+            public void onActivityResumed(Activity activity) {
+            }
+            @Override
+            public void onActivityPaused(Activity activity) {
+            }
+            @Override
+            public void onActivityStopped(Activity activity) {
+            }
+            @Override
+            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+            }
+            @Override
+            public void onActivityDestroyed(Activity activity) {
+            }
+        });
+    }
+    //accountの設定
+    public AccountsConnection getAccountsConnection() {
+//        accountsConnection = new AccountsConnection();
+        return accountsConnection;
+    }
 }

                Ignore Space
               Show notes
              View
            
          
          63 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java
        
        
        
          0 → 100644
             package org.ntlab.radishforandroidstudio.cactusClient.models;
 
import static org.apache.commons.lang3.RandomStringUtils.random;
 
 
public class Account {
    private String id,name, pass, token;
    private boolean login = false;
 
    public Account(String userName, String userPass) {
        setName(userName);
        setPass(userPass);
    }
 
    public String getId() {
        return id;
    }
 
    public void setId(String id) {
        this.id = id;
    }
 
    public String getName() {
        return name;
    }
 
    public void setName(String name) {
        this.name = name;
    }
 
    public String getPass() {
        return pass;
    }
 
    public void setPass(String pass) {
        this.pass = pass;
    }
 
    public boolean isLogin() {
        return login;
    }
 
    public void setLogin(boolean login) {
        this.login = login;
    }
 
    public String getToken() {
        return token;
    }
 
    public String formToken() {
        token = random(64, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
        return token;
    }
 
    public Account getAccount(String token) {
        if (this.token == token) {
            return this;
        } else {
            return null;
        }
    }
}
+package org.ntlab.radishforandroidstudio.cactusClient.models;
+import static org.apache.commons.lang3.RandomStringUtils.random;
+public class Account {
+    private String id,name, pass, token;
+    private boolean login = false;
+    public Account(String userName, String userPass) {
+        setName(userName);
+        setPass(userPass);
+    }
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getPass() {
+        return pass;
+    }
+    public void setPass(String pass) {
+        this.pass = pass;
+    }
+    public boolean isLogin() {
+        return login;
+    }
+    public void setLogin(boolean login) {
+        this.login = login;
+    }
+    public String getToken() {
+        return token;
+    }
+    public String formToken() {
+        token = random(64, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+        return token;
+    }
+    public Account getAccount(String token) {
+        if (this.token == token) {
+            return this;
+        } else {
+            return null;
+        }
+    }
+}

                Ignore Space
               Show notes
              View
            
          
          21 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AccountsConnection.java
        
        
        
          0 → 100644
             package org.ntlab.radishforandroidstudio.cactusClient.models;
 
import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
import org.w3c.dom.Element;
 
public class AccountsConnection extends HttpAsyncConnection {
    public AccountsConnection(String url) {
        super(url);
    }
 
    @Override
    protected void receive(Element root) {
 
    }
//    public AccountsConnection() {
//        super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/Cactus/accounts");
//
//    }
 
}
+package org.ntlab.radishforandroidstudio.cactusClient.models;
+import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
+import org.w3c.dom.Element;
+public class AccountsConnection extends HttpAsyncConnection {
+    public AccountsConnection(String url) {
+        super(url);
+    }
+    @Override
+    protected void receive(Element root) {
+    }
+//    public AccountsConnection() {
+//        super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/Cactus/accounts");
+//
+//    }
+}

Show line notes below