From dc04592f6c962619e0a6cb18c4e35c8fe0d4e23f Mon Sep 17 00:00:00 2001
From: xiaoyu <yuriyshea@163.com>
Date: Fri, 6 Nov 2020 17:58:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=89=93=E5=BC=80=E7=A9=BA=E7=99=BD=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E7=BC=96=E8=AF=91=EF=BC=9B?=
 =?UTF-8?q?=202.=20=E6=9B=B4=E6=96=B0applicationId=EF=BC=8C=E5=92=8CiOS?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  6 ++--
 .../com/finogeeks/mop/demo/MainActivity.java  | 22 ++++++++------
 .../finogeeks/mop/demo/MopApplication.java    |  5 ++--
 app/src/main/res/layout/content_main.xml      | 30 ++++---------------
 app/src/main/res/menu/menu_main.xml           | 10 -------
 app/src/main/res/values/strings.xml           |  3 +-
 6 files changed, 26 insertions(+), 50 deletions(-)
 delete mode 100644 app/src/main/res/menu/menu_main.xml

diff --git a/app/build.gradle b/app/build.gradle
index fc16bbe..0645ae4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
     defaultConfig {
-        applicationId "com.finogeeks.mop.demo"
+        applicationId "com.finogeeks.finclip.demo"
         minSdkVersion 19
         targetSdkVersion 29
         versionCode 1
@@ -13,9 +13,9 @@ android {
 
         multiDexEnabled true
 
-        buildConfigField "String", "APP_KEY", "\"22LyZEib0gLTQdU3MUauAVUHSFDdTToYDWCqr0AgPGwA\""
+        buildConfigField "String", "APP_KEY", "\"22LyZEib0gLTQdU3MUauATBwgfnTCJjdr7FCnywmAEM=\""
         // App Secret
-        buildConfigField "String", "APP_SECRET", "\"8c5c3c26420b7e66\""
+        buildConfigField "String", "APP_SECRET", "\"bdfd76cae24d4313\""
         // API服务地址
         buildConfigField "String", "API_URL", "\"https://mp.finogeeks.com\""
         // API服务前缀
diff --git a/app/src/main/java/com/finogeeks/mop/demo/MainActivity.java b/app/src/main/java/com/finogeeks/mop/demo/MainActivity.java
index 10a56a5..7b04ffc 100644
--- a/app/src/main/java/com/finogeeks/mop/demo/MainActivity.java
+++ b/app/src/main/java/com/finogeeks/mop/demo/MainActivity.java
@@ -1,6 +1,7 @@
 package com.finogeeks.mop.demo;
 
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Button;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -20,17 +21,20 @@ public class MainActivity extends AppCompatActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        Button canvasButton = findViewById(R.id.btnCanvas);
         Button demoButton = findViewById(R.id.btnDemo);
-        Button profileButton = findViewById(R.id.btnProfile);
-        canvasButton.setOnClickListener(v -> {
-            Map<String, String> startParams = new HashMap<>();
-            startParams.put("path", "/pages/index/index");
-            FinAppClient.INSTANCE.getAppletApiManager().startApplet(MainActivity.this, "5ea03fa563cb900001d73863", startParams);
+        demoButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FinAppClient.INSTANCE.getAppletApiManager().startApplet(MainActivity.this, "5fa214a29a6a7900019b5cc1");
+            }
         });
 
-        demoButton.setOnClickListener(v -> FinAppClient.INSTANCE.getAppletApiManager().startApplet(MainActivity.this, "5ea0401463cb900001d73865"));
-
-        profileButton.setOnClickListener(v -> FinAppClient.INSTANCE.getAppletApiManager().startApplet(MainActivity.this, "5ea0412663cb900001d73867"));
+        Button profileButton = findViewById(R.id.btnProfile);
+        profileButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FinAppClient.INSTANCE.getAppletApiManager().startApplet(MainActivity.this, "5fa215459a6a7900019b5cc3");
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/finogeeks/mop/demo/MopApplication.java b/app/src/main/java/com/finogeeks/mop/demo/MopApplication.java
index b94b0ac..82a3465 100644
--- a/app/src/main/java/com/finogeeks/mop/demo/MopApplication.java
+++ b/app/src/main/java/com/finogeeks/mop/demo/MopApplication.java
@@ -25,12 +25,11 @@ public class MopApplication extends MultiDexApplication {
         FinAppConfig.UIConfig uiConfig = new FinAppConfig.UIConfig();
         uiConfig.setHideNavigationBarCloseButton(true);
         FinAppConfig config = new FinAppConfig.Builder()
-                .setAppKey(BuildConfig.APP_KEY)
-                .setAppSecret(BuildConfig.APP_SECRET)
+                .setSdkKey(BuildConfig.APP_KEY)
+                .setSdkSecret(BuildConfig.APP_SECRET)
                 .setApiUrl(BuildConfig.API_URL)
                 .setApiPrefix(BuildConfig.API_PREFIX)
                 .setDebugMode(BuildConfig.DEBUG)
-                .setGlideWithJWT(false)
                 .setUiConfig(uiConfig)
                 .setEncryptionType(FinAppConfig.ENCRYPTION_TYPE_SM)
                 .build();
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index f13da32..241487d 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -8,43 +8,25 @@
     tools:context=".MainActivity"
     tools:showIn="@layout/activity_main">
 
-    <Button
-        android:id="@+id/btnCanvas"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="172dp"
-        android:text="打开画图小程序"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <Button
         android:id="@+id/btnDemo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:text="打开官方小程序"
+        android:text="@string/fin_clip_demo_applet"
+        app:layout_constraintBottom_toTopOf="@+id/btnProfile"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnCanvas" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <Button
         android:id="@+id/btnProfile"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="智能对账单"
+        android:text="@string/fin_clip_profile_applet"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btnDemo" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="left" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
deleted file mode 100644
index be23127..0000000
--- a/app/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.finogeeks.mop.demo.MainActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9462b9b..66d9eb7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">mopdemo</string>
-    <string name="action_settings">Settings</string>
+    <string name="fin_clip_demo_applet">官方小程序</string>
+    <string name="fin_clip_profile_applet">智能对账单</string>
 </resources>