diff --git a/app/src/main/assets/dummy.png b/app/src/main/assets/dummy.png index 59993d0..3745c63 100644 Binary files a/app/src/main/assets/dummy.png and b/app/src/main/assets/dummy.png differ diff --git a/app/src/main/assets/shaders/texture.frag b/app/src/main/assets/shaders/texture.frag index 5621a00..279a508 100644 --- a/app/src/main/assets/shaders/texture.frag +++ b/app/src/main/assets/shaders/texture.frag @@ -16,7 +16,7 @@ layout (location = 0) out vec4 outFragColor; void main() { - vec2 pos = vec2(pushConstants.ux/2880.f, pushConstants.uy/2880.f); + vec2 pos = vec2(pushConstants.ux/2048.f, pushConstants.uy/2048.f); vec2 uv = pos + vec2(inUV.x/8.f, inUV.y/8.f); vec4 color = texture(samplerColor, uv); diff --git a/app/src/main/assets/shaders/texture.frag.spv b/app/src/main/assets/shaders/texture.frag.spv index 3407953..c048ea3 100644 Binary files a/app/src/main/assets/shaders/texture.frag.spv and b/app/src/main/assets/shaders/texture.frag.spv differ diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp index ce0cefe..79955b9 100644 --- a/app/src/main/cpp/main.cpp +++ b/app/src/main/cpp/main.cpp @@ -196,7 +196,7 @@ void CppCallback() } // 2. 获取 OnLoadActionFinished 方法 ID(注意方法名大小写必须一致!) - jmethodID methodId = env->GetMethodID(callbackClass, "OnLoadActionFinished", "(Ljava/lang/String;)V"); + jmethodID methodId = env->GetMethodID(callbackClass, "OnLoadMotionListFinished", "(Ljava/lang/String;)V"); if (methodId == nullptr) { env->ExceptionDescribe(); // 打印异常 env->ExceptionClear(); @@ -258,7 +258,7 @@ void CppAnimationFinishedCallback() } // 2. 获取 OnLoadActionFinished 方法 ID(注意方法名大小写必须一致!) - jmethodID methodId = env->GetMethodID(callbackClass, "OnAnimationFinished", "()V"); + jmethodID methodId = env->GetMethodID(callbackClass, "OnPlayMotionListFinished", "()V"); if (methodId == nullptr) { env->ExceptionDescribe(); // 打印异常 env->ExceptionClear(); @@ -313,6 +313,25 @@ Java_com_hmwl_face_1sdk_FaceActivity_PreReadAction(JNIEnv *env, jobject thiz, js return env->NewStringUTF(ret.c_str()); } +const char DELIMITER = 0x1F; // same as \u001F + +std::vector splitMotionString(const std::string& input) { + std::vector result; + if (input.empty()) return result; + + size_t start = 0; + size_t pos = input.find(DELIMITER); + + while (pos != std::string::npos) { + result.push_back(input.substr(start, pos - start)); + start = pos + 1; + pos = input.find(DELIMITER, start); + } + // Add last part + result.push_back(input.substr(start)); + + return result; +} extern "C" JNIEXPORT void JNICALL @@ -336,6 +355,18 @@ Java_com_hmwl_face_1sdk_FaceActivity_ChangeMotionCpp(JNIEnv *env, jobject thiz, if(g_Application->isInited()) { - g_Application->changeMotionList(CppAnimationFinishedCallback, loop); + std::vector motions = splitMotionString(nativeString); + g_Application->changeMotionList(motions, CppAnimationFinishedCallback, loop); } +} +extern "C" +JNIEXPORT void JNICALL +Java_com_hmwl_face_1sdk_FaceActivity_StopMotionNative(JNIEnv *env, jobject thiz) { + g_Application->StopMotion(); +} +extern "C" +JNIEXPORT void JNICALL +Java_com_hmwl_face_1sdk_FaceActivity_ResumeMotionNative(JNIEnv *env, jobject thiz) { + // TODO: implement ResumeMotionNative() + g_Application->ResumeMotion(); } \ No newline at end of file diff --git a/app/src/main/java/com/hmwl/face_sdk/FaceActivity.java b/app/src/main/java/com/hmwl/face_sdk/FaceActivity.java index bf6afc0..36e6856 100644 --- a/app/src/main/java/com/hmwl/face_sdk/FaceActivity.java +++ b/app/src/main/java/com/hmwl/face_sdk/FaceActivity.java @@ -4,7 +4,6 @@ import android.Manifest; import android.content.pm.PackageManager; import android.os.Bundle; import android.util.Log; -import android.view.MotionEvent; import android.view.View; import androidx.annotation.NonNull; @@ -31,7 +30,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.LandmarkerListener { private static final String TAG = "FaceActivity"; @@ -141,6 +139,16 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L StopRunning(); } + private native void StopMotionNative(); + public void StopMotion(){ + StopMotionNative(); + } + + private native void ResumeMotionNative(); + public void ResumeMotion(){ + ResumeMotionNative(); + } + private native void StopRunning(); // Native 方法 @@ -282,27 +290,39 @@ public class FaceActivity extends GameActivity implements FaceLandmarkerHelper.L protected native void SetCppInitArg(String json); - protected void SetInitArg(String json) + public void SetInitArg(String json) { SetCppInitArg(json); } - public interface CallbackInterface { - void OnLoadActionFinished(String result); + public interface LoadMotionListFinishedCallback { + void OnLoadMotionListFinished(String result); } - public interface AnimationFinishedCallbackInterface { - void OnAnimationFinished(); + public interface PlayMotionListFinishedCallback { + void OnPlayMotionListFinished(); } - protected native String PreReadAction(String motion, CallbackInterface callback); - protected String PreLoadAction(String json, CallbackInterface callback){ + protected native String PreReadAction(String motion, LoadMotionListFinishedCallback callback); + public String PreLoadAction(String json, LoadMotionListFinishedCallback callback){ return PreReadAction(json, callback); } - protected native void ChangeMotionCpp(String json, AnimationFinishedCallbackInterface callback, boolean loop); - protected void ChangeMotionList(AnimationFinishedCallbackInterface callback, boolean loop){ - ChangeMotionCpp("", callback, loop); + protected native void ChangeMotionCpp(String json, PlayMotionListFinishedCallback callback, boolean loop); + public void PlayMotionList(List motionList, boolean loop, PlayMotionListFinishedCallback callback) + { + if(callback == null) + { + callback = new PlayMotionListFinishedCallback() { + @Override + public void OnPlayMotionListFinished() { + Log.i(TAG, "OnPlayMotionListFinished: "); + } + }; + } + final String DELIMITER = "\u001F"; // ASCII Unit Separator + String motion_list_str = String.join(DELIMITER, motionList); + ChangeMotionCpp(motion_list_str, callback, loop); } // 添加这个缺失的方法 diff --git a/example/src/main/assets/pic/48.png b/example/src/main/assets/pic/1/000000.png similarity index 56% rename from example/src/main/assets/pic/48.png rename to example/src/main/assets/pic/1/000000.png index 2d96db4..928a9ba 100644 Binary files a/example/src/main/assets/pic/48.png and b/example/src/main/assets/pic/1/000000.png differ diff --git a/example/src/main/assets/pic/11.png b/example/src/main/assets/pic/11.png deleted file mode 100644 index fcaca18..0000000 Binary files a/example/src/main/assets/pic/11.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/000000.png b/example/src/main/assets/pic/11/000000.png new file mode 100644 index 0000000..620be32 Binary files /dev/null and b/example/src/main/assets/pic/11/000000.png differ diff --git a/example/src/main/assets/pic/11/000001.png b/example/src/main/assets/pic/11/000001.png new file mode 100644 index 0000000..d23247a Binary files /dev/null and b/example/src/main/assets/pic/11/000001.png differ diff --git a/example/src/main/assets/pic/11/000002.png b/example/src/main/assets/pic/11/000002.png new file mode 100644 index 0000000..26a15f0 Binary files /dev/null and b/example/src/main/assets/pic/11/000002.png differ diff --git a/example/src/main/assets/pic/11/000003.png b/example/src/main/assets/pic/11/000003.png new file mode 100644 index 0000000..7c34325 Binary files /dev/null and b/example/src/main/assets/pic/11/000003.png differ diff --git a/example/src/main/assets/pic/11/000004.png b/example/src/main/assets/pic/11/000004.png new file mode 100644 index 0000000..901d5d6 Binary files /dev/null and b/example/src/main/assets/pic/11/000004.png differ diff --git a/example/src/main/assets/pic/11/000005.png b/example/src/main/assets/pic/11/000005.png new file mode 100644 index 0000000..24e5a2c Binary files /dev/null and b/example/src/main/assets/pic/11/000005.png differ diff --git a/example/src/main/assets/pic/11/000006.png b/example/src/main/assets/pic/11/000006.png new file mode 100644 index 0000000..3039055 Binary files /dev/null and b/example/src/main/assets/pic/11/000006.png differ diff --git a/example/src/main/assets/pic/11/000007.png b/example/src/main/assets/pic/11/000007.png new file mode 100644 index 0000000..ab30124 Binary files /dev/null and b/example/src/main/assets/pic/11/000007.png differ diff --git a/example/src/main/assets/pic/11/000008.png b/example/src/main/assets/pic/11/000008.png new file mode 100644 index 0000000..698ab21 Binary files /dev/null and b/example/src/main/assets/pic/11/000008.png differ diff --git a/example/src/main/assets/pic/11/000009.png b/example/src/main/assets/pic/11/000009.png new file mode 100644 index 0000000..4fe0263 Binary files /dev/null and b/example/src/main/assets/pic/11/000009.png differ diff --git a/example/src/main/assets/pic/11/000010.png b/example/src/main/assets/pic/11/000010.png new file mode 100644 index 0000000..f1d6cdb Binary files /dev/null and b/example/src/main/assets/pic/11/000010.png differ diff --git a/example/src/main/assets/pic/11/000011.png b/example/src/main/assets/pic/11/000011.png new file mode 100644 index 0000000..b110934 Binary files /dev/null and b/example/src/main/assets/pic/11/000011.png differ diff --git a/example/src/main/assets/pic/11/000012.png b/example/src/main/assets/pic/11/000012.png new file mode 100644 index 0000000..ec76189 Binary files /dev/null and b/example/src/main/assets/pic/11/000012.png differ diff --git a/example/src/main/assets/pic/11/000013.png b/example/src/main/assets/pic/11/000013.png new file mode 100644 index 0000000..0405cab Binary files /dev/null and b/example/src/main/assets/pic/11/000013.png differ diff --git a/example/src/main/assets/pic/11/000014.png b/example/src/main/assets/pic/11/000014.png new file mode 100644 index 0000000..f89b0f1 Binary files /dev/null and b/example/src/main/assets/pic/11/000014.png differ diff --git a/example/src/main/assets/pic/11/000015.png b/example/src/main/assets/pic/11/000015.png new file mode 100644 index 0000000..158955f Binary files /dev/null and b/example/src/main/assets/pic/11/000015.png differ diff --git a/example/src/main/assets/pic/11/000016.png b/example/src/main/assets/pic/11/000016.png new file mode 100644 index 0000000..50a9c1e Binary files /dev/null and b/example/src/main/assets/pic/11/000016.png differ diff --git a/example/src/main/assets/pic/11/000017.png b/example/src/main/assets/pic/11/000017.png new file mode 100644 index 0000000..7afac46 Binary files /dev/null and b/example/src/main/assets/pic/11/000017.png differ diff --git a/example/src/main/assets/pic/11/000018.png b/example/src/main/assets/pic/11/000018.png new file mode 100644 index 0000000..ee59a38 Binary files /dev/null and b/example/src/main/assets/pic/11/000018.png differ diff --git a/example/src/main/assets/pic/11/000019.png b/example/src/main/assets/pic/11/000019.png new file mode 100644 index 0000000..ab27922 Binary files /dev/null and b/example/src/main/assets/pic/11/000019.png differ diff --git a/example/src/main/assets/pic/11/000020.png b/example/src/main/assets/pic/11/000020.png new file mode 100644 index 0000000..06596fd Binary files /dev/null and b/example/src/main/assets/pic/11/000020.png differ diff --git a/example/src/main/assets/pic/11/000021.png b/example/src/main/assets/pic/11/000021.png new file mode 100644 index 0000000..74a3a1e Binary files /dev/null and b/example/src/main/assets/pic/11/000021.png differ diff --git a/example/src/main/assets/pic/11/000022.png b/example/src/main/assets/pic/11/000022.png new file mode 100644 index 0000000..7b0f14e Binary files /dev/null and b/example/src/main/assets/pic/11/000022.png differ diff --git a/example/src/main/assets/pic/11/000023.png b/example/src/main/assets/pic/11/000023.png new file mode 100644 index 0000000..f64ce8a Binary files /dev/null and b/example/src/main/assets/pic/11/000023.png differ diff --git a/example/src/main/assets/pic/11/002.png b/example/src/main/assets/pic/11/002.png deleted file mode 100644 index 61308fb..0000000 Binary files a/example/src/main/assets/pic/11/002.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/003.png b/example/src/main/assets/pic/11/003.png deleted file mode 100644 index d276e95..0000000 Binary files a/example/src/main/assets/pic/11/003.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/004.png b/example/src/main/assets/pic/11/004.png deleted file mode 100644 index cad8bc1..0000000 Binary files a/example/src/main/assets/pic/11/004.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/005.png b/example/src/main/assets/pic/11/005.png deleted file mode 100644 index a535fb1..0000000 Binary files a/example/src/main/assets/pic/11/005.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/006.png b/example/src/main/assets/pic/11/006.png deleted file mode 100644 index 1143812..0000000 Binary files a/example/src/main/assets/pic/11/006.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/007.png b/example/src/main/assets/pic/11/007.png deleted file mode 100644 index 50bcbb7..0000000 Binary files a/example/src/main/assets/pic/11/007.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/008.png b/example/src/main/assets/pic/11/008.png deleted file mode 100644 index 98001c0..0000000 Binary files a/example/src/main/assets/pic/11/008.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/009.png b/example/src/main/assets/pic/11/009.png deleted file mode 100644 index fbf2571..0000000 Binary files a/example/src/main/assets/pic/11/009.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/010.png b/example/src/main/assets/pic/11/010.png deleted file mode 100644 index d435b93..0000000 Binary files a/example/src/main/assets/pic/11/010.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/011.png b/example/src/main/assets/pic/11/011.png deleted file mode 100644 index dcdc335..0000000 Binary files a/example/src/main/assets/pic/11/011.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/012.png b/example/src/main/assets/pic/11/012.png deleted file mode 100644 index b477c6b..0000000 Binary files a/example/src/main/assets/pic/11/012.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/11.png b/example/src/main/assets/pic/11/11.png deleted file mode 100644 index fcaca18..0000000 Binary files a/example/src/main/assets/pic/11/11.png and /dev/null differ diff --git a/example/src/main/assets/pic/11/11ex.png b/example/src/main/assets/pic/11/11ex.png deleted file mode 100644 index 0224f7a..0000000 Binary files a/example/src/main/assets/pic/11/11ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/11ex.png b/example/src/main/assets/pic/11ex.png new file mode 100644 index 0000000..c0af166 Binary files /dev/null and b/example/src/main/assets/pic/11ex.png differ diff --git a/example/src/main/assets/pic/12.png b/example/src/main/assets/pic/12.png deleted file mode 100644 index a526eb1..0000000 Binary files a/example/src/main/assets/pic/12.png and /dev/null differ diff --git a/example/src/main/assets/pic/12/000000.png b/example/src/main/assets/pic/12/000000.png new file mode 100644 index 0000000..cb4e030 Binary files /dev/null and b/example/src/main/assets/pic/12/000000.png differ diff --git a/example/src/main/assets/pic/12/000001.png b/example/src/main/assets/pic/12/000001.png new file mode 100644 index 0000000..21f9f84 Binary files /dev/null and b/example/src/main/assets/pic/12/000001.png differ diff --git a/example/src/main/assets/pic/12/000002.png b/example/src/main/assets/pic/12/000002.png new file mode 100644 index 0000000..8636122 Binary files /dev/null and b/example/src/main/assets/pic/12/000002.png differ diff --git a/example/src/main/assets/pic/12/000003.png b/example/src/main/assets/pic/12/000003.png new file mode 100644 index 0000000..20e982b Binary files /dev/null and b/example/src/main/assets/pic/12/000003.png differ diff --git a/example/src/main/assets/pic/12/000004.png b/example/src/main/assets/pic/12/000004.png new file mode 100644 index 0000000..3ab2469 Binary files /dev/null and b/example/src/main/assets/pic/12/000004.png differ diff --git a/example/src/main/assets/pic/12/000005.png b/example/src/main/assets/pic/12/000005.png new file mode 100644 index 0000000..94cdc60 Binary files /dev/null and b/example/src/main/assets/pic/12/000005.png differ diff --git a/example/src/main/assets/pic/12/000006.png b/example/src/main/assets/pic/12/000006.png new file mode 100644 index 0000000..338e1da Binary files /dev/null and b/example/src/main/assets/pic/12/000006.png differ diff --git a/example/src/main/assets/pic/12/000007.png b/example/src/main/assets/pic/12/000007.png new file mode 100644 index 0000000..bdfc54b Binary files /dev/null and b/example/src/main/assets/pic/12/000007.png differ diff --git a/example/src/main/assets/pic/12/000008.png b/example/src/main/assets/pic/12/000008.png new file mode 100644 index 0000000..0394f12 Binary files /dev/null and b/example/src/main/assets/pic/12/000008.png differ diff --git a/example/src/main/assets/pic/12/000009.png b/example/src/main/assets/pic/12/000009.png new file mode 100644 index 0000000..976d25d Binary files /dev/null and b/example/src/main/assets/pic/12/000009.png differ diff --git a/example/src/main/assets/pic/12/000010.png b/example/src/main/assets/pic/12/000010.png new file mode 100644 index 0000000..12a325d Binary files /dev/null and b/example/src/main/assets/pic/12/000010.png differ diff --git a/example/src/main/assets/pic/12/000011.png b/example/src/main/assets/pic/12/000011.png new file mode 100644 index 0000000..fe16fb5 Binary files /dev/null and b/example/src/main/assets/pic/12/000011.png differ diff --git a/example/src/main/assets/pic/12/000012.png b/example/src/main/assets/pic/12/000012.png new file mode 100644 index 0000000..609e245 Binary files /dev/null and b/example/src/main/assets/pic/12/000012.png differ diff --git a/example/src/main/assets/pic/12/000013.png b/example/src/main/assets/pic/12/000013.png new file mode 100644 index 0000000..c040bba Binary files /dev/null and b/example/src/main/assets/pic/12/000013.png differ diff --git a/example/src/main/assets/pic/12/000014.png b/example/src/main/assets/pic/12/000014.png new file mode 100644 index 0000000..7462c60 Binary files /dev/null and b/example/src/main/assets/pic/12/000014.png differ diff --git a/example/src/main/assets/pic/12/000015.png b/example/src/main/assets/pic/12/000015.png new file mode 100644 index 0000000..4e770c0 Binary files /dev/null and b/example/src/main/assets/pic/12/000015.png differ diff --git a/example/src/main/assets/pic/12/000016.png b/example/src/main/assets/pic/12/000016.png new file mode 100644 index 0000000..675f741 Binary files /dev/null and b/example/src/main/assets/pic/12/000016.png differ diff --git a/example/src/main/assets/pic/12/000017.png b/example/src/main/assets/pic/12/000017.png new file mode 100644 index 0000000..b799b8c Binary files /dev/null and b/example/src/main/assets/pic/12/000017.png differ diff --git a/example/src/main/assets/pic/12/000018.png b/example/src/main/assets/pic/12/000018.png new file mode 100644 index 0000000..68ad2eb Binary files /dev/null and b/example/src/main/assets/pic/12/000018.png differ diff --git a/example/src/main/assets/pic/12/000019.png b/example/src/main/assets/pic/12/000019.png new file mode 100644 index 0000000..84c96e8 Binary files /dev/null and b/example/src/main/assets/pic/12/000019.png differ diff --git a/example/src/main/assets/pic/12/000020.png b/example/src/main/assets/pic/12/000020.png new file mode 100644 index 0000000..9b49ef8 Binary files /dev/null and b/example/src/main/assets/pic/12/000020.png differ diff --git a/example/src/main/assets/pic/12/000021.png b/example/src/main/assets/pic/12/000021.png new file mode 100644 index 0000000..60e404f Binary files /dev/null and b/example/src/main/assets/pic/12/000021.png differ diff --git a/example/src/main/assets/pic/12/000022.png b/example/src/main/assets/pic/12/000022.png new file mode 100644 index 0000000..07fe8a0 Binary files /dev/null and b/example/src/main/assets/pic/12/000022.png differ diff --git a/example/src/main/assets/pic/12/000023.png b/example/src/main/assets/pic/12/000023.png new file mode 100644 index 0000000..9857232 Binary files /dev/null and b/example/src/main/assets/pic/12/000023.png differ diff --git a/example/src/main/assets/pic/12/12.png b/example/src/main/assets/pic/12/12.png deleted file mode 100644 index a526eb1..0000000 Binary files a/example/src/main/assets/pic/12/12.png and /dev/null differ diff --git a/example/src/main/assets/pic/12/12ex.png b/example/src/main/assets/pic/12/12ex.png deleted file mode 100644 index 66461e2..0000000 Binary files a/example/src/main/assets/pic/12/12ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/12ex.png b/example/src/main/assets/pic/12ex.png new file mode 100644 index 0000000..5f47799 Binary files /dev/null and b/example/src/main/assets/pic/12ex.png differ diff --git a/example/src/main/assets/pic/13.png b/example/src/main/assets/pic/13.png deleted file mode 100644 index 782c858..0000000 Binary files a/example/src/main/assets/pic/13.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/000000.png b/example/src/main/assets/pic/13/000000.png new file mode 100644 index 0000000..3596e2c Binary files /dev/null and b/example/src/main/assets/pic/13/000000.png differ diff --git a/example/src/main/assets/pic/13/000001.png b/example/src/main/assets/pic/13/000001.png new file mode 100644 index 0000000..68b7f40 Binary files /dev/null and b/example/src/main/assets/pic/13/000001.png differ diff --git a/example/src/main/assets/pic/13/000002.png b/example/src/main/assets/pic/13/000002.png new file mode 100644 index 0000000..859b9a9 Binary files /dev/null and b/example/src/main/assets/pic/13/000002.png differ diff --git a/example/src/main/assets/pic/13/000003.png b/example/src/main/assets/pic/13/000003.png new file mode 100644 index 0000000..c892917 Binary files /dev/null and b/example/src/main/assets/pic/13/000003.png differ diff --git a/example/src/main/assets/pic/13/000004.png b/example/src/main/assets/pic/13/000004.png new file mode 100644 index 0000000..f3c16f9 Binary files /dev/null and b/example/src/main/assets/pic/13/000004.png differ diff --git a/example/src/main/assets/pic/13/000005.png b/example/src/main/assets/pic/13/000005.png new file mode 100644 index 0000000..31759ca Binary files /dev/null and b/example/src/main/assets/pic/13/000005.png differ diff --git a/example/src/main/assets/pic/13/000006.png b/example/src/main/assets/pic/13/000006.png new file mode 100644 index 0000000..3477050 Binary files /dev/null and b/example/src/main/assets/pic/13/000006.png differ diff --git a/example/src/main/assets/pic/13/000007.png b/example/src/main/assets/pic/13/000007.png new file mode 100644 index 0000000..9f31bcb Binary files /dev/null and b/example/src/main/assets/pic/13/000007.png differ diff --git a/example/src/main/assets/pic/13/000008.png b/example/src/main/assets/pic/13/000008.png new file mode 100644 index 0000000..b3ae60a Binary files /dev/null and b/example/src/main/assets/pic/13/000008.png differ diff --git a/example/src/main/assets/pic/13/000009.png b/example/src/main/assets/pic/13/000009.png new file mode 100644 index 0000000..14482c6 Binary files /dev/null and b/example/src/main/assets/pic/13/000009.png differ diff --git a/example/src/main/assets/pic/13/000010.png b/example/src/main/assets/pic/13/000010.png new file mode 100644 index 0000000..ebe5760 Binary files /dev/null and b/example/src/main/assets/pic/13/000010.png differ diff --git a/example/src/main/assets/pic/13/000011.png b/example/src/main/assets/pic/13/000011.png new file mode 100644 index 0000000..d1af26c Binary files /dev/null and b/example/src/main/assets/pic/13/000011.png differ diff --git a/example/src/main/assets/pic/13/000012.png b/example/src/main/assets/pic/13/000012.png new file mode 100644 index 0000000..e9ba52a Binary files /dev/null and b/example/src/main/assets/pic/13/000012.png differ diff --git a/example/src/main/assets/pic/13/000013.png b/example/src/main/assets/pic/13/000013.png new file mode 100644 index 0000000..3d5b16e Binary files /dev/null and b/example/src/main/assets/pic/13/000013.png differ diff --git a/example/src/main/assets/pic/13/000014.png b/example/src/main/assets/pic/13/000014.png new file mode 100644 index 0000000..886886f Binary files /dev/null and b/example/src/main/assets/pic/13/000014.png differ diff --git a/example/src/main/assets/pic/13/000015.png b/example/src/main/assets/pic/13/000015.png new file mode 100644 index 0000000..e394a41 Binary files /dev/null and b/example/src/main/assets/pic/13/000015.png differ diff --git a/example/src/main/assets/pic/13/000016.png b/example/src/main/assets/pic/13/000016.png new file mode 100644 index 0000000..032a82d Binary files /dev/null and b/example/src/main/assets/pic/13/000016.png differ diff --git a/example/src/main/assets/pic/13/000017.png b/example/src/main/assets/pic/13/000017.png new file mode 100644 index 0000000..c7f4b0f Binary files /dev/null and b/example/src/main/assets/pic/13/000017.png differ diff --git a/example/src/main/assets/pic/13/000018.png b/example/src/main/assets/pic/13/000018.png new file mode 100644 index 0000000..8a67c2c Binary files /dev/null and b/example/src/main/assets/pic/13/000018.png differ diff --git a/example/src/main/assets/pic/13/000019.png b/example/src/main/assets/pic/13/000019.png new file mode 100644 index 0000000..e87aac9 Binary files /dev/null and b/example/src/main/assets/pic/13/000019.png differ diff --git a/example/src/main/assets/pic/13/000020.png b/example/src/main/assets/pic/13/000020.png new file mode 100644 index 0000000..adb8886 Binary files /dev/null and b/example/src/main/assets/pic/13/000020.png differ diff --git a/example/src/main/assets/pic/13/000021.png b/example/src/main/assets/pic/13/000021.png new file mode 100644 index 0000000..7ae9e8f Binary files /dev/null and b/example/src/main/assets/pic/13/000021.png differ diff --git a/example/src/main/assets/pic/13/000022.png b/example/src/main/assets/pic/13/000022.png new file mode 100644 index 0000000..4c9706e Binary files /dev/null and b/example/src/main/assets/pic/13/000022.png differ diff --git a/example/src/main/assets/pic/13/000023.png b/example/src/main/assets/pic/13/000023.png new file mode 100644 index 0000000..6cf2493 Binary files /dev/null and b/example/src/main/assets/pic/13/000023.png differ diff --git a/example/src/main/assets/pic/13/000024.png b/example/src/main/assets/pic/13/000024.png new file mode 100644 index 0000000..3786403 Binary files /dev/null and b/example/src/main/assets/pic/13/000024.png differ diff --git a/example/src/main/assets/pic/13/000025.png b/example/src/main/assets/pic/13/000025.png new file mode 100644 index 0000000..265faa5 Binary files /dev/null and b/example/src/main/assets/pic/13/000025.png differ diff --git a/example/src/main/assets/pic/13/000026.png b/example/src/main/assets/pic/13/000026.png new file mode 100644 index 0000000..0b75dd7 Binary files /dev/null and b/example/src/main/assets/pic/13/000026.png differ diff --git a/example/src/main/assets/pic/13/000027.png b/example/src/main/assets/pic/13/000027.png new file mode 100644 index 0000000..068d952 Binary files /dev/null and b/example/src/main/assets/pic/13/000027.png differ diff --git a/example/src/main/assets/pic/13/000028.png b/example/src/main/assets/pic/13/000028.png new file mode 100644 index 0000000..14cd2c3 Binary files /dev/null and b/example/src/main/assets/pic/13/000028.png differ diff --git a/example/src/main/assets/pic/13/000029.png b/example/src/main/assets/pic/13/000029.png new file mode 100644 index 0000000..b0deda6 Binary files /dev/null and b/example/src/main/assets/pic/13/000029.png differ diff --git a/example/src/main/assets/pic/13/000030.png b/example/src/main/assets/pic/13/000030.png new file mode 100644 index 0000000..d43b9bb Binary files /dev/null and b/example/src/main/assets/pic/13/000030.png differ diff --git a/example/src/main/assets/pic/13/000031.png b/example/src/main/assets/pic/13/000031.png new file mode 100644 index 0000000..c3286a0 Binary files /dev/null and b/example/src/main/assets/pic/13/000031.png differ diff --git a/example/src/main/assets/pic/13/001.png b/example/src/main/assets/pic/13/001.png deleted file mode 100644 index bfeda38..0000000 Binary files a/example/src/main/assets/pic/13/001.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/002.png b/example/src/main/assets/pic/13/002.png deleted file mode 100644 index e99a429..0000000 Binary files a/example/src/main/assets/pic/13/002.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/003.png b/example/src/main/assets/pic/13/003.png deleted file mode 100644 index 6d4d4f9..0000000 Binary files a/example/src/main/assets/pic/13/003.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/004.png b/example/src/main/assets/pic/13/004.png deleted file mode 100644 index 0a9a4c0..0000000 Binary files a/example/src/main/assets/pic/13/004.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/005.png b/example/src/main/assets/pic/13/005.png deleted file mode 100644 index 6a154da..0000000 Binary files a/example/src/main/assets/pic/13/005.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/006.png b/example/src/main/assets/pic/13/006.png deleted file mode 100644 index 37bfbea..0000000 Binary files a/example/src/main/assets/pic/13/006.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/007.png b/example/src/main/assets/pic/13/007.png deleted file mode 100644 index ccb4898..0000000 Binary files a/example/src/main/assets/pic/13/007.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/008.png b/example/src/main/assets/pic/13/008.png deleted file mode 100644 index 5345b3f..0000000 Binary files a/example/src/main/assets/pic/13/008.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/009.png b/example/src/main/assets/pic/13/009.png deleted file mode 100644 index 82ffb94..0000000 Binary files a/example/src/main/assets/pic/13/009.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/010.png b/example/src/main/assets/pic/13/010.png deleted file mode 100644 index c6c6a04..0000000 Binary files a/example/src/main/assets/pic/13/010.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/011.png b/example/src/main/assets/pic/13/011.png deleted file mode 100644 index 49fdc69..0000000 Binary files a/example/src/main/assets/pic/13/011.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/012.png b/example/src/main/assets/pic/13/012.png deleted file mode 100644 index 36bb610..0000000 Binary files a/example/src/main/assets/pic/13/012.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/013.png b/example/src/main/assets/pic/13/013.png deleted file mode 100644 index bcb7c79..0000000 Binary files a/example/src/main/assets/pic/13/013.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/014.png b/example/src/main/assets/pic/13/014.png deleted file mode 100644 index c5ec589..0000000 Binary files a/example/src/main/assets/pic/13/014.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/13.png b/example/src/main/assets/pic/13/13.png deleted file mode 100644 index 782c858..0000000 Binary files a/example/src/main/assets/pic/13/13.png and /dev/null differ diff --git a/example/src/main/assets/pic/13/13ex.png b/example/src/main/assets/pic/13/13ex.png deleted file mode 100644 index a515786..0000000 Binary files a/example/src/main/assets/pic/13/13ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/13ex.png b/example/src/main/assets/pic/13ex.png new file mode 100644 index 0000000..6916c9d Binary files /dev/null and b/example/src/main/assets/pic/13ex.png differ diff --git a/example/src/main/assets/pic/14.png b/example/src/main/assets/pic/14.png deleted file mode 100644 index bc9672f..0000000 Binary files a/example/src/main/assets/pic/14.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/000000.png b/example/src/main/assets/pic/14/000000.png new file mode 100644 index 0000000..460a856 Binary files /dev/null and b/example/src/main/assets/pic/14/000000.png differ diff --git a/example/src/main/assets/pic/14/000001.png b/example/src/main/assets/pic/14/000001.png new file mode 100644 index 0000000..1f3629b Binary files /dev/null and b/example/src/main/assets/pic/14/000001.png differ diff --git a/example/src/main/assets/pic/14/000002.png b/example/src/main/assets/pic/14/000002.png new file mode 100644 index 0000000..cce0199 Binary files /dev/null and b/example/src/main/assets/pic/14/000002.png differ diff --git a/example/src/main/assets/pic/14/000003.png b/example/src/main/assets/pic/14/000003.png new file mode 100644 index 0000000..d90e21c Binary files /dev/null and b/example/src/main/assets/pic/14/000003.png differ diff --git a/example/src/main/assets/pic/14/000004.png b/example/src/main/assets/pic/14/000004.png new file mode 100644 index 0000000..f92c967 Binary files /dev/null and b/example/src/main/assets/pic/14/000004.png differ diff --git a/example/src/main/assets/pic/14/000005.png b/example/src/main/assets/pic/14/000005.png new file mode 100644 index 0000000..aa5282a Binary files /dev/null and b/example/src/main/assets/pic/14/000005.png differ diff --git a/example/src/main/assets/pic/14/000006.png b/example/src/main/assets/pic/14/000006.png new file mode 100644 index 0000000..352df1e Binary files /dev/null and b/example/src/main/assets/pic/14/000006.png differ diff --git a/example/src/main/assets/pic/14/000007.png b/example/src/main/assets/pic/14/000007.png new file mode 100644 index 0000000..85c4e55 Binary files /dev/null and b/example/src/main/assets/pic/14/000007.png differ diff --git a/example/src/main/assets/pic/14/000008.png b/example/src/main/assets/pic/14/000008.png new file mode 100644 index 0000000..4d6e8e8 Binary files /dev/null and b/example/src/main/assets/pic/14/000008.png differ diff --git a/example/src/main/assets/pic/14/000009.png b/example/src/main/assets/pic/14/000009.png new file mode 100644 index 0000000..589d4f2 Binary files /dev/null and b/example/src/main/assets/pic/14/000009.png differ diff --git a/example/src/main/assets/pic/14/000010.png b/example/src/main/assets/pic/14/000010.png new file mode 100644 index 0000000..36ab863 Binary files /dev/null and b/example/src/main/assets/pic/14/000010.png differ diff --git a/example/src/main/assets/pic/14/000011.png b/example/src/main/assets/pic/14/000011.png new file mode 100644 index 0000000..965049f Binary files /dev/null and b/example/src/main/assets/pic/14/000011.png differ diff --git a/example/src/main/assets/pic/14/000012.png b/example/src/main/assets/pic/14/000012.png new file mode 100644 index 0000000..2b497fd Binary files /dev/null and b/example/src/main/assets/pic/14/000012.png differ diff --git a/example/src/main/assets/pic/14/000013.png b/example/src/main/assets/pic/14/000013.png new file mode 100644 index 0000000..55df32b Binary files /dev/null and b/example/src/main/assets/pic/14/000013.png differ diff --git a/example/src/main/assets/pic/14/000014.png b/example/src/main/assets/pic/14/000014.png new file mode 100644 index 0000000..a96c54b Binary files /dev/null and b/example/src/main/assets/pic/14/000014.png differ diff --git a/example/src/main/assets/pic/14/000015.png b/example/src/main/assets/pic/14/000015.png new file mode 100644 index 0000000..c2f417d Binary files /dev/null and b/example/src/main/assets/pic/14/000015.png differ diff --git a/example/src/main/assets/pic/14/000016.png b/example/src/main/assets/pic/14/000016.png new file mode 100644 index 0000000..c0c7b2b Binary files /dev/null and b/example/src/main/assets/pic/14/000016.png differ diff --git a/example/src/main/assets/pic/14/000017.png b/example/src/main/assets/pic/14/000017.png new file mode 100644 index 0000000..1f26815 Binary files /dev/null and b/example/src/main/assets/pic/14/000017.png differ diff --git a/example/src/main/assets/pic/14/000018.png b/example/src/main/assets/pic/14/000018.png new file mode 100644 index 0000000..bcb53a4 Binary files /dev/null and b/example/src/main/assets/pic/14/000018.png differ diff --git a/example/src/main/assets/pic/14/000019.png b/example/src/main/assets/pic/14/000019.png new file mode 100644 index 0000000..e6939bd Binary files /dev/null and b/example/src/main/assets/pic/14/000019.png differ diff --git a/example/src/main/assets/pic/14/000020.png b/example/src/main/assets/pic/14/000020.png new file mode 100644 index 0000000..2917a8c Binary files /dev/null and b/example/src/main/assets/pic/14/000020.png differ diff --git a/example/src/main/assets/pic/14/000021.png b/example/src/main/assets/pic/14/000021.png new file mode 100644 index 0000000..3267815 Binary files /dev/null and b/example/src/main/assets/pic/14/000021.png differ diff --git a/example/src/main/assets/pic/14/000022.png b/example/src/main/assets/pic/14/000022.png new file mode 100644 index 0000000..decbd59 Binary files /dev/null and b/example/src/main/assets/pic/14/000022.png differ diff --git a/example/src/main/assets/pic/14/000023.png b/example/src/main/assets/pic/14/000023.png new file mode 100644 index 0000000..8ac7474 Binary files /dev/null and b/example/src/main/assets/pic/14/000023.png differ diff --git a/example/src/main/assets/pic/14/000024.png b/example/src/main/assets/pic/14/000024.png new file mode 100644 index 0000000..a0c54f9 Binary files /dev/null and b/example/src/main/assets/pic/14/000024.png differ diff --git a/example/src/main/assets/pic/14/000025.png b/example/src/main/assets/pic/14/000025.png new file mode 100644 index 0000000..24bbde5 Binary files /dev/null and b/example/src/main/assets/pic/14/000025.png differ diff --git a/example/src/main/assets/pic/14/000026.png b/example/src/main/assets/pic/14/000026.png new file mode 100644 index 0000000..36db1b2 Binary files /dev/null and b/example/src/main/assets/pic/14/000026.png differ diff --git a/example/src/main/assets/pic/14/000027.png b/example/src/main/assets/pic/14/000027.png new file mode 100644 index 0000000..61c42ee Binary files /dev/null and b/example/src/main/assets/pic/14/000027.png differ diff --git a/example/src/main/assets/pic/14/000028.png b/example/src/main/assets/pic/14/000028.png new file mode 100644 index 0000000..9abcd31 Binary files /dev/null and b/example/src/main/assets/pic/14/000028.png differ diff --git a/example/src/main/assets/pic/14/000029.png b/example/src/main/assets/pic/14/000029.png new file mode 100644 index 0000000..0ed7129 Binary files /dev/null and b/example/src/main/assets/pic/14/000029.png differ diff --git a/example/src/main/assets/pic/14/000030.png b/example/src/main/assets/pic/14/000030.png new file mode 100644 index 0000000..7131260 Binary files /dev/null and b/example/src/main/assets/pic/14/000030.png differ diff --git a/example/src/main/assets/pic/14/000031.png b/example/src/main/assets/pic/14/000031.png new file mode 100644 index 0000000..e217028 Binary files /dev/null and b/example/src/main/assets/pic/14/000031.png differ diff --git a/example/src/main/assets/pic/14/000032.png b/example/src/main/assets/pic/14/000032.png new file mode 100644 index 0000000..39ce00f Binary files /dev/null and b/example/src/main/assets/pic/14/000032.png differ diff --git a/example/src/main/assets/pic/14/000033.png b/example/src/main/assets/pic/14/000033.png new file mode 100644 index 0000000..0706bc3 Binary files /dev/null and b/example/src/main/assets/pic/14/000033.png differ diff --git a/example/src/main/assets/pic/14/000034.png b/example/src/main/assets/pic/14/000034.png new file mode 100644 index 0000000..e410d3f Binary files /dev/null and b/example/src/main/assets/pic/14/000034.png differ diff --git a/example/src/main/assets/pic/14/000035.png b/example/src/main/assets/pic/14/000035.png new file mode 100644 index 0000000..1f26815 Binary files /dev/null and b/example/src/main/assets/pic/14/000035.png differ diff --git a/example/src/main/assets/pic/14/14.png b/example/src/main/assets/pic/14/14.png deleted file mode 100644 index bc9672f..0000000 Binary files a/example/src/main/assets/pic/14/14.png and /dev/null differ diff --git a/example/src/main/assets/pic/14/14ex.png b/example/src/main/assets/pic/14/14ex.png deleted file mode 100644 index 45f5056..0000000 Binary files a/example/src/main/assets/pic/14/14ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/14ex.png b/example/src/main/assets/pic/14ex.png new file mode 100644 index 0000000..be311be Binary files /dev/null and b/example/src/main/assets/pic/14ex.png differ diff --git a/example/src/main/assets/pic/1ex.png b/example/src/main/assets/pic/1ex.png new file mode 100644 index 0000000..5e37243 Binary files /dev/null and b/example/src/main/assets/pic/1ex.png differ diff --git a/example/src/main/assets/pic/48/48.png b/example/src/main/assets/pic/2/000000.png similarity index 56% rename from example/src/main/assets/pic/48/48.png rename to example/src/main/assets/pic/2/000000.png index 2d96db4..928a9ba 100644 Binary files a/example/src/main/assets/pic/48/48.png and b/example/src/main/assets/pic/2/000000.png differ diff --git a/example/src/main/assets/pic/21.png b/example/src/main/assets/pic/21.png deleted file mode 100644 index 91982af..0000000 Binary files a/example/src/main/assets/pic/21.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/000000.png b/example/src/main/assets/pic/21/000000.png new file mode 100644 index 0000000..d167b18 Binary files /dev/null and b/example/src/main/assets/pic/21/000000.png differ diff --git a/example/src/main/assets/pic/21/000001.png b/example/src/main/assets/pic/21/000001.png new file mode 100644 index 0000000..90edc5e Binary files /dev/null and b/example/src/main/assets/pic/21/000001.png differ diff --git a/example/src/main/assets/pic/21/000002.png b/example/src/main/assets/pic/21/000002.png new file mode 100644 index 0000000..a5c60e5 Binary files /dev/null and b/example/src/main/assets/pic/21/000002.png differ diff --git a/example/src/main/assets/pic/21/000003.png b/example/src/main/assets/pic/21/000003.png new file mode 100644 index 0000000..2b9c248 Binary files /dev/null and b/example/src/main/assets/pic/21/000003.png differ diff --git a/example/src/main/assets/pic/21/000004.png b/example/src/main/assets/pic/21/000004.png new file mode 100644 index 0000000..6b48be1 Binary files /dev/null and b/example/src/main/assets/pic/21/000004.png differ diff --git a/example/src/main/assets/pic/21/000005.png b/example/src/main/assets/pic/21/000005.png new file mode 100644 index 0000000..41408f2 Binary files /dev/null and b/example/src/main/assets/pic/21/000005.png differ diff --git a/example/src/main/assets/pic/21/000006.png b/example/src/main/assets/pic/21/000006.png new file mode 100644 index 0000000..2a01769 Binary files /dev/null and b/example/src/main/assets/pic/21/000006.png differ diff --git a/example/src/main/assets/pic/21/000007.png b/example/src/main/assets/pic/21/000007.png new file mode 100644 index 0000000..3f4e974 Binary files /dev/null and b/example/src/main/assets/pic/21/000007.png differ diff --git a/example/src/main/assets/pic/21/000008.png b/example/src/main/assets/pic/21/000008.png new file mode 100644 index 0000000..25a67a3 Binary files /dev/null and b/example/src/main/assets/pic/21/000008.png differ diff --git a/example/src/main/assets/pic/21/000009.png b/example/src/main/assets/pic/21/000009.png new file mode 100644 index 0000000..d43919d Binary files /dev/null and b/example/src/main/assets/pic/21/000009.png differ diff --git a/example/src/main/assets/pic/21/000010.png b/example/src/main/assets/pic/21/000010.png new file mode 100644 index 0000000..dfe1afa Binary files /dev/null and b/example/src/main/assets/pic/21/000010.png differ diff --git a/example/src/main/assets/pic/21/000011.png b/example/src/main/assets/pic/21/000011.png new file mode 100644 index 0000000..a41e2d2 Binary files /dev/null and b/example/src/main/assets/pic/21/000011.png differ diff --git a/example/src/main/assets/pic/21/000012.png b/example/src/main/assets/pic/21/000012.png new file mode 100644 index 0000000..4e1a472 Binary files /dev/null and b/example/src/main/assets/pic/21/000012.png differ diff --git a/example/src/main/assets/pic/21/000013.png b/example/src/main/assets/pic/21/000013.png new file mode 100644 index 0000000..0c0fd08 Binary files /dev/null and b/example/src/main/assets/pic/21/000013.png differ diff --git a/example/src/main/assets/pic/21/000014.png b/example/src/main/assets/pic/21/000014.png new file mode 100644 index 0000000..c9243f4 Binary files /dev/null and b/example/src/main/assets/pic/21/000014.png differ diff --git a/example/src/main/assets/pic/21/000015.png b/example/src/main/assets/pic/21/000015.png new file mode 100644 index 0000000..dce127f Binary files /dev/null and b/example/src/main/assets/pic/21/000015.png differ diff --git a/example/src/main/assets/pic/21/000016.png b/example/src/main/assets/pic/21/000016.png new file mode 100644 index 0000000..1f59e4c Binary files /dev/null and b/example/src/main/assets/pic/21/000016.png differ diff --git a/example/src/main/assets/pic/21/000017.png b/example/src/main/assets/pic/21/000017.png new file mode 100644 index 0000000..62116b4 Binary files /dev/null and b/example/src/main/assets/pic/21/000017.png differ diff --git a/example/src/main/assets/pic/21/000018.png b/example/src/main/assets/pic/21/000018.png new file mode 100644 index 0000000..3c2a32f Binary files /dev/null and b/example/src/main/assets/pic/21/000018.png differ diff --git a/example/src/main/assets/pic/21/000019.png b/example/src/main/assets/pic/21/000019.png new file mode 100644 index 0000000..eb34f23 Binary files /dev/null and b/example/src/main/assets/pic/21/000019.png differ diff --git a/example/src/main/assets/pic/21/000020.png b/example/src/main/assets/pic/21/000020.png new file mode 100644 index 0000000..afd394b Binary files /dev/null and b/example/src/main/assets/pic/21/000020.png differ diff --git a/example/src/main/assets/pic/21/000021.png b/example/src/main/assets/pic/21/000021.png new file mode 100644 index 0000000..8950558 Binary files /dev/null and b/example/src/main/assets/pic/21/000021.png differ diff --git a/example/src/main/assets/pic/21/000022.png b/example/src/main/assets/pic/21/000022.png new file mode 100644 index 0000000..d9a02b7 Binary files /dev/null and b/example/src/main/assets/pic/21/000022.png differ diff --git a/example/src/main/assets/pic/21/000023.png b/example/src/main/assets/pic/21/000023.png new file mode 100644 index 0000000..6c80dec Binary files /dev/null and b/example/src/main/assets/pic/21/000023.png differ diff --git a/example/src/main/assets/pic/21/000024.png b/example/src/main/assets/pic/21/000024.png new file mode 100644 index 0000000..833093c Binary files /dev/null and b/example/src/main/assets/pic/21/000024.png differ diff --git a/example/src/main/assets/pic/21/000025.png b/example/src/main/assets/pic/21/000025.png new file mode 100644 index 0000000..aa7297c Binary files /dev/null and b/example/src/main/assets/pic/21/000025.png differ diff --git a/example/src/main/assets/pic/21/000026.png b/example/src/main/assets/pic/21/000026.png new file mode 100644 index 0000000..9d68253 Binary files /dev/null and b/example/src/main/assets/pic/21/000026.png differ diff --git a/example/src/main/assets/pic/21/000027.png b/example/src/main/assets/pic/21/000027.png new file mode 100644 index 0000000..535e069 Binary files /dev/null and b/example/src/main/assets/pic/21/000027.png differ diff --git a/example/src/main/assets/pic/21/000028.png b/example/src/main/assets/pic/21/000028.png new file mode 100644 index 0000000..2b5cfc2 Binary files /dev/null and b/example/src/main/assets/pic/21/000028.png differ diff --git a/example/src/main/assets/pic/21/000029.png b/example/src/main/assets/pic/21/000029.png new file mode 100644 index 0000000..fa65c9e Binary files /dev/null and b/example/src/main/assets/pic/21/000029.png differ diff --git a/example/src/main/assets/pic/21/000030.png b/example/src/main/assets/pic/21/000030.png new file mode 100644 index 0000000..776b5c0 Binary files /dev/null and b/example/src/main/assets/pic/21/000030.png differ diff --git a/example/src/main/assets/pic/21/000031.png b/example/src/main/assets/pic/21/000031.png new file mode 100644 index 0000000..126896d Binary files /dev/null and b/example/src/main/assets/pic/21/000031.png differ diff --git a/example/src/main/assets/pic/21/000032.png b/example/src/main/assets/pic/21/000032.png new file mode 100644 index 0000000..0e5b9f5 Binary files /dev/null and b/example/src/main/assets/pic/21/000032.png differ diff --git a/example/src/main/assets/pic/21/000033.png b/example/src/main/assets/pic/21/000033.png new file mode 100644 index 0000000..0841a81 Binary files /dev/null and b/example/src/main/assets/pic/21/000033.png differ diff --git a/example/src/main/assets/pic/21/000034.png b/example/src/main/assets/pic/21/000034.png new file mode 100644 index 0000000..60c876a Binary files /dev/null and b/example/src/main/assets/pic/21/000034.png differ diff --git a/example/src/main/assets/pic/21/000035.png b/example/src/main/assets/pic/21/000035.png new file mode 100644 index 0000000..62116b4 Binary files /dev/null and b/example/src/main/assets/pic/21/000035.png differ diff --git a/example/src/main/assets/pic/21/21.png b/example/src/main/assets/pic/21/21.png deleted file mode 100644 index 91982af..0000000 Binary files a/example/src/main/assets/pic/21/21.png and /dev/null differ diff --git a/example/src/main/assets/pic/21/21ex.png b/example/src/main/assets/pic/21/21ex.png deleted file mode 100644 index 21e8d1c..0000000 Binary files a/example/src/main/assets/pic/21/21ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/21ex.png b/example/src/main/assets/pic/21ex.png new file mode 100644 index 0000000..0e7cfa4 Binary files /dev/null and b/example/src/main/assets/pic/21ex.png differ diff --git a/example/src/main/assets/pic/23.png b/example/src/main/assets/pic/23.png deleted file mode 100644 index 037af80..0000000 Binary files a/example/src/main/assets/pic/23.png and /dev/null differ diff --git a/example/src/main/assets/pic/23/23.png b/example/src/main/assets/pic/23/23.png deleted file mode 100644 index 037af80..0000000 Binary files a/example/src/main/assets/pic/23/23.png and /dev/null differ diff --git a/example/src/main/assets/pic/23/23ex.png b/example/src/main/assets/pic/23/23ex.png deleted file mode 100644 index 9b84969..0000000 Binary files a/example/src/main/assets/pic/23/23ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/24.png b/example/src/main/assets/pic/24.png deleted file mode 100644 index be8ce57..0000000 Binary files a/example/src/main/assets/pic/24.png and /dev/null differ diff --git a/example/src/main/assets/pic/24/24.png b/example/src/main/assets/pic/24/24.png deleted file mode 100644 index be8ce57..0000000 Binary files a/example/src/main/assets/pic/24/24.png and /dev/null differ diff --git a/example/src/main/assets/pic/24/24ex.png b/example/src/main/assets/pic/24/24ex.png deleted file mode 100644 index c973f85..0000000 Binary files a/example/src/main/assets/pic/24/24ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/26.png b/example/src/main/assets/pic/26.png deleted file mode 100644 index 390f03c..0000000 Binary files a/example/src/main/assets/pic/26.png and /dev/null differ diff --git a/example/src/main/assets/pic/26/26.png b/example/src/main/assets/pic/26/26.png deleted file mode 100644 index 390f03c..0000000 Binary files a/example/src/main/assets/pic/26/26.png and /dev/null differ diff --git a/example/src/main/assets/pic/26/26ex.png b/example/src/main/assets/pic/26/26ex.png deleted file mode 100644 index 8088925..0000000 Binary files a/example/src/main/assets/pic/26/26ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/27.png b/example/src/main/assets/pic/27.png deleted file mode 100644 index 50da06e..0000000 Binary files a/example/src/main/assets/pic/27.png and /dev/null differ diff --git a/example/src/main/assets/pic/27/27.png b/example/src/main/assets/pic/27/27.png deleted file mode 100644 index 50da06e..0000000 Binary files a/example/src/main/assets/pic/27/27.png and /dev/null differ diff --git a/example/src/main/assets/pic/27/27ex.png b/example/src/main/assets/pic/27/27ex.png deleted file mode 100644 index 9cafdee..0000000 Binary files a/example/src/main/assets/pic/27/27ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/2ex.png b/example/src/main/assets/pic/2ex.png new file mode 100644 index 0000000..5e37243 Binary files /dev/null and b/example/src/main/assets/pic/2ex.png differ diff --git a/example/src/main/assets/pic/3/000000.png b/example/src/main/assets/pic/3/000000.png new file mode 100644 index 0000000..928a9ba Binary files /dev/null and b/example/src/main/assets/pic/3/000000.png differ diff --git a/example/src/main/assets/pic/32.png b/example/src/main/assets/pic/32.png deleted file mode 100644 index f5d3644..0000000 Binary files a/example/src/main/assets/pic/32.png and /dev/null differ diff --git a/example/src/main/assets/pic/32/32.png b/example/src/main/assets/pic/32/32.png deleted file mode 100644 index f5d3644..0000000 Binary files a/example/src/main/assets/pic/32/32.png and /dev/null differ diff --git a/example/src/main/assets/pic/32/32ex.png b/example/src/main/assets/pic/32/32ex.png deleted file mode 100644 index e84da38..0000000 Binary files a/example/src/main/assets/pic/32/32ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/37.png b/example/src/main/assets/pic/37.png deleted file mode 100644 index 884132c..0000000 Binary files a/example/src/main/assets/pic/37.png and /dev/null differ diff --git a/example/src/main/assets/pic/37/37.png b/example/src/main/assets/pic/37/37.png deleted file mode 100644 index 884132c..0000000 Binary files a/example/src/main/assets/pic/37/37.png and /dev/null differ diff --git a/example/src/main/assets/pic/37/37ex.png b/example/src/main/assets/pic/37/37ex.png deleted file mode 100644 index d44136a..0000000 Binary files a/example/src/main/assets/pic/37/37ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/3ex.png b/example/src/main/assets/pic/3ex.png new file mode 100644 index 0000000..5e37243 Binary files /dev/null and b/example/src/main/assets/pic/3ex.png differ diff --git a/example/src/main/assets/pic/4.png b/example/src/main/assets/pic/4.png deleted file mode 100644 index 7842427..0000000 Binary files a/example/src/main/assets/pic/4.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/000000.png b/example/src/main/assets/pic/4/000000.png new file mode 100644 index 0000000..1634b44 Binary files /dev/null and b/example/src/main/assets/pic/4/000000.png differ diff --git a/example/src/main/assets/pic/4/000001.png b/example/src/main/assets/pic/4/000001.png new file mode 100644 index 0000000..d14fb54 Binary files /dev/null and b/example/src/main/assets/pic/4/000001.png differ diff --git a/example/src/main/assets/pic/4/000002.png b/example/src/main/assets/pic/4/000002.png new file mode 100644 index 0000000..777efe7 Binary files /dev/null and b/example/src/main/assets/pic/4/000002.png differ diff --git a/example/src/main/assets/pic/4/000003.png b/example/src/main/assets/pic/4/000003.png new file mode 100644 index 0000000..730d370 Binary files /dev/null and b/example/src/main/assets/pic/4/000003.png differ diff --git a/example/src/main/assets/pic/4/000004.png b/example/src/main/assets/pic/4/000004.png new file mode 100644 index 0000000..2e6f49a Binary files /dev/null and b/example/src/main/assets/pic/4/000004.png differ diff --git a/example/src/main/assets/pic/4/000005.png b/example/src/main/assets/pic/4/000005.png new file mode 100644 index 0000000..741f3f8 Binary files /dev/null and b/example/src/main/assets/pic/4/000005.png differ diff --git a/example/src/main/assets/pic/4/000006.png b/example/src/main/assets/pic/4/000006.png new file mode 100644 index 0000000..8fe5a70 Binary files /dev/null and b/example/src/main/assets/pic/4/000006.png differ diff --git a/example/src/main/assets/pic/4/000007.png b/example/src/main/assets/pic/4/000007.png new file mode 100644 index 0000000..a1116a1 Binary files /dev/null and b/example/src/main/assets/pic/4/000007.png differ diff --git a/example/src/main/assets/pic/4/000008.png b/example/src/main/assets/pic/4/000008.png new file mode 100644 index 0000000..b571314 Binary files /dev/null and b/example/src/main/assets/pic/4/000008.png differ diff --git a/example/src/main/assets/pic/4/000009.png b/example/src/main/assets/pic/4/000009.png new file mode 100644 index 0000000..38d318e Binary files /dev/null and b/example/src/main/assets/pic/4/000009.png differ diff --git a/example/src/main/assets/pic/4/000010.png b/example/src/main/assets/pic/4/000010.png new file mode 100644 index 0000000..505eca7 Binary files /dev/null and b/example/src/main/assets/pic/4/000010.png differ diff --git a/example/src/main/assets/pic/4/000011.png b/example/src/main/assets/pic/4/000011.png new file mode 100644 index 0000000..a47faca Binary files /dev/null and b/example/src/main/assets/pic/4/000011.png differ diff --git a/example/src/main/assets/pic/4/000012.png b/example/src/main/assets/pic/4/000012.png new file mode 100644 index 0000000..432104b Binary files /dev/null and b/example/src/main/assets/pic/4/000012.png differ diff --git a/example/src/main/assets/pic/4/000013.png b/example/src/main/assets/pic/4/000013.png new file mode 100644 index 0000000..a9eb6c6 Binary files /dev/null and b/example/src/main/assets/pic/4/000013.png differ diff --git a/example/src/main/assets/pic/4/000014.png b/example/src/main/assets/pic/4/000014.png new file mode 100644 index 0000000..97bc25a Binary files /dev/null and b/example/src/main/assets/pic/4/000014.png differ diff --git a/example/src/main/assets/pic/4/000015.png b/example/src/main/assets/pic/4/000015.png new file mode 100644 index 0000000..089b01d Binary files /dev/null and b/example/src/main/assets/pic/4/000015.png differ diff --git a/example/src/main/assets/pic/4/000016.png b/example/src/main/assets/pic/4/000016.png new file mode 100644 index 0000000..4850f79 Binary files /dev/null and b/example/src/main/assets/pic/4/000016.png differ diff --git a/example/src/main/assets/pic/4/000017.png b/example/src/main/assets/pic/4/000017.png new file mode 100644 index 0000000..49046fe Binary files /dev/null and b/example/src/main/assets/pic/4/000017.png differ diff --git a/example/src/main/assets/pic/4/000018.png b/example/src/main/assets/pic/4/000018.png new file mode 100644 index 0000000..5b00069 Binary files /dev/null and b/example/src/main/assets/pic/4/000018.png differ diff --git a/example/src/main/assets/pic/4/000019.png b/example/src/main/assets/pic/4/000019.png new file mode 100644 index 0000000..89b3c53 Binary files /dev/null and b/example/src/main/assets/pic/4/000019.png differ diff --git a/example/src/main/assets/pic/4/000020.png b/example/src/main/assets/pic/4/000020.png new file mode 100644 index 0000000..83e638f Binary files /dev/null and b/example/src/main/assets/pic/4/000020.png differ diff --git a/example/src/main/assets/pic/4/000021.png b/example/src/main/assets/pic/4/000021.png new file mode 100644 index 0000000..183dc9e Binary files /dev/null and b/example/src/main/assets/pic/4/000021.png differ diff --git a/example/src/main/assets/pic/4/000022.png b/example/src/main/assets/pic/4/000022.png new file mode 100644 index 0000000..1919864 Binary files /dev/null and b/example/src/main/assets/pic/4/000022.png differ diff --git a/example/src/main/assets/pic/4/000023.png b/example/src/main/assets/pic/4/000023.png new file mode 100644 index 0000000..1729e73 Binary files /dev/null and b/example/src/main/assets/pic/4/000023.png differ diff --git a/example/src/main/assets/pic/4/000024.png b/example/src/main/assets/pic/4/000024.png new file mode 100644 index 0000000..f90dd48 Binary files /dev/null and b/example/src/main/assets/pic/4/000024.png differ diff --git a/example/src/main/assets/pic/4/000025.png b/example/src/main/assets/pic/4/000025.png new file mode 100644 index 0000000..72cb76d Binary files /dev/null and b/example/src/main/assets/pic/4/000025.png differ diff --git a/example/src/main/assets/pic/4/000026.png b/example/src/main/assets/pic/4/000026.png new file mode 100644 index 0000000..996fb28 Binary files /dev/null and b/example/src/main/assets/pic/4/000026.png differ diff --git a/example/src/main/assets/pic/4/000027.png b/example/src/main/assets/pic/4/000027.png new file mode 100644 index 0000000..31fcf7a Binary files /dev/null and b/example/src/main/assets/pic/4/000027.png differ diff --git a/example/src/main/assets/pic/4/000028.png b/example/src/main/assets/pic/4/000028.png new file mode 100644 index 0000000..a96e380 Binary files /dev/null and b/example/src/main/assets/pic/4/000028.png differ diff --git a/example/src/main/assets/pic/4/000029.png b/example/src/main/assets/pic/4/000029.png new file mode 100644 index 0000000..167ace5 Binary files /dev/null and b/example/src/main/assets/pic/4/000029.png differ diff --git a/example/src/main/assets/pic/4/000030.png b/example/src/main/assets/pic/4/000030.png new file mode 100644 index 0000000..d6ec1ab Binary files /dev/null and b/example/src/main/assets/pic/4/000030.png differ diff --git a/example/src/main/assets/pic/4/000031.png b/example/src/main/assets/pic/4/000031.png new file mode 100644 index 0000000..84d58ae Binary files /dev/null and b/example/src/main/assets/pic/4/000031.png differ diff --git a/example/src/main/assets/pic/4/001.png b/example/src/main/assets/pic/4/001.png deleted file mode 100644 index 445ae28..0000000 Binary files a/example/src/main/assets/pic/4/001.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/002.png b/example/src/main/assets/pic/4/002.png deleted file mode 100644 index 1e44450..0000000 Binary files a/example/src/main/assets/pic/4/002.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/003.png b/example/src/main/assets/pic/4/003.png deleted file mode 100644 index 430481e..0000000 Binary files a/example/src/main/assets/pic/4/003.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/004.png b/example/src/main/assets/pic/4/004.png deleted file mode 100644 index e522bb3..0000000 Binary files a/example/src/main/assets/pic/4/004.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/005.png b/example/src/main/assets/pic/4/005.png deleted file mode 100644 index cda3d9d..0000000 Binary files a/example/src/main/assets/pic/4/005.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/006.png b/example/src/main/assets/pic/4/006.png deleted file mode 100644 index c2d62dd..0000000 Binary files a/example/src/main/assets/pic/4/006.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/007.png b/example/src/main/assets/pic/4/007.png deleted file mode 100644 index 03811e4..0000000 Binary files a/example/src/main/assets/pic/4/007.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/008.png b/example/src/main/assets/pic/4/008.png deleted file mode 100644 index c0cea8b..0000000 Binary files a/example/src/main/assets/pic/4/008.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/009.png b/example/src/main/assets/pic/4/009.png deleted file mode 100644 index a2a1d25..0000000 Binary files a/example/src/main/assets/pic/4/009.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/010.png b/example/src/main/assets/pic/4/010.png deleted file mode 100644 index 7ae4d40..0000000 Binary files a/example/src/main/assets/pic/4/010.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/011.png b/example/src/main/assets/pic/4/011.png deleted file mode 100644 index 62a3c82..0000000 Binary files a/example/src/main/assets/pic/4/011.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/012.png b/example/src/main/assets/pic/4/012.png deleted file mode 100644 index d1dabc4..0000000 Binary files a/example/src/main/assets/pic/4/012.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/013.png b/example/src/main/assets/pic/4/013.png deleted file mode 100644 index 3a7e0bb..0000000 Binary files a/example/src/main/assets/pic/4/013.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/014.png b/example/src/main/assets/pic/4/014.png deleted file mode 100644 index 001fcef..0000000 Binary files a/example/src/main/assets/pic/4/014.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/015.png b/example/src/main/assets/pic/4/015.png deleted file mode 100644 index 58a8ffb..0000000 Binary files a/example/src/main/assets/pic/4/015.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/016.png b/example/src/main/assets/pic/4/016.png deleted file mode 100644 index 0f3cd74..0000000 Binary files a/example/src/main/assets/pic/4/016.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/017.png b/example/src/main/assets/pic/4/017.png deleted file mode 100644 index 38b2415..0000000 Binary files a/example/src/main/assets/pic/4/017.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/018.png b/example/src/main/assets/pic/4/018.png deleted file mode 100644 index 5e87671..0000000 Binary files a/example/src/main/assets/pic/4/018.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/019.png b/example/src/main/assets/pic/4/019.png deleted file mode 100644 index d4a6034..0000000 Binary files a/example/src/main/assets/pic/4/019.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/020.png b/example/src/main/assets/pic/4/020.png deleted file mode 100644 index badaafa..0000000 Binary files a/example/src/main/assets/pic/4/020.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/021.png b/example/src/main/assets/pic/4/021.png deleted file mode 100644 index d28ca71..0000000 Binary files a/example/src/main/assets/pic/4/021.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/022.png b/example/src/main/assets/pic/4/022.png deleted file mode 100644 index a7e949d..0000000 Binary files a/example/src/main/assets/pic/4/022.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/023.png b/example/src/main/assets/pic/4/023.png deleted file mode 100644 index 19b33be..0000000 Binary files a/example/src/main/assets/pic/4/023.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/024.png b/example/src/main/assets/pic/4/024.png deleted file mode 100644 index e7bcbbb..0000000 Binary files a/example/src/main/assets/pic/4/024.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/025.png b/example/src/main/assets/pic/4/025.png deleted file mode 100644 index 4bd9c5b..0000000 Binary files a/example/src/main/assets/pic/4/025.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/026.png b/example/src/main/assets/pic/4/026.png deleted file mode 100644 index c3d67d1..0000000 Binary files a/example/src/main/assets/pic/4/026.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/027.png b/example/src/main/assets/pic/4/027.png deleted file mode 100644 index a5de51c..0000000 Binary files a/example/src/main/assets/pic/4/027.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/028.png b/example/src/main/assets/pic/4/028.png deleted file mode 100644 index e6c4edf..0000000 Binary files a/example/src/main/assets/pic/4/028.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/029.png b/example/src/main/assets/pic/4/029.png deleted file mode 100644 index 8d41945..0000000 Binary files a/example/src/main/assets/pic/4/029.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/030.png b/example/src/main/assets/pic/4/030.png deleted file mode 100644 index 31952e7..0000000 Binary files a/example/src/main/assets/pic/4/030.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/031.png b/example/src/main/assets/pic/4/031.png deleted file mode 100644 index 683550b..0000000 Binary files a/example/src/main/assets/pic/4/031.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/032.png b/example/src/main/assets/pic/4/032.png deleted file mode 100644 index a64bdf4..0000000 Binary files a/example/src/main/assets/pic/4/032.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/033.png b/example/src/main/assets/pic/4/033.png deleted file mode 100644 index 975d2fd..0000000 Binary files a/example/src/main/assets/pic/4/033.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/034.png b/example/src/main/assets/pic/4/034.png deleted file mode 100644 index bbbe5cf..0000000 Binary files a/example/src/main/assets/pic/4/034.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/035.png b/example/src/main/assets/pic/4/035.png deleted file mode 100644 index 0efbbd9..0000000 Binary files a/example/src/main/assets/pic/4/035.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/036.png b/example/src/main/assets/pic/4/036.png deleted file mode 100644 index 1e8230d..0000000 Binary files a/example/src/main/assets/pic/4/036.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/037.png b/example/src/main/assets/pic/4/037.png deleted file mode 100644 index 0f6c04c..0000000 Binary files a/example/src/main/assets/pic/4/037.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/038.png b/example/src/main/assets/pic/4/038.png deleted file mode 100644 index a1985e2..0000000 Binary files a/example/src/main/assets/pic/4/038.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/039.png b/example/src/main/assets/pic/4/039.png deleted file mode 100644 index 9f23a90..0000000 Binary files a/example/src/main/assets/pic/4/039.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/040.png b/example/src/main/assets/pic/4/040.png deleted file mode 100644 index 2d16dee..0000000 Binary files a/example/src/main/assets/pic/4/040.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/041.png b/example/src/main/assets/pic/4/041.png deleted file mode 100644 index 37b5710..0000000 Binary files a/example/src/main/assets/pic/4/041.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/042.png b/example/src/main/assets/pic/4/042.png deleted file mode 100644 index 5ff6977..0000000 Binary files a/example/src/main/assets/pic/4/042.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/043.png b/example/src/main/assets/pic/4/043.png deleted file mode 100644 index d8674d0..0000000 Binary files a/example/src/main/assets/pic/4/043.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/044.png b/example/src/main/assets/pic/4/044.png deleted file mode 100644 index 8fced7a..0000000 Binary files a/example/src/main/assets/pic/4/044.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/045.png b/example/src/main/assets/pic/4/045.png deleted file mode 100644 index fb79c8f..0000000 Binary files a/example/src/main/assets/pic/4/045.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/046.png b/example/src/main/assets/pic/4/046.png deleted file mode 100644 index 9b6dc5b..0000000 Binary files a/example/src/main/assets/pic/4/046.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/047.png b/example/src/main/assets/pic/4/047.png deleted file mode 100644 index 429d7d5..0000000 Binary files a/example/src/main/assets/pic/4/047.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/048.png b/example/src/main/assets/pic/4/048.png deleted file mode 100644 index f803f60..0000000 Binary files a/example/src/main/assets/pic/4/048.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/049.png b/example/src/main/assets/pic/4/049.png deleted file mode 100644 index 259c98f..0000000 Binary files a/example/src/main/assets/pic/4/049.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/050.png b/example/src/main/assets/pic/4/050.png deleted file mode 100644 index 948f2ab..0000000 Binary files a/example/src/main/assets/pic/4/050.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/051.png b/example/src/main/assets/pic/4/051.png deleted file mode 100644 index 34ae8ad..0000000 Binary files a/example/src/main/assets/pic/4/051.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/052.png b/example/src/main/assets/pic/4/052.png deleted file mode 100644 index 618cc96..0000000 Binary files a/example/src/main/assets/pic/4/052.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/053.png b/example/src/main/assets/pic/4/053.png deleted file mode 100644 index 1956de0..0000000 Binary files a/example/src/main/assets/pic/4/053.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/054.png b/example/src/main/assets/pic/4/054.png deleted file mode 100644 index 3f84102..0000000 Binary files a/example/src/main/assets/pic/4/054.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/055.png b/example/src/main/assets/pic/4/055.png deleted file mode 100644 index 2bb105c..0000000 Binary files a/example/src/main/assets/pic/4/055.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/056.png b/example/src/main/assets/pic/4/056.png deleted file mode 100644 index 6a892c3..0000000 Binary files a/example/src/main/assets/pic/4/056.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/057.png b/example/src/main/assets/pic/4/057.png deleted file mode 100644 index 2061ceb..0000000 Binary files a/example/src/main/assets/pic/4/057.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/058.png b/example/src/main/assets/pic/4/058.png deleted file mode 100644 index b76c13e..0000000 Binary files a/example/src/main/assets/pic/4/058.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/059.png b/example/src/main/assets/pic/4/059.png deleted file mode 100644 index 8349ade..0000000 Binary files a/example/src/main/assets/pic/4/059.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/060.png b/example/src/main/assets/pic/4/060.png deleted file mode 100644 index fbe5e4f..0000000 Binary files a/example/src/main/assets/pic/4/060.png and /dev/null differ diff --git a/example/src/main/assets/pic/4/4ex.png b/example/src/main/assets/pic/4/4ex.png deleted file mode 100644 index b4df950..0000000 Binary files a/example/src/main/assets/pic/4/4ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/40.png b/example/src/main/assets/pic/40.png deleted file mode 100644 index b6fc97b..0000000 Binary files a/example/src/main/assets/pic/40.png and /dev/null differ diff --git a/example/src/main/assets/pic/40/40.png b/example/src/main/assets/pic/40/40.png deleted file mode 100644 index b6fc97b..0000000 Binary files a/example/src/main/assets/pic/40/40.png and /dev/null differ diff --git a/example/src/main/assets/pic/40/40ex.png b/example/src/main/assets/pic/40/40ex.png deleted file mode 100644 index e5d6455..0000000 Binary files a/example/src/main/assets/pic/40/40ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/45.png b/example/src/main/assets/pic/45.png deleted file mode 100644 index 87fa44c..0000000 Binary files a/example/src/main/assets/pic/45.png and /dev/null differ diff --git a/example/src/main/assets/pic/45/45.png b/example/src/main/assets/pic/45/45.png deleted file mode 100644 index 87fa44c..0000000 Binary files a/example/src/main/assets/pic/45/45.png and /dev/null differ diff --git a/example/src/main/assets/pic/45/45ex.png b/example/src/main/assets/pic/45/45ex.png deleted file mode 100644 index 058a92d..0000000 Binary files a/example/src/main/assets/pic/45/45ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/48/48ex.png b/example/src/main/assets/pic/48/48ex.png deleted file mode 100644 index 2d7794c..0000000 Binary files a/example/src/main/assets/pic/48/48ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/49.png b/example/src/main/assets/pic/49.png deleted file mode 100644 index c48796e..0000000 Binary files a/example/src/main/assets/pic/49.png and /dev/null differ diff --git a/example/src/main/assets/pic/49/49.png b/example/src/main/assets/pic/49/49.png deleted file mode 100644 index c48796e..0000000 Binary files a/example/src/main/assets/pic/49/49.png and /dev/null differ diff --git a/example/src/main/assets/pic/49/49ex.png b/example/src/main/assets/pic/49/49ex.png deleted file mode 100644 index c91096e..0000000 Binary files a/example/src/main/assets/pic/49/49ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/4ex.png b/example/src/main/assets/pic/4ex.png new file mode 100644 index 0000000..536e0a2 Binary files /dev/null and b/example/src/main/assets/pic/4ex.png differ diff --git a/example/src/main/assets/pic/5.png b/example/src/main/assets/pic/5.png deleted file mode 100644 index 48b6401..0000000 Binary files a/example/src/main/assets/pic/5.png and /dev/null differ diff --git a/example/src/main/assets/pic/5/000000.png b/example/src/main/assets/pic/5/000000.png new file mode 100644 index 0000000..8e73278 Binary files /dev/null and b/example/src/main/assets/pic/5/000000.png differ diff --git a/example/src/main/assets/pic/5/000001.png b/example/src/main/assets/pic/5/000001.png new file mode 100644 index 0000000..b70f626 Binary files /dev/null and b/example/src/main/assets/pic/5/000001.png differ diff --git a/example/src/main/assets/pic/5/000002.png b/example/src/main/assets/pic/5/000002.png new file mode 100644 index 0000000..e9ba317 Binary files /dev/null and b/example/src/main/assets/pic/5/000002.png differ diff --git a/example/src/main/assets/pic/5/000003.png b/example/src/main/assets/pic/5/000003.png new file mode 100644 index 0000000..c5fe643 Binary files /dev/null and b/example/src/main/assets/pic/5/000003.png differ diff --git a/example/src/main/assets/pic/5/000004.png b/example/src/main/assets/pic/5/000004.png new file mode 100644 index 0000000..b4f3557 Binary files /dev/null and b/example/src/main/assets/pic/5/000004.png differ diff --git a/example/src/main/assets/pic/5/000005.png b/example/src/main/assets/pic/5/000005.png new file mode 100644 index 0000000..045a6f3 Binary files /dev/null and b/example/src/main/assets/pic/5/000005.png differ diff --git a/example/src/main/assets/pic/5/000006.png b/example/src/main/assets/pic/5/000006.png new file mode 100644 index 0000000..0cfcd71 Binary files /dev/null and b/example/src/main/assets/pic/5/000006.png differ diff --git a/example/src/main/assets/pic/5/000007.png b/example/src/main/assets/pic/5/000007.png new file mode 100644 index 0000000..00a036c Binary files /dev/null and b/example/src/main/assets/pic/5/000007.png differ diff --git a/example/src/main/assets/pic/5/000008.png b/example/src/main/assets/pic/5/000008.png new file mode 100644 index 0000000..3fc185d Binary files /dev/null and b/example/src/main/assets/pic/5/000008.png differ diff --git a/example/src/main/assets/pic/5/000009.png b/example/src/main/assets/pic/5/000009.png new file mode 100644 index 0000000..83d0f43 Binary files /dev/null and b/example/src/main/assets/pic/5/000009.png differ diff --git a/example/src/main/assets/pic/5/000010.png b/example/src/main/assets/pic/5/000010.png new file mode 100644 index 0000000..46a81c8 Binary files /dev/null and b/example/src/main/assets/pic/5/000010.png differ diff --git a/example/src/main/assets/pic/5/000011.png b/example/src/main/assets/pic/5/000011.png new file mode 100644 index 0000000..1fa8b00 Binary files /dev/null and b/example/src/main/assets/pic/5/000011.png differ diff --git a/example/src/main/assets/pic/5/000012.png b/example/src/main/assets/pic/5/000012.png new file mode 100644 index 0000000..58056f1 Binary files /dev/null and b/example/src/main/assets/pic/5/000012.png differ diff --git a/example/src/main/assets/pic/5/000013.png b/example/src/main/assets/pic/5/000013.png new file mode 100644 index 0000000..2748b3d Binary files /dev/null and b/example/src/main/assets/pic/5/000013.png differ diff --git a/example/src/main/assets/pic/5/000014.png b/example/src/main/assets/pic/5/000014.png new file mode 100644 index 0000000..16ff141 Binary files /dev/null and b/example/src/main/assets/pic/5/000014.png differ diff --git a/example/src/main/assets/pic/5/000015.png b/example/src/main/assets/pic/5/000015.png new file mode 100644 index 0000000..3fc1519 Binary files /dev/null and b/example/src/main/assets/pic/5/000015.png differ diff --git a/example/src/main/assets/pic/5/000016.png b/example/src/main/assets/pic/5/000016.png new file mode 100644 index 0000000..b457a1d Binary files /dev/null and b/example/src/main/assets/pic/5/000016.png differ diff --git a/example/src/main/assets/pic/5/000017.png b/example/src/main/assets/pic/5/000017.png new file mode 100644 index 0000000..aa5009b Binary files /dev/null and b/example/src/main/assets/pic/5/000017.png differ diff --git a/example/src/main/assets/pic/5/000018.png b/example/src/main/assets/pic/5/000018.png new file mode 100644 index 0000000..53136e4 Binary files /dev/null and b/example/src/main/assets/pic/5/000018.png differ diff --git a/example/src/main/assets/pic/5/000019.png b/example/src/main/assets/pic/5/000019.png new file mode 100644 index 0000000..f0bfd6b Binary files /dev/null and b/example/src/main/assets/pic/5/000019.png differ diff --git a/example/src/main/assets/pic/5/000020.png b/example/src/main/assets/pic/5/000020.png new file mode 100644 index 0000000..a337c1e Binary files /dev/null and b/example/src/main/assets/pic/5/000020.png differ diff --git a/example/src/main/assets/pic/5/000021.png b/example/src/main/assets/pic/5/000021.png new file mode 100644 index 0000000..f71ec94 Binary files /dev/null and b/example/src/main/assets/pic/5/000021.png differ diff --git a/example/src/main/assets/pic/5/000022.png b/example/src/main/assets/pic/5/000022.png new file mode 100644 index 0000000..f8a9005 Binary files /dev/null and b/example/src/main/assets/pic/5/000022.png differ diff --git a/example/src/main/assets/pic/5/000023.png b/example/src/main/assets/pic/5/000023.png new file mode 100644 index 0000000..8d2db41 Binary files /dev/null and b/example/src/main/assets/pic/5/000023.png differ diff --git a/example/src/main/assets/pic/5/000024.png b/example/src/main/assets/pic/5/000024.png new file mode 100644 index 0000000..3c75bd7 Binary files /dev/null and b/example/src/main/assets/pic/5/000024.png differ diff --git a/example/src/main/assets/pic/5/000025.png b/example/src/main/assets/pic/5/000025.png new file mode 100644 index 0000000..4688a07 Binary files /dev/null and b/example/src/main/assets/pic/5/000025.png differ diff --git a/example/src/main/assets/pic/5/000026.png b/example/src/main/assets/pic/5/000026.png new file mode 100644 index 0000000..5878626 Binary files /dev/null and b/example/src/main/assets/pic/5/000026.png differ diff --git a/example/src/main/assets/pic/5/000027.png b/example/src/main/assets/pic/5/000027.png new file mode 100644 index 0000000..5d51bc4 Binary files /dev/null and b/example/src/main/assets/pic/5/000027.png differ diff --git a/example/src/main/assets/pic/5/000028.png b/example/src/main/assets/pic/5/000028.png new file mode 100644 index 0000000..e7ee156 Binary files /dev/null and b/example/src/main/assets/pic/5/000028.png differ diff --git a/example/src/main/assets/pic/5/000029.png b/example/src/main/assets/pic/5/000029.png new file mode 100644 index 0000000..45ecd73 Binary files /dev/null and b/example/src/main/assets/pic/5/000029.png differ diff --git a/example/src/main/assets/pic/5/000030.png b/example/src/main/assets/pic/5/000030.png new file mode 100644 index 0000000..d3b7a62 Binary files /dev/null and b/example/src/main/assets/pic/5/000030.png differ diff --git a/example/src/main/assets/pic/5/000031.png b/example/src/main/assets/pic/5/000031.png new file mode 100644 index 0000000..750ada1 Binary files /dev/null and b/example/src/main/assets/pic/5/000031.png differ diff --git a/example/src/main/assets/pic/5/5.png b/example/src/main/assets/pic/5/5.png deleted file mode 100644 index 48b6401..0000000 Binary files a/example/src/main/assets/pic/5/5.png and /dev/null differ diff --git a/example/src/main/assets/pic/5/5ex.png b/example/src/main/assets/pic/5/5ex.png deleted file mode 100644 index 572fdd2..0000000 Binary files a/example/src/main/assets/pic/5/5ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/53.png b/example/src/main/assets/pic/53.png deleted file mode 100644 index 7089599..0000000 Binary files a/example/src/main/assets/pic/53.png and /dev/null differ diff --git a/example/src/main/assets/pic/53/53.png b/example/src/main/assets/pic/53/53.png deleted file mode 100644 index 7089599..0000000 Binary files a/example/src/main/assets/pic/53/53.png and /dev/null differ diff --git a/example/src/main/assets/pic/53/53ex.png b/example/src/main/assets/pic/53/53ex.png deleted file mode 100644 index 9fcd091..0000000 Binary files a/example/src/main/assets/pic/53/53ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/54/000000.png b/example/src/main/assets/pic/54/000000.png new file mode 100644 index 0000000..928a9ba Binary files /dev/null and b/example/src/main/assets/pic/54/000000.png differ diff --git a/example/src/main/assets/pic/54ex.png b/example/src/main/assets/pic/54ex.png new file mode 100644 index 0000000..5e37243 Binary files /dev/null and b/example/src/main/assets/pic/54ex.png differ diff --git a/example/src/main/assets/pic/55/000000.png b/example/src/main/assets/pic/55/000000.png new file mode 100644 index 0000000..928a9ba Binary files /dev/null and b/example/src/main/assets/pic/55/000000.png differ diff --git a/example/src/main/assets/pic/55ex.png b/example/src/main/assets/pic/55ex.png new file mode 100644 index 0000000..5e37243 Binary files /dev/null and b/example/src/main/assets/pic/55ex.png differ diff --git a/example/src/main/assets/pic/56.png b/example/src/main/assets/pic/56.png deleted file mode 100644 index 3cf5eeb..0000000 Binary files a/example/src/main/assets/pic/56.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/000000.png b/example/src/main/assets/pic/56/000000.png new file mode 100644 index 0000000..e25a407 Binary files /dev/null and b/example/src/main/assets/pic/56/000000.png differ diff --git a/example/src/main/assets/pic/56/000001.png b/example/src/main/assets/pic/56/000001.png new file mode 100644 index 0000000..dc203d7 Binary files /dev/null and b/example/src/main/assets/pic/56/000001.png differ diff --git a/example/src/main/assets/pic/56/000002.png b/example/src/main/assets/pic/56/000002.png new file mode 100644 index 0000000..559acb2 Binary files /dev/null and b/example/src/main/assets/pic/56/000002.png differ diff --git a/example/src/main/assets/pic/56/000003.png b/example/src/main/assets/pic/56/000003.png new file mode 100644 index 0000000..492d454 Binary files /dev/null and b/example/src/main/assets/pic/56/000003.png differ diff --git a/example/src/main/assets/pic/56/000004.png b/example/src/main/assets/pic/56/000004.png new file mode 100644 index 0000000..8c322a0 Binary files /dev/null and b/example/src/main/assets/pic/56/000004.png differ diff --git a/example/src/main/assets/pic/56/000005.png b/example/src/main/assets/pic/56/000005.png new file mode 100644 index 0000000..667b853 Binary files /dev/null and b/example/src/main/assets/pic/56/000005.png differ diff --git a/example/src/main/assets/pic/56/000006.png b/example/src/main/assets/pic/56/000006.png new file mode 100644 index 0000000..b25f188 Binary files /dev/null and b/example/src/main/assets/pic/56/000006.png differ diff --git a/example/src/main/assets/pic/56/000007.png b/example/src/main/assets/pic/56/000007.png new file mode 100644 index 0000000..1844de1 Binary files /dev/null and b/example/src/main/assets/pic/56/000007.png differ diff --git a/example/src/main/assets/pic/56/000008.png b/example/src/main/assets/pic/56/000008.png new file mode 100644 index 0000000..90bfae8 Binary files /dev/null and b/example/src/main/assets/pic/56/000008.png differ diff --git a/example/src/main/assets/pic/56/000009.png b/example/src/main/assets/pic/56/000009.png new file mode 100644 index 0000000..441b108 Binary files /dev/null and b/example/src/main/assets/pic/56/000009.png differ diff --git a/example/src/main/assets/pic/56/000010.png b/example/src/main/assets/pic/56/000010.png new file mode 100644 index 0000000..4445e76 Binary files /dev/null and b/example/src/main/assets/pic/56/000010.png differ diff --git a/example/src/main/assets/pic/56/000011.png b/example/src/main/assets/pic/56/000011.png new file mode 100644 index 0000000..774adeb Binary files /dev/null and b/example/src/main/assets/pic/56/000011.png differ diff --git a/example/src/main/assets/pic/56/000012.png b/example/src/main/assets/pic/56/000012.png new file mode 100644 index 0000000..7227ef6 Binary files /dev/null and b/example/src/main/assets/pic/56/000012.png differ diff --git a/example/src/main/assets/pic/56/000013.png b/example/src/main/assets/pic/56/000013.png new file mode 100644 index 0000000..5451354 Binary files /dev/null and b/example/src/main/assets/pic/56/000013.png differ diff --git a/example/src/main/assets/pic/56/000014.png b/example/src/main/assets/pic/56/000014.png new file mode 100644 index 0000000..07ef17e Binary files /dev/null and b/example/src/main/assets/pic/56/000014.png differ diff --git a/example/src/main/assets/pic/56/000015.png b/example/src/main/assets/pic/56/000015.png new file mode 100644 index 0000000..ec2ea0f Binary files /dev/null and b/example/src/main/assets/pic/56/000015.png differ diff --git a/example/src/main/assets/pic/56/000016.png b/example/src/main/assets/pic/56/000016.png new file mode 100644 index 0000000..6c57360 Binary files /dev/null and b/example/src/main/assets/pic/56/000016.png differ diff --git a/example/src/main/assets/pic/56/000017.png b/example/src/main/assets/pic/56/000017.png new file mode 100644 index 0000000..509274e Binary files /dev/null and b/example/src/main/assets/pic/56/000017.png differ diff --git a/example/src/main/assets/pic/56/000018.png b/example/src/main/assets/pic/56/000018.png new file mode 100644 index 0000000..a6ecf89 Binary files /dev/null and b/example/src/main/assets/pic/56/000018.png differ diff --git a/example/src/main/assets/pic/56/000019.png b/example/src/main/assets/pic/56/000019.png new file mode 100644 index 0000000..8c37626 Binary files /dev/null and b/example/src/main/assets/pic/56/000019.png differ diff --git a/example/src/main/assets/pic/56/000020.png b/example/src/main/assets/pic/56/000020.png new file mode 100644 index 0000000..c059e79 Binary files /dev/null and b/example/src/main/assets/pic/56/000020.png differ diff --git a/example/src/main/assets/pic/56/000021.png b/example/src/main/assets/pic/56/000021.png new file mode 100644 index 0000000..85fd249 Binary files /dev/null and b/example/src/main/assets/pic/56/000021.png differ diff --git a/example/src/main/assets/pic/56/000022.png b/example/src/main/assets/pic/56/000022.png new file mode 100644 index 0000000..7250c80 Binary files /dev/null and b/example/src/main/assets/pic/56/000022.png differ diff --git a/example/src/main/assets/pic/56/000023.png b/example/src/main/assets/pic/56/000023.png new file mode 100644 index 0000000..2c9b6d6 Binary files /dev/null and b/example/src/main/assets/pic/56/000023.png differ diff --git a/example/src/main/assets/pic/56/000024.png b/example/src/main/assets/pic/56/000024.png new file mode 100644 index 0000000..5c7d9ae Binary files /dev/null and b/example/src/main/assets/pic/56/000024.png differ diff --git a/example/src/main/assets/pic/56/000025.png b/example/src/main/assets/pic/56/000025.png new file mode 100644 index 0000000..af125d6 Binary files /dev/null and b/example/src/main/assets/pic/56/000025.png differ diff --git a/example/src/main/assets/pic/56/000026.png b/example/src/main/assets/pic/56/000026.png new file mode 100644 index 0000000..9f2eeea Binary files /dev/null and b/example/src/main/assets/pic/56/000026.png differ diff --git a/example/src/main/assets/pic/56/000027.png b/example/src/main/assets/pic/56/000027.png new file mode 100644 index 0000000..e18ae0c Binary files /dev/null and b/example/src/main/assets/pic/56/000027.png differ diff --git a/example/src/main/assets/pic/56/000028.png b/example/src/main/assets/pic/56/000028.png new file mode 100644 index 0000000..6cd5a05 Binary files /dev/null and b/example/src/main/assets/pic/56/000028.png differ diff --git a/example/src/main/assets/pic/56/000029.png b/example/src/main/assets/pic/56/000029.png new file mode 100644 index 0000000..6836e62 Binary files /dev/null and b/example/src/main/assets/pic/56/000029.png differ diff --git a/example/src/main/assets/pic/56/000030.png b/example/src/main/assets/pic/56/000030.png new file mode 100644 index 0000000..3ac26cc Binary files /dev/null and b/example/src/main/assets/pic/56/000030.png differ diff --git a/example/src/main/assets/pic/56/000031.png b/example/src/main/assets/pic/56/000031.png new file mode 100644 index 0000000..42f8017 Binary files /dev/null and b/example/src/main/assets/pic/56/000031.png differ diff --git a/example/src/main/assets/pic/56/000032.png b/example/src/main/assets/pic/56/000032.png new file mode 100644 index 0000000..c524dbc Binary files /dev/null and b/example/src/main/assets/pic/56/000032.png differ diff --git a/example/src/main/assets/pic/56/000033.png b/example/src/main/assets/pic/56/000033.png new file mode 100644 index 0000000..4504b98 Binary files /dev/null and b/example/src/main/assets/pic/56/000033.png differ diff --git a/example/src/main/assets/pic/56/000034.png b/example/src/main/assets/pic/56/000034.png new file mode 100644 index 0000000..26b2a85 Binary files /dev/null and b/example/src/main/assets/pic/56/000034.png differ diff --git a/example/src/main/assets/pic/56/000035.png b/example/src/main/assets/pic/56/000035.png new file mode 100644 index 0000000..509274e Binary files /dev/null and b/example/src/main/assets/pic/56/000035.png differ diff --git a/example/src/main/assets/pic/56/56.png b/example/src/main/assets/pic/56/56.png deleted file mode 100644 index 3cf5eeb..0000000 Binary files a/example/src/main/assets/pic/56/56.png and /dev/null differ diff --git a/example/src/main/assets/pic/56/56ex.png b/example/src/main/assets/pic/56/56ex.png deleted file mode 100644 index 428dc8b..0000000 Binary files a/example/src/main/assets/pic/56/56ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/56ex.png b/example/src/main/assets/pic/56ex.png new file mode 100644 index 0000000..030dd0e Binary files /dev/null and b/example/src/main/assets/pic/56ex.png differ diff --git a/example/src/main/assets/pic/59.png b/example/src/main/assets/pic/59.png deleted file mode 100644 index dc8bd0d..0000000 Binary files a/example/src/main/assets/pic/59.png and /dev/null differ diff --git a/example/src/main/assets/pic/59/000000.png b/example/src/main/assets/pic/59/000000.png new file mode 100644 index 0000000..ce80321 Binary files /dev/null and b/example/src/main/assets/pic/59/000000.png differ diff --git a/example/src/main/assets/pic/59/000001.png b/example/src/main/assets/pic/59/000001.png new file mode 100644 index 0000000..40f38af Binary files /dev/null and b/example/src/main/assets/pic/59/000001.png differ diff --git a/example/src/main/assets/pic/59/000002.png b/example/src/main/assets/pic/59/000002.png new file mode 100644 index 0000000..695a26b Binary files /dev/null and b/example/src/main/assets/pic/59/000002.png differ diff --git a/example/src/main/assets/pic/59/000003.png b/example/src/main/assets/pic/59/000003.png new file mode 100644 index 0000000..501e2fe Binary files /dev/null and b/example/src/main/assets/pic/59/000003.png differ diff --git a/example/src/main/assets/pic/59/000004.png b/example/src/main/assets/pic/59/000004.png new file mode 100644 index 0000000..118240c Binary files /dev/null and b/example/src/main/assets/pic/59/000004.png differ diff --git a/example/src/main/assets/pic/59/000005.png b/example/src/main/assets/pic/59/000005.png new file mode 100644 index 0000000..7558b17 Binary files /dev/null and b/example/src/main/assets/pic/59/000005.png differ diff --git a/example/src/main/assets/pic/59/000006.png b/example/src/main/assets/pic/59/000006.png new file mode 100644 index 0000000..b3bf6a5 Binary files /dev/null and b/example/src/main/assets/pic/59/000006.png differ diff --git a/example/src/main/assets/pic/59/000007.png b/example/src/main/assets/pic/59/000007.png new file mode 100644 index 0000000..67247e6 Binary files /dev/null and b/example/src/main/assets/pic/59/000007.png differ diff --git a/example/src/main/assets/pic/59/000008.png b/example/src/main/assets/pic/59/000008.png new file mode 100644 index 0000000..5a7af5c Binary files /dev/null and b/example/src/main/assets/pic/59/000008.png differ diff --git a/example/src/main/assets/pic/59/000009.png b/example/src/main/assets/pic/59/000009.png new file mode 100644 index 0000000..8ad3198 Binary files /dev/null and b/example/src/main/assets/pic/59/000009.png differ diff --git a/example/src/main/assets/pic/59/000010.png b/example/src/main/assets/pic/59/000010.png new file mode 100644 index 0000000..72dfcb8 Binary files /dev/null and b/example/src/main/assets/pic/59/000010.png differ diff --git a/example/src/main/assets/pic/59/000011.png b/example/src/main/assets/pic/59/000011.png new file mode 100644 index 0000000..bb929fc Binary files /dev/null and b/example/src/main/assets/pic/59/000011.png differ diff --git a/example/src/main/assets/pic/59/000012.png b/example/src/main/assets/pic/59/000012.png new file mode 100644 index 0000000..7f3a4f9 Binary files /dev/null and b/example/src/main/assets/pic/59/000012.png differ diff --git a/example/src/main/assets/pic/59/000013.png b/example/src/main/assets/pic/59/000013.png new file mode 100644 index 0000000..710bd33 Binary files /dev/null and b/example/src/main/assets/pic/59/000013.png differ diff --git a/example/src/main/assets/pic/59/000014.png b/example/src/main/assets/pic/59/000014.png new file mode 100644 index 0000000..acdeca7 Binary files /dev/null and b/example/src/main/assets/pic/59/000014.png differ diff --git a/example/src/main/assets/pic/59/000015.png b/example/src/main/assets/pic/59/000015.png new file mode 100644 index 0000000..30d1cae Binary files /dev/null and b/example/src/main/assets/pic/59/000015.png differ diff --git a/example/src/main/assets/pic/59/000016.png b/example/src/main/assets/pic/59/000016.png new file mode 100644 index 0000000..116b8a1 Binary files /dev/null and b/example/src/main/assets/pic/59/000016.png differ diff --git a/example/src/main/assets/pic/59/000017.png b/example/src/main/assets/pic/59/000017.png new file mode 100644 index 0000000..a49492d Binary files /dev/null and b/example/src/main/assets/pic/59/000017.png differ diff --git a/example/src/main/assets/pic/59/000018.png b/example/src/main/assets/pic/59/000018.png new file mode 100644 index 0000000..2ca8b8d Binary files /dev/null and b/example/src/main/assets/pic/59/000018.png differ diff --git a/example/src/main/assets/pic/59/000019.png b/example/src/main/assets/pic/59/000019.png new file mode 100644 index 0000000..31ba3a7 Binary files /dev/null and b/example/src/main/assets/pic/59/000019.png differ diff --git a/example/src/main/assets/pic/59/000020.png b/example/src/main/assets/pic/59/000020.png new file mode 100644 index 0000000..959a869 Binary files /dev/null and b/example/src/main/assets/pic/59/000020.png differ diff --git a/example/src/main/assets/pic/59/000021.png b/example/src/main/assets/pic/59/000021.png new file mode 100644 index 0000000..8c27e26 Binary files /dev/null and b/example/src/main/assets/pic/59/000021.png differ diff --git a/example/src/main/assets/pic/59/000022.png b/example/src/main/assets/pic/59/000022.png new file mode 100644 index 0000000..f0df206 Binary files /dev/null and b/example/src/main/assets/pic/59/000022.png differ diff --git a/example/src/main/assets/pic/59/000023.png b/example/src/main/assets/pic/59/000023.png new file mode 100644 index 0000000..414faf9 Binary files /dev/null and b/example/src/main/assets/pic/59/000023.png differ diff --git a/example/src/main/assets/pic/59/59.png b/example/src/main/assets/pic/59/59.png deleted file mode 100644 index dc8bd0d..0000000 Binary files a/example/src/main/assets/pic/59/59.png and /dev/null differ diff --git a/example/src/main/assets/pic/59/59ex.png b/example/src/main/assets/pic/59/59ex.png deleted file mode 100644 index ff202df..0000000 Binary files a/example/src/main/assets/pic/59/59ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/59ex.png b/example/src/main/assets/pic/59ex.png new file mode 100644 index 0000000..70140b3 Binary files /dev/null and b/example/src/main/assets/pic/59ex.png differ diff --git a/example/src/main/assets/pic/5ex.png b/example/src/main/assets/pic/5ex.png new file mode 100644 index 0000000..6c4811f Binary files /dev/null and b/example/src/main/assets/pic/5ex.png differ diff --git a/example/src/main/assets/pic/6.png b/example/src/main/assets/pic/6.png deleted file mode 100644 index a324e40..0000000 Binary files a/example/src/main/assets/pic/6.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/000000.png b/example/src/main/assets/pic/6/000000.png new file mode 100644 index 0000000..643dcb7 Binary files /dev/null and b/example/src/main/assets/pic/6/000000.png differ diff --git a/example/src/main/assets/pic/6/000001.png b/example/src/main/assets/pic/6/000001.png new file mode 100644 index 0000000..58adf36 Binary files /dev/null and b/example/src/main/assets/pic/6/000001.png differ diff --git a/example/src/main/assets/pic/6/000002.png b/example/src/main/assets/pic/6/000002.png new file mode 100644 index 0000000..c630ba2 Binary files /dev/null and b/example/src/main/assets/pic/6/000002.png differ diff --git a/example/src/main/assets/pic/6/000003.png b/example/src/main/assets/pic/6/000003.png new file mode 100644 index 0000000..44fd666 Binary files /dev/null and b/example/src/main/assets/pic/6/000003.png differ diff --git a/example/src/main/assets/pic/6/000004.png b/example/src/main/assets/pic/6/000004.png new file mode 100644 index 0000000..c6c4540 Binary files /dev/null and b/example/src/main/assets/pic/6/000004.png differ diff --git a/example/src/main/assets/pic/6/000005.png b/example/src/main/assets/pic/6/000005.png new file mode 100644 index 0000000..139b289 Binary files /dev/null and b/example/src/main/assets/pic/6/000005.png differ diff --git a/example/src/main/assets/pic/6/000006.png b/example/src/main/assets/pic/6/000006.png new file mode 100644 index 0000000..68e8993 Binary files /dev/null and b/example/src/main/assets/pic/6/000006.png differ diff --git a/example/src/main/assets/pic/6/000007.png b/example/src/main/assets/pic/6/000007.png new file mode 100644 index 0000000..a2dd8a3 Binary files /dev/null and b/example/src/main/assets/pic/6/000007.png differ diff --git a/example/src/main/assets/pic/6/000008.png b/example/src/main/assets/pic/6/000008.png new file mode 100644 index 0000000..f25b67d Binary files /dev/null and b/example/src/main/assets/pic/6/000008.png differ diff --git a/example/src/main/assets/pic/6/000009.png b/example/src/main/assets/pic/6/000009.png new file mode 100644 index 0000000..76431c6 Binary files /dev/null and b/example/src/main/assets/pic/6/000009.png differ diff --git a/example/src/main/assets/pic/6/000010.png b/example/src/main/assets/pic/6/000010.png new file mode 100644 index 0000000..f91ef7a Binary files /dev/null and b/example/src/main/assets/pic/6/000010.png differ diff --git a/example/src/main/assets/pic/6/000011.png b/example/src/main/assets/pic/6/000011.png new file mode 100644 index 0000000..447e08b Binary files /dev/null and b/example/src/main/assets/pic/6/000011.png differ diff --git a/example/src/main/assets/pic/6/000012.png b/example/src/main/assets/pic/6/000012.png new file mode 100644 index 0000000..e4cde13 Binary files /dev/null and b/example/src/main/assets/pic/6/000012.png differ diff --git a/example/src/main/assets/pic/6/000013.png b/example/src/main/assets/pic/6/000013.png new file mode 100644 index 0000000..c08f21e Binary files /dev/null and b/example/src/main/assets/pic/6/000013.png differ diff --git a/example/src/main/assets/pic/6/000014.png b/example/src/main/assets/pic/6/000014.png new file mode 100644 index 0000000..582e95a Binary files /dev/null and b/example/src/main/assets/pic/6/000014.png differ diff --git a/example/src/main/assets/pic/6/000015.png b/example/src/main/assets/pic/6/000015.png new file mode 100644 index 0000000..67ec8a4 Binary files /dev/null and b/example/src/main/assets/pic/6/000015.png differ diff --git a/example/src/main/assets/pic/6/000016.png b/example/src/main/assets/pic/6/000016.png new file mode 100644 index 0000000..d0c4d70 Binary files /dev/null and b/example/src/main/assets/pic/6/000016.png differ diff --git a/example/src/main/assets/pic/6/000017.png b/example/src/main/assets/pic/6/000017.png new file mode 100644 index 0000000..b84cfc6 Binary files /dev/null and b/example/src/main/assets/pic/6/000017.png differ diff --git a/example/src/main/assets/pic/6/000018.png b/example/src/main/assets/pic/6/000018.png new file mode 100644 index 0000000..706d4e8 Binary files /dev/null and b/example/src/main/assets/pic/6/000018.png differ diff --git a/example/src/main/assets/pic/6/000019.png b/example/src/main/assets/pic/6/000019.png new file mode 100644 index 0000000..b05ddc4 Binary files /dev/null and b/example/src/main/assets/pic/6/000019.png differ diff --git a/example/src/main/assets/pic/6/000020.png b/example/src/main/assets/pic/6/000020.png new file mode 100644 index 0000000..71b1e74 Binary files /dev/null and b/example/src/main/assets/pic/6/000020.png differ diff --git a/example/src/main/assets/pic/6/000021.png b/example/src/main/assets/pic/6/000021.png new file mode 100644 index 0000000..20df539 Binary files /dev/null and b/example/src/main/assets/pic/6/000021.png differ diff --git a/example/src/main/assets/pic/6/000022.png b/example/src/main/assets/pic/6/000022.png new file mode 100644 index 0000000..135fe48 Binary files /dev/null and b/example/src/main/assets/pic/6/000022.png differ diff --git a/example/src/main/assets/pic/6/000023.png b/example/src/main/assets/pic/6/000023.png new file mode 100644 index 0000000..30eb5ae Binary files /dev/null and b/example/src/main/assets/pic/6/000023.png differ diff --git a/example/src/main/assets/pic/6/000024.png b/example/src/main/assets/pic/6/000024.png new file mode 100644 index 0000000..3411eca Binary files /dev/null and b/example/src/main/assets/pic/6/000024.png differ diff --git a/example/src/main/assets/pic/6/000025.png b/example/src/main/assets/pic/6/000025.png new file mode 100644 index 0000000..049d4b2 Binary files /dev/null and b/example/src/main/assets/pic/6/000025.png differ diff --git a/example/src/main/assets/pic/6/000026.png b/example/src/main/assets/pic/6/000026.png new file mode 100644 index 0000000..d708cf6 Binary files /dev/null and b/example/src/main/assets/pic/6/000026.png differ diff --git a/example/src/main/assets/pic/6/000027.png b/example/src/main/assets/pic/6/000027.png new file mode 100644 index 0000000..c08f21e Binary files /dev/null and b/example/src/main/assets/pic/6/000027.png differ diff --git a/example/src/main/assets/pic/6/000028.png b/example/src/main/assets/pic/6/000028.png new file mode 100644 index 0000000..e326770 Binary files /dev/null and b/example/src/main/assets/pic/6/000028.png differ diff --git a/example/src/main/assets/pic/6/000029.png b/example/src/main/assets/pic/6/000029.png new file mode 100644 index 0000000..fc102f6 Binary files /dev/null and b/example/src/main/assets/pic/6/000029.png differ diff --git a/example/src/main/assets/pic/6/000030.png b/example/src/main/assets/pic/6/000030.png new file mode 100644 index 0000000..9049eaf Binary files /dev/null and b/example/src/main/assets/pic/6/000030.png differ diff --git a/example/src/main/assets/pic/6/000031.png b/example/src/main/assets/pic/6/000031.png new file mode 100644 index 0000000..759dd35 Binary files /dev/null and b/example/src/main/assets/pic/6/000031.png differ diff --git a/example/src/main/assets/pic/6/000032.png b/example/src/main/assets/pic/6/000032.png new file mode 100644 index 0000000..f25bbd9 Binary files /dev/null and b/example/src/main/assets/pic/6/000032.png differ diff --git a/example/src/main/assets/pic/6/000033.png b/example/src/main/assets/pic/6/000033.png new file mode 100644 index 0000000..03ba95d Binary files /dev/null and b/example/src/main/assets/pic/6/000033.png differ diff --git a/example/src/main/assets/pic/6/000034.png b/example/src/main/assets/pic/6/000034.png new file mode 100644 index 0000000..7697fd8 Binary files /dev/null and b/example/src/main/assets/pic/6/000034.png differ diff --git a/example/src/main/assets/pic/6/000035.png b/example/src/main/assets/pic/6/000035.png new file mode 100644 index 0000000..6c7c72c Binary files /dev/null and b/example/src/main/assets/pic/6/000035.png differ diff --git a/example/src/main/assets/pic/6/000036.png b/example/src/main/assets/pic/6/000036.png new file mode 100644 index 0000000..250b3ce Binary files /dev/null and b/example/src/main/assets/pic/6/000036.png differ diff --git a/example/src/main/assets/pic/6/000037.png b/example/src/main/assets/pic/6/000037.png new file mode 100644 index 0000000..b8c6622 Binary files /dev/null and b/example/src/main/assets/pic/6/000037.png differ diff --git a/example/src/main/assets/pic/6/000038.png b/example/src/main/assets/pic/6/000038.png new file mode 100644 index 0000000..1ce522f Binary files /dev/null and b/example/src/main/assets/pic/6/000038.png differ diff --git a/example/src/main/assets/pic/6/000039.png b/example/src/main/assets/pic/6/000039.png new file mode 100644 index 0000000..79e3780 Binary files /dev/null and b/example/src/main/assets/pic/6/000039.png differ diff --git a/example/src/main/assets/pic/6/000040.png b/example/src/main/assets/pic/6/000040.png new file mode 100644 index 0000000..6645368 Binary files /dev/null and b/example/src/main/assets/pic/6/000040.png differ diff --git a/example/src/main/assets/pic/6/000041.png b/example/src/main/assets/pic/6/000041.png new file mode 100644 index 0000000..c08f21e Binary files /dev/null and b/example/src/main/assets/pic/6/000041.png differ diff --git a/example/src/main/assets/pic/6/6.png b/example/src/main/assets/pic/6/6.png deleted file mode 100644 index a324e40..0000000 Binary files a/example/src/main/assets/pic/6/6.png and /dev/null differ diff --git a/example/src/main/assets/pic/6/6ex.png b/example/src/main/assets/pic/6/6ex.png deleted file mode 100644 index e2390ff..0000000 Binary files a/example/src/main/assets/pic/6/6ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/62.png b/example/src/main/assets/pic/62.png deleted file mode 100644 index ad3fce6..0000000 Binary files a/example/src/main/assets/pic/62.png and /dev/null differ diff --git a/example/src/main/assets/pic/62/000000.png b/example/src/main/assets/pic/62/000000.png new file mode 100644 index 0000000..a07ebec Binary files /dev/null and b/example/src/main/assets/pic/62/000000.png differ diff --git a/example/src/main/assets/pic/62/000001.png b/example/src/main/assets/pic/62/000001.png new file mode 100644 index 0000000..56f81d1 Binary files /dev/null and b/example/src/main/assets/pic/62/000001.png differ diff --git a/example/src/main/assets/pic/62/000002.png b/example/src/main/assets/pic/62/000002.png new file mode 100644 index 0000000..42e1e46 Binary files /dev/null and b/example/src/main/assets/pic/62/000002.png differ diff --git a/example/src/main/assets/pic/62/000003.png b/example/src/main/assets/pic/62/000003.png new file mode 100644 index 0000000..1c1346e Binary files /dev/null and b/example/src/main/assets/pic/62/000003.png differ diff --git a/example/src/main/assets/pic/62/000004.png b/example/src/main/assets/pic/62/000004.png new file mode 100644 index 0000000..52186f6 Binary files /dev/null and b/example/src/main/assets/pic/62/000004.png differ diff --git a/example/src/main/assets/pic/62/000005.png b/example/src/main/assets/pic/62/000005.png new file mode 100644 index 0000000..cd80330 Binary files /dev/null and b/example/src/main/assets/pic/62/000005.png differ diff --git a/example/src/main/assets/pic/62/000006.png b/example/src/main/assets/pic/62/000006.png new file mode 100644 index 0000000..c829531 Binary files /dev/null and b/example/src/main/assets/pic/62/000006.png differ diff --git a/example/src/main/assets/pic/62/000007.png b/example/src/main/assets/pic/62/000007.png new file mode 100644 index 0000000..4f6b741 Binary files /dev/null and b/example/src/main/assets/pic/62/000007.png differ diff --git a/example/src/main/assets/pic/62/000008.png b/example/src/main/assets/pic/62/000008.png new file mode 100644 index 0000000..e3fcb86 Binary files /dev/null and b/example/src/main/assets/pic/62/000008.png differ diff --git a/example/src/main/assets/pic/62/000009.png b/example/src/main/assets/pic/62/000009.png new file mode 100644 index 0000000..53dcaaa Binary files /dev/null and b/example/src/main/assets/pic/62/000009.png differ diff --git a/example/src/main/assets/pic/62/000010.png b/example/src/main/assets/pic/62/000010.png new file mode 100644 index 0000000..2e66948 Binary files /dev/null and b/example/src/main/assets/pic/62/000010.png differ diff --git a/example/src/main/assets/pic/62/000011.png b/example/src/main/assets/pic/62/000011.png new file mode 100644 index 0000000..3bc4e9c Binary files /dev/null and b/example/src/main/assets/pic/62/000011.png differ diff --git a/example/src/main/assets/pic/62/000012.png b/example/src/main/assets/pic/62/000012.png new file mode 100644 index 0000000..fedda1a Binary files /dev/null and b/example/src/main/assets/pic/62/000012.png differ diff --git a/example/src/main/assets/pic/62/000013.png b/example/src/main/assets/pic/62/000013.png new file mode 100644 index 0000000..13c1352 Binary files /dev/null and b/example/src/main/assets/pic/62/000013.png differ diff --git a/example/src/main/assets/pic/62/000014.png b/example/src/main/assets/pic/62/000014.png new file mode 100644 index 0000000..e8ad088 Binary files /dev/null and b/example/src/main/assets/pic/62/000014.png differ diff --git a/example/src/main/assets/pic/62/000015.png b/example/src/main/assets/pic/62/000015.png new file mode 100644 index 0000000..b7f0b44 Binary files /dev/null and b/example/src/main/assets/pic/62/000015.png differ diff --git a/example/src/main/assets/pic/62/000016.png b/example/src/main/assets/pic/62/000016.png new file mode 100644 index 0000000..d51c050 Binary files /dev/null and b/example/src/main/assets/pic/62/000016.png differ diff --git a/example/src/main/assets/pic/62/000017.png b/example/src/main/assets/pic/62/000017.png new file mode 100644 index 0000000..7a5544b Binary files /dev/null and b/example/src/main/assets/pic/62/000017.png differ diff --git a/example/src/main/assets/pic/62/000018.png b/example/src/main/assets/pic/62/000018.png new file mode 100644 index 0000000..9488b20 Binary files /dev/null and b/example/src/main/assets/pic/62/000018.png differ diff --git a/example/src/main/assets/pic/62/000019.png b/example/src/main/assets/pic/62/000019.png new file mode 100644 index 0000000..3a120c9 Binary files /dev/null and b/example/src/main/assets/pic/62/000019.png differ diff --git a/example/src/main/assets/pic/62/000020.png b/example/src/main/assets/pic/62/000020.png new file mode 100644 index 0000000..3e6f06d Binary files /dev/null and b/example/src/main/assets/pic/62/000020.png differ diff --git a/example/src/main/assets/pic/62/000021.png b/example/src/main/assets/pic/62/000021.png new file mode 100644 index 0000000..08a7937 Binary files /dev/null and b/example/src/main/assets/pic/62/000021.png differ diff --git a/example/src/main/assets/pic/62/000022.png b/example/src/main/assets/pic/62/000022.png new file mode 100644 index 0000000..f82d13c Binary files /dev/null and b/example/src/main/assets/pic/62/000022.png differ diff --git a/example/src/main/assets/pic/62/000023.png b/example/src/main/assets/pic/62/000023.png new file mode 100644 index 0000000..087981b Binary files /dev/null and b/example/src/main/assets/pic/62/000023.png differ diff --git a/example/src/main/assets/pic/62/000024.png b/example/src/main/assets/pic/62/000024.png new file mode 100644 index 0000000..1e437fb Binary files /dev/null and b/example/src/main/assets/pic/62/000024.png differ diff --git a/example/src/main/assets/pic/62/000025.png b/example/src/main/assets/pic/62/000025.png new file mode 100644 index 0000000..de955fc Binary files /dev/null and b/example/src/main/assets/pic/62/000025.png differ diff --git a/example/src/main/assets/pic/62/000026.png b/example/src/main/assets/pic/62/000026.png new file mode 100644 index 0000000..6034b87 Binary files /dev/null and b/example/src/main/assets/pic/62/000026.png differ diff --git a/example/src/main/assets/pic/62/000027.png b/example/src/main/assets/pic/62/000027.png new file mode 100644 index 0000000..a8c8608 Binary files /dev/null and b/example/src/main/assets/pic/62/000027.png differ diff --git a/example/src/main/assets/pic/62/000028.png b/example/src/main/assets/pic/62/000028.png new file mode 100644 index 0000000..a22411a Binary files /dev/null and b/example/src/main/assets/pic/62/000028.png differ diff --git a/example/src/main/assets/pic/62/000029.png b/example/src/main/assets/pic/62/000029.png new file mode 100644 index 0000000..54847fa Binary files /dev/null and b/example/src/main/assets/pic/62/000029.png differ diff --git a/example/src/main/assets/pic/62/000030.png b/example/src/main/assets/pic/62/000030.png new file mode 100644 index 0000000..cc3da8f Binary files /dev/null and b/example/src/main/assets/pic/62/000030.png differ diff --git a/example/src/main/assets/pic/62/000031.png b/example/src/main/assets/pic/62/000031.png new file mode 100644 index 0000000..6697b3e Binary files /dev/null and b/example/src/main/assets/pic/62/000031.png differ diff --git a/example/src/main/assets/pic/62/62.png b/example/src/main/assets/pic/62/62.png deleted file mode 100644 index ad3fce6..0000000 Binary files a/example/src/main/assets/pic/62/62.png and /dev/null differ diff --git a/example/src/main/assets/pic/62/62ex.png b/example/src/main/assets/pic/62/62ex.png deleted file mode 100644 index f44d7ed..0000000 Binary files a/example/src/main/assets/pic/62/62ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/62ex.png b/example/src/main/assets/pic/62ex.png new file mode 100644 index 0000000..58547ca Binary files /dev/null and b/example/src/main/assets/pic/62ex.png differ diff --git a/example/src/main/assets/pic/65.png b/example/src/main/assets/pic/65.png deleted file mode 100644 index 9b6e37d..0000000 Binary files a/example/src/main/assets/pic/65.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/000000.png b/example/src/main/assets/pic/65/000000.png new file mode 100644 index 0000000..88f2d75 Binary files /dev/null and b/example/src/main/assets/pic/65/000000.png differ diff --git a/example/src/main/assets/pic/65/000001.png b/example/src/main/assets/pic/65/000001.png new file mode 100644 index 0000000..9374b02 Binary files /dev/null and b/example/src/main/assets/pic/65/000001.png differ diff --git a/example/src/main/assets/pic/65/000002.png b/example/src/main/assets/pic/65/000002.png new file mode 100644 index 0000000..dd5b7a9 Binary files /dev/null and b/example/src/main/assets/pic/65/000002.png differ diff --git a/example/src/main/assets/pic/65/000003.png b/example/src/main/assets/pic/65/000003.png new file mode 100644 index 0000000..e64a19c Binary files /dev/null and b/example/src/main/assets/pic/65/000003.png differ diff --git a/example/src/main/assets/pic/65/000004.png b/example/src/main/assets/pic/65/000004.png new file mode 100644 index 0000000..6f22ffd Binary files /dev/null and b/example/src/main/assets/pic/65/000004.png differ diff --git a/example/src/main/assets/pic/65/000005.png b/example/src/main/assets/pic/65/000005.png new file mode 100644 index 0000000..2216fe1 Binary files /dev/null and b/example/src/main/assets/pic/65/000005.png differ diff --git a/example/src/main/assets/pic/65/000006.png b/example/src/main/assets/pic/65/000006.png new file mode 100644 index 0000000..4383f38 Binary files /dev/null and b/example/src/main/assets/pic/65/000006.png differ diff --git a/example/src/main/assets/pic/65/000007.png b/example/src/main/assets/pic/65/000007.png new file mode 100644 index 0000000..85c3aa0 Binary files /dev/null and b/example/src/main/assets/pic/65/000007.png differ diff --git a/example/src/main/assets/pic/65/000008.png b/example/src/main/assets/pic/65/000008.png new file mode 100644 index 0000000..e292b9e Binary files /dev/null and b/example/src/main/assets/pic/65/000008.png differ diff --git a/example/src/main/assets/pic/65/000009.png b/example/src/main/assets/pic/65/000009.png new file mode 100644 index 0000000..ca0f9f5 Binary files /dev/null and b/example/src/main/assets/pic/65/000009.png differ diff --git a/example/src/main/assets/pic/65/000010.png b/example/src/main/assets/pic/65/000010.png new file mode 100644 index 0000000..86c7676 Binary files /dev/null and b/example/src/main/assets/pic/65/000010.png differ diff --git a/example/src/main/assets/pic/65/000011.png b/example/src/main/assets/pic/65/000011.png new file mode 100644 index 0000000..5c1ccf4 Binary files /dev/null and b/example/src/main/assets/pic/65/000011.png differ diff --git a/example/src/main/assets/pic/65/000012.png b/example/src/main/assets/pic/65/000012.png new file mode 100644 index 0000000..14121be Binary files /dev/null and b/example/src/main/assets/pic/65/000012.png differ diff --git a/example/src/main/assets/pic/65/000013.png b/example/src/main/assets/pic/65/000013.png new file mode 100644 index 0000000..2c25e6a Binary files /dev/null and b/example/src/main/assets/pic/65/000013.png differ diff --git a/example/src/main/assets/pic/65/000014.png b/example/src/main/assets/pic/65/000014.png new file mode 100644 index 0000000..8b99ee0 Binary files /dev/null and b/example/src/main/assets/pic/65/000014.png differ diff --git a/example/src/main/assets/pic/65/000015.png b/example/src/main/assets/pic/65/000015.png new file mode 100644 index 0000000..0a0aab6 Binary files /dev/null and b/example/src/main/assets/pic/65/000015.png differ diff --git a/example/src/main/assets/pic/65/000016.png b/example/src/main/assets/pic/65/000016.png new file mode 100644 index 0000000..d53c246 Binary files /dev/null and b/example/src/main/assets/pic/65/000016.png differ diff --git a/example/src/main/assets/pic/65/000017.png b/example/src/main/assets/pic/65/000017.png new file mode 100644 index 0000000..5db2bb8 Binary files /dev/null and b/example/src/main/assets/pic/65/000017.png differ diff --git a/example/src/main/assets/pic/65/000018.png b/example/src/main/assets/pic/65/000018.png new file mode 100644 index 0000000..48f1d86 Binary files /dev/null and b/example/src/main/assets/pic/65/000018.png differ diff --git a/example/src/main/assets/pic/65/000019.png b/example/src/main/assets/pic/65/000019.png new file mode 100644 index 0000000..6ae411a Binary files /dev/null and b/example/src/main/assets/pic/65/000019.png differ diff --git a/example/src/main/assets/pic/65/000020.png b/example/src/main/assets/pic/65/000020.png new file mode 100644 index 0000000..8226bd3 Binary files /dev/null and b/example/src/main/assets/pic/65/000020.png differ diff --git a/example/src/main/assets/pic/65/000021.png b/example/src/main/assets/pic/65/000021.png new file mode 100644 index 0000000..605d075 Binary files /dev/null and b/example/src/main/assets/pic/65/000021.png differ diff --git a/example/src/main/assets/pic/65/000022.png b/example/src/main/assets/pic/65/000022.png new file mode 100644 index 0000000..44c92ac Binary files /dev/null and b/example/src/main/assets/pic/65/000022.png differ diff --git a/example/src/main/assets/pic/65/000023.png b/example/src/main/assets/pic/65/000023.png new file mode 100644 index 0000000..fdccfba Binary files /dev/null and b/example/src/main/assets/pic/65/000023.png differ diff --git a/example/src/main/assets/pic/65/000024.png b/example/src/main/assets/pic/65/000024.png new file mode 100644 index 0000000..13d52a5 Binary files /dev/null and b/example/src/main/assets/pic/65/000024.png differ diff --git a/example/src/main/assets/pic/65/000025.png b/example/src/main/assets/pic/65/000025.png new file mode 100644 index 0000000..c310eea Binary files /dev/null and b/example/src/main/assets/pic/65/000025.png differ diff --git a/example/src/main/assets/pic/65/000026.png b/example/src/main/assets/pic/65/000026.png new file mode 100644 index 0000000..d0dff1b Binary files /dev/null and b/example/src/main/assets/pic/65/000026.png differ diff --git a/example/src/main/assets/pic/65/000027.png b/example/src/main/assets/pic/65/000027.png new file mode 100644 index 0000000..cb1687b Binary files /dev/null and b/example/src/main/assets/pic/65/000027.png differ diff --git a/example/src/main/assets/pic/65/000028.png b/example/src/main/assets/pic/65/000028.png new file mode 100644 index 0000000..84da3a6 Binary files /dev/null and b/example/src/main/assets/pic/65/000028.png differ diff --git a/example/src/main/assets/pic/65/000029.png b/example/src/main/assets/pic/65/000029.png new file mode 100644 index 0000000..b2121f9 Binary files /dev/null and b/example/src/main/assets/pic/65/000029.png differ diff --git a/example/src/main/assets/pic/65/000030.png b/example/src/main/assets/pic/65/000030.png new file mode 100644 index 0000000..80d8060 Binary files /dev/null and b/example/src/main/assets/pic/65/000030.png differ diff --git a/example/src/main/assets/pic/65/000031.png b/example/src/main/assets/pic/65/000031.png new file mode 100644 index 0000000..381fe82 Binary files /dev/null and b/example/src/main/assets/pic/65/000031.png differ diff --git a/example/src/main/assets/pic/65/000032.png b/example/src/main/assets/pic/65/000032.png new file mode 100644 index 0000000..cd20770 Binary files /dev/null and b/example/src/main/assets/pic/65/000032.png differ diff --git a/example/src/main/assets/pic/65/000033.png b/example/src/main/assets/pic/65/000033.png new file mode 100644 index 0000000..bd9116b Binary files /dev/null and b/example/src/main/assets/pic/65/000033.png differ diff --git a/example/src/main/assets/pic/65/000034.png b/example/src/main/assets/pic/65/000034.png new file mode 100644 index 0000000..c454172 Binary files /dev/null and b/example/src/main/assets/pic/65/000034.png differ diff --git a/example/src/main/assets/pic/65/000035.png b/example/src/main/assets/pic/65/000035.png new file mode 100644 index 0000000..5db2bb8 Binary files /dev/null and b/example/src/main/assets/pic/65/000035.png differ diff --git a/example/src/main/assets/pic/65/65.png b/example/src/main/assets/pic/65/65.png deleted file mode 100644 index 9b6e37d..0000000 Binary files a/example/src/main/assets/pic/65/65.png and /dev/null differ diff --git a/example/src/main/assets/pic/65/65ex.png b/example/src/main/assets/pic/65/65ex.png deleted file mode 100644 index 03e0f58..0000000 Binary files a/example/src/main/assets/pic/65/65ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/65ex.png b/example/src/main/assets/pic/65ex.png new file mode 100644 index 0000000..c053200 Binary files /dev/null and b/example/src/main/assets/pic/65ex.png differ diff --git a/example/src/main/assets/pic/68.png b/example/src/main/assets/pic/68.png deleted file mode 100644 index ba6f1fa..0000000 Binary files a/example/src/main/assets/pic/68.png and /dev/null differ diff --git a/example/src/main/assets/pic/68/000000.png b/example/src/main/assets/pic/68/000000.png new file mode 100644 index 0000000..34c7fc4 Binary files /dev/null and b/example/src/main/assets/pic/68/000000.png differ diff --git a/example/src/main/assets/pic/68/000001.png b/example/src/main/assets/pic/68/000001.png new file mode 100644 index 0000000..8355dff Binary files /dev/null and b/example/src/main/assets/pic/68/000001.png differ diff --git a/example/src/main/assets/pic/68/000002.png b/example/src/main/assets/pic/68/000002.png new file mode 100644 index 0000000..7c217e3 Binary files /dev/null and b/example/src/main/assets/pic/68/000002.png differ diff --git a/example/src/main/assets/pic/68/000003.png b/example/src/main/assets/pic/68/000003.png new file mode 100644 index 0000000..80616ab Binary files /dev/null and b/example/src/main/assets/pic/68/000003.png differ diff --git a/example/src/main/assets/pic/68/000004.png b/example/src/main/assets/pic/68/000004.png new file mode 100644 index 0000000..a76e15e Binary files /dev/null and b/example/src/main/assets/pic/68/000004.png differ diff --git a/example/src/main/assets/pic/68/000005.png b/example/src/main/assets/pic/68/000005.png new file mode 100644 index 0000000..fe3ebe4 Binary files /dev/null and b/example/src/main/assets/pic/68/000005.png differ diff --git a/example/src/main/assets/pic/68/000006.png b/example/src/main/assets/pic/68/000006.png new file mode 100644 index 0000000..e65438d Binary files /dev/null and b/example/src/main/assets/pic/68/000006.png differ diff --git a/example/src/main/assets/pic/68/000007.png b/example/src/main/assets/pic/68/000007.png new file mode 100644 index 0000000..97a356a Binary files /dev/null and b/example/src/main/assets/pic/68/000007.png differ diff --git a/example/src/main/assets/pic/68/000008.png b/example/src/main/assets/pic/68/000008.png new file mode 100644 index 0000000..117b3ad Binary files /dev/null and b/example/src/main/assets/pic/68/000008.png differ diff --git a/example/src/main/assets/pic/68/000009.png b/example/src/main/assets/pic/68/000009.png new file mode 100644 index 0000000..72a033d Binary files /dev/null and b/example/src/main/assets/pic/68/000009.png differ diff --git a/example/src/main/assets/pic/68/000010.png b/example/src/main/assets/pic/68/000010.png new file mode 100644 index 0000000..72805f9 Binary files /dev/null and b/example/src/main/assets/pic/68/000010.png differ diff --git a/example/src/main/assets/pic/68/000011.png b/example/src/main/assets/pic/68/000011.png new file mode 100644 index 0000000..ed4c8d8 Binary files /dev/null and b/example/src/main/assets/pic/68/000011.png differ diff --git a/example/src/main/assets/pic/68/000012.png b/example/src/main/assets/pic/68/000012.png new file mode 100644 index 0000000..e969a7c Binary files /dev/null and b/example/src/main/assets/pic/68/000012.png differ diff --git a/example/src/main/assets/pic/68/000013.png b/example/src/main/assets/pic/68/000013.png new file mode 100644 index 0000000..815d819 Binary files /dev/null and b/example/src/main/assets/pic/68/000013.png differ diff --git a/example/src/main/assets/pic/68/000014.png b/example/src/main/assets/pic/68/000014.png new file mode 100644 index 0000000..1e38b5f Binary files /dev/null and b/example/src/main/assets/pic/68/000014.png differ diff --git a/example/src/main/assets/pic/68/000015.png b/example/src/main/assets/pic/68/000015.png new file mode 100644 index 0000000..c69140f Binary files /dev/null and b/example/src/main/assets/pic/68/000015.png differ diff --git a/example/src/main/assets/pic/68/000016.png b/example/src/main/assets/pic/68/000016.png new file mode 100644 index 0000000..f3ecdee Binary files /dev/null and b/example/src/main/assets/pic/68/000016.png differ diff --git a/example/src/main/assets/pic/68/000017.png b/example/src/main/assets/pic/68/000017.png new file mode 100644 index 0000000..96f6a8f Binary files /dev/null and b/example/src/main/assets/pic/68/000017.png differ diff --git a/example/src/main/assets/pic/68/000018.png b/example/src/main/assets/pic/68/000018.png new file mode 100644 index 0000000..dc654d3 Binary files /dev/null and b/example/src/main/assets/pic/68/000018.png differ diff --git a/example/src/main/assets/pic/68/000019.png b/example/src/main/assets/pic/68/000019.png new file mode 100644 index 0000000..5f22d27 Binary files /dev/null and b/example/src/main/assets/pic/68/000019.png differ diff --git a/example/src/main/assets/pic/68/000020.png b/example/src/main/assets/pic/68/000020.png new file mode 100644 index 0000000..8e521b5 Binary files /dev/null and b/example/src/main/assets/pic/68/000020.png differ diff --git a/example/src/main/assets/pic/68/000021.png b/example/src/main/assets/pic/68/000021.png new file mode 100644 index 0000000..db5fe0c Binary files /dev/null and b/example/src/main/assets/pic/68/000021.png differ diff --git a/example/src/main/assets/pic/68/000022.png b/example/src/main/assets/pic/68/000022.png new file mode 100644 index 0000000..2bd037e Binary files /dev/null and b/example/src/main/assets/pic/68/000022.png differ diff --git a/example/src/main/assets/pic/68/000023.png b/example/src/main/assets/pic/68/000023.png new file mode 100644 index 0000000..9aa6472 Binary files /dev/null and b/example/src/main/assets/pic/68/000023.png differ diff --git a/example/src/main/assets/pic/68/000024.png b/example/src/main/assets/pic/68/000024.png new file mode 100644 index 0000000..5dc4990 Binary files /dev/null and b/example/src/main/assets/pic/68/000024.png differ diff --git a/example/src/main/assets/pic/68/000025.png b/example/src/main/assets/pic/68/000025.png new file mode 100644 index 0000000..eae7431 Binary files /dev/null and b/example/src/main/assets/pic/68/000025.png differ diff --git a/example/src/main/assets/pic/68/000026.png b/example/src/main/assets/pic/68/000026.png new file mode 100644 index 0000000..4df5484 Binary files /dev/null and b/example/src/main/assets/pic/68/000026.png differ diff --git a/example/src/main/assets/pic/68/000027.png b/example/src/main/assets/pic/68/000027.png new file mode 100644 index 0000000..6c79e97 Binary files /dev/null and b/example/src/main/assets/pic/68/000027.png differ diff --git a/example/src/main/assets/pic/68/000028.png b/example/src/main/assets/pic/68/000028.png new file mode 100644 index 0000000..f9939fa Binary files /dev/null and b/example/src/main/assets/pic/68/000028.png differ diff --git a/example/src/main/assets/pic/68/000029.png b/example/src/main/assets/pic/68/000029.png new file mode 100644 index 0000000..e72ebb8 Binary files /dev/null and b/example/src/main/assets/pic/68/000029.png differ diff --git a/example/src/main/assets/pic/68/000030.png b/example/src/main/assets/pic/68/000030.png new file mode 100644 index 0000000..67c0dda Binary files /dev/null and b/example/src/main/assets/pic/68/000030.png differ diff --git a/example/src/main/assets/pic/68/000031.png b/example/src/main/assets/pic/68/000031.png new file mode 100644 index 0000000..dfe23b5 Binary files /dev/null and b/example/src/main/assets/pic/68/000031.png differ diff --git a/example/src/main/assets/pic/68/68.png b/example/src/main/assets/pic/68/68.png deleted file mode 100644 index ba6f1fa..0000000 Binary files a/example/src/main/assets/pic/68/68.png and /dev/null differ diff --git a/example/src/main/assets/pic/68/68ex.png b/example/src/main/assets/pic/68/68ex.png deleted file mode 100644 index 7c90cd1..0000000 Binary files a/example/src/main/assets/pic/68/68ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/68ex.png b/example/src/main/assets/pic/68ex.png new file mode 100644 index 0000000..6951ff2 Binary files /dev/null and b/example/src/main/assets/pic/68ex.png differ diff --git a/example/src/main/assets/pic/69/000000.png b/example/src/main/assets/pic/69/000000.png new file mode 100644 index 0000000..928a9ba Binary files /dev/null and b/example/src/main/assets/pic/69/000000.png differ diff --git a/example/src/main/assets/pic/69ex.png b/example/src/main/assets/pic/69ex.png new file mode 100644 index 0000000..5e37243 Binary files /dev/null and b/example/src/main/assets/pic/69ex.png differ diff --git a/example/src/main/assets/pic/6ex.png b/example/src/main/assets/pic/6ex.png new file mode 100644 index 0000000..ce0bdd2 Binary files /dev/null and b/example/src/main/assets/pic/6ex.png differ diff --git a/example/src/main/assets/pic/7.png b/example/src/main/assets/pic/7.png deleted file mode 100644 index 80ab6d9..0000000 Binary files a/example/src/main/assets/pic/7.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/000000.png b/example/src/main/assets/pic/7/000000.png new file mode 100644 index 0000000..365fd6f Binary files /dev/null and b/example/src/main/assets/pic/7/000000.png differ diff --git a/example/src/main/assets/pic/7/000001.png b/example/src/main/assets/pic/7/000001.png new file mode 100644 index 0000000..3f5f4f9 Binary files /dev/null and b/example/src/main/assets/pic/7/000001.png differ diff --git a/example/src/main/assets/pic/7/000002.png b/example/src/main/assets/pic/7/000002.png new file mode 100644 index 0000000..cdbdf8d Binary files /dev/null and b/example/src/main/assets/pic/7/000002.png differ diff --git a/example/src/main/assets/pic/7/000003.png b/example/src/main/assets/pic/7/000003.png new file mode 100644 index 0000000..e32cea1 Binary files /dev/null and b/example/src/main/assets/pic/7/000003.png differ diff --git a/example/src/main/assets/pic/7/000004.png b/example/src/main/assets/pic/7/000004.png new file mode 100644 index 0000000..44bdc5a Binary files /dev/null and b/example/src/main/assets/pic/7/000004.png differ diff --git a/example/src/main/assets/pic/7/000005.png b/example/src/main/assets/pic/7/000005.png new file mode 100644 index 0000000..299144d Binary files /dev/null and b/example/src/main/assets/pic/7/000005.png differ diff --git a/example/src/main/assets/pic/7/000006.png b/example/src/main/assets/pic/7/000006.png new file mode 100644 index 0000000..925947d Binary files /dev/null and b/example/src/main/assets/pic/7/000006.png differ diff --git a/example/src/main/assets/pic/7/000007.png b/example/src/main/assets/pic/7/000007.png new file mode 100644 index 0000000..0206539 Binary files /dev/null and b/example/src/main/assets/pic/7/000007.png differ diff --git a/example/src/main/assets/pic/7/000008.png b/example/src/main/assets/pic/7/000008.png new file mode 100644 index 0000000..5ff29b9 Binary files /dev/null and b/example/src/main/assets/pic/7/000008.png differ diff --git a/example/src/main/assets/pic/7/000009.png b/example/src/main/assets/pic/7/000009.png new file mode 100644 index 0000000..9de5f00 Binary files /dev/null and b/example/src/main/assets/pic/7/000009.png differ diff --git a/example/src/main/assets/pic/7/000010.png b/example/src/main/assets/pic/7/000010.png new file mode 100644 index 0000000..616e1a9 Binary files /dev/null and b/example/src/main/assets/pic/7/000010.png differ diff --git a/example/src/main/assets/pic/7/000011.png b/example/src/main/assets/pic/7/000011.png new file mode 100644 index 0000000..838c033 Binary files /dev/null and b/example/src/main/assets/pic/7/000011.png differ diff --git a/example/src/main/assets/pic/7/000012.png b/example/src/main/assets/pic/7/000012.png new file mode 100644 index 0000000..d5e4a35 Binary files /dev/null and b/example/src/main/assets/pic/7/000012.png differ diff --git a/example/src/main/assets/pic/7/000013.png b/example/src/main/assets/pic/7/000013.png new file mode 100644 index 0000000..5960d85 Binary files /dev/null and b/example/src/main/assets/pic/7/000013.png differ diff --git a/example/src/main/assets/pic/7/000014.png b/example/src/main/assets/pic/7/000014.png new file mode 100644 index 0000000..05f7f27 Binary files /dev/null and b/example/src/main/assets/pic/7/000014.png differ diff --git a/example/src/main/assets/pic/7/000015.png b/example/src/main/assets/pic/7/000015.png new file mode 100644 index 0000000..4d73872 Binary files /dev/null and b/example/src/main/assets/pic/7/000015.png differ diff --git a/example/src/main/assets/pic/7/000016.png b/example/src/main/assets/pic/7/000016.png new file mode 100644 index 0000000..b31b2bd Binary files /dev/null and b/example/src/main/assets/pic/7/000016.png differ diff --git a/example/src/main/assets/pic/7/000017.png b/example/src/main/assets/pic/7/000017.png new file mode 100644 index 0000000..980d610 Binary files /dev/null and b/example/src/main/assets/pic/7/000017.png differ diff --git a/example/src/main/assets/pic/7/000018.png b/example/src/main/assets/pic/7/000018.png new file mode 100644 index 0000000..d543351 Binary files /dev/null and b/example/src/main/assets/pic/7/000018.png differ diff --git a/example/src/main/assets/pic/7/000019.png b/example/src/main/assets/pic/7/000019.png new file mode 100644 index 0000000..5ee30cf Binary files /dev/null and b/example/src/main/assets/pic/7/000019.png differ diff --git a/example/src/main/assets/pic/7/000020.png b/example/src/main/assets/pic/7/000020.png new file mode 100644 index 0000000..505179f Binary files /dev/null and b/example/src/main/assets/pic/7/000020.png differ diff --git a/example/src/main/assets/pic/7/000021.png b/example/src/main/assets/pic/7/000021.png new file mode 100644 index 0000000..f8915bd Binary files /dev/null and b/example/src/main/assets/pic/7/000021.png differ diff --git a/example/src/main/assets/pic/7/000022.png b/example/src/main/assets/pic/7/000022.png new file mode 100644 index 0000000..51d88c6 Binary files /dev/null and b/example/src/main/assets/pic/7/000022.png differ diff --git a/example/src/main/assets/pic/7/000023.png b/example/src/main/assets/pic/7/000023.png new file mode 100644 index 0000000..eebbc71 Binary files /dev/null and b/example/src/main/assets/pic/7/000023.png differ diff --git a/example/src/main/assets/pic/7/000024.png b/example/src/main/assets/pic/7/000024.png new file mode 100644 index 0000000..f5fb813 Binary files /dev/null and b/example/src/main/assets/pic/7/000024.png differ diff --git a/example/src/main/assets/pic/7/000025.png b/example/src/main/assets/pic/7/000025.png new file mode 100644 index 0000000..ed435cb Binary files /dev/null and b/example/src/main/assets/pic/7/000025.png differ diff --git a/example/src/main/assets/pic/7/000026.png b/example/src/main/assets/pic/7/000026.png new file mode 100644 index 0000000..d1aec8d Binary files /dev/null and b/example/src/main/assets/pic/7/000026.png differ diff --git a/example/src/main/assets/pic/7/000027.png b/example/src/main/assets/pic/7/000027.png new file mode 100644 index 0000000..06d8b99 Binary files /dev/null and b/example/src/main/assets/pic/7/000027.png differ diff --git a/example/src/main/assets/pic/7/000028.png b/example/src/main/assets/pic/7/000028.png new file mode 100644 index 0000000..286e969 Binary files /dev/null and b/example/src/main/assets/pic/7/000028.png differ diff --git a/example/src/main/assets/pic/7/000029.png b/example/src/main/assets/pic/7/000029.png new file mode 100644 index 0000000..3367939 Binary files /dev/null and b/example/src/main/assets/pic/7/000029.png differ diff --git a/example/src/main/assets/pic/7/000030.png b/example/src/main/assets/pic/7/000030.png new file mode 100644 index 0000000..ead3d79 Binary files /dev/null and b/example/src/main/assets/pic/7/000030.png differ diff --git a/example/src/main/assets/pic/7/000031.png b/example/src/main/assets/pic/7/000031.png new file mode 100644 index 0000000..f42c808 Binary files /dev/null and b/example/src/main/assets/pic/7/000031.png differ diff --git a/example/src/main/assets/pic/7/000032.png b/example/src/main/assets/pic/7/000032.png new file mode 100644 index 0000000..ddbb5ad Binary files /dev/null and b/example/src/main/assets/pic/7/000032.png differ diff --git a/example/src/main/assets/pic/7/000033.png b/example/src/main/assets/pic/7/000033.png new file mode 100644 index 0000000..4489b61 Binary files /dev/null and b/example/src/main/assets/pic/7/000033.png differ diff --git a/example/src/main/assets/pic/7/000034.png b/example/src/main/assets/pic/7/000034.png new file mode 100644 index 0000000..06d6f07 Binary files /dev/null and b/example/src/main/assets/pic/7/000034.png differ diff --git a/example/src/main/assets/pic/7/000035.png b/example/src/main/assets/pic/7/000035.png new file mode 100644 index 0000000..980d610 Binary files /dev/null and b/example/src/main/assets/pic/7/000035.png differ diff --git a/example/src/main/assets/pic/7/7.png b/example/src/main/assets/pic/7/7.png deleted file mode 100644 index 80ab6d9..0000000 Binary files a/example/src/main/assets/pic/7/7.png and /dev/null differ diff --git a/example/src/main/assets/pic/7/7ex.png b/example/src/main/assets/pic/7/7ex.png deleted file mode 100644 index 0d4bd28..0000000 Binary files a/example/src/main/assets/pic/7/7ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/70/000000.png b/example/src/main/assets/pic/70/000000.png new file mode 100644 index 0000000..928a9ba Binary files /dev/null and b/example/src/main/assets/pic/70/000000.png differ diff --git a/example/src/main/assets/pic/70ex.png b/example/src/main/assets/pic/70ex.png new file mode 100644 index 0000000..5e37243 Binary files /dev/null and b/example/src/main/assets/pic/70ex.png differ diff --git a/example/src/main/assets/pic/71.png b/example/src/main/assets/pic/71.png deleted file mode 100644 index 93e3156..0000000 Binary files a/example/src/main/assets/pic/71.png and /dev/null differ diff --git a/example/src/main/assets/pic/71/000000.png b/example/src/main/assets/pic/71/000000.png new file mode 100644 index 0000000..18c1a4b Binary files /dev/null and b/example/src/main/assets/pic/71/000000.png differ diff --git a/example/src/main/assets/pic/71/000001.png b/example/src/main/assets/pic/71/000001.png new file mode 100644 index 0000000..a35f836 Binary files /dev/null and b/example/src/main/assets/pic/71/000001.png differ diff --git a/example/src/main/assets/pic/71/000002.png b/example/src/main/assets/pic/71/000002.png new file mode 100644 index 0000000..655853b Binary files /dev/null and b/example/src/main/assets/pic/71/000002.png differ diff --git a/example/src/main/assets/pic/71/000003.png b/example/src/main/assets/pic/71/000003.png new file mode 100644 index 0000000..a295399 Binary files /dev/null and b/example/src/main/assets/pic/71/000003.png differ diff --git a/example/src/main/assets/pic/71/000004.png b/example/src/main/assets/pic/71/000004.png new file mode 100644 index 0000000..0ff8294 Binary files /dev/null and b/example/src/main/assets/pic/71/000004.png differ diff --git a/example/src/main/assets/pic/71/000005.png b/example/src/main/assets/pic/71/000005.png new file mode 100644 index 0000000..e36a3fa Binary files /dev/null and b/example/src/main/assets/pic/71/000005.png differ diff --git a/example/src/main/assets/pic/71/000006.png b/example/src/main/assets/pic/71/000006.png new file mode 100644 index 0000000..8f7f43a Binary files /dev/null and b/example/src/main/assets/pic/71/000006.png differ diff --git a/example/src/main/assets/pic/71/000007.png b/example/src/main/assets/pic/71/000007.png new file mode 100644 index 0000000..21ac857 Binary files /dev/null and b/example/src/main/assets/pic/71/000007.png differ diff --git a/example/src/main/assets/pic/71/000008.png b/example/src/main/assets/pic/71/000008.png new file mode 100644 index 0000000..834881b Binary files /dev/null and b/example/src/main/assets/pic/71/000008.png differ diff --git a/example/src/main/assets/pic/71/000009.png b/example/src/main/assets/pic/71/000009.png new file mode 100644 index 0000000..b99ed96 Binary files /dev/null and b/example/src/main/assets/pic/71/000009.png differ diff --git a/example/src/main/assets/pic/71/000010.png b/example/src/main/assets/pic/71/000010.png new file mode 100644 index 0000000..e49b616 Binary files /dev/null and b/example/src/main/assets/pic/71/000010.png differ diff --git a/example/src/main/assets/pic/71/000011.png b/example/src/main/assets/pic/71/000011.png new file mode 100644 index 0000000..3adf46d Binary files /dev/null and b/example/src/main/assets/pic/71/000011.png differ diff --git a/example/src/main/assets/pic/71/000012.png b/example/src/main/assets/pic/71/000012.png new file mode 100644 index 0000000..cf4a1c6 Binary files /dev/null and b/example/src/main/assets/pic/71/000012.png differ diff --git a/example/src/main/assets/pic/71/000013.png b/example/src/main/assets/pic/71/000013.png new file mode 100644 index 0000000..0308ab1 Binary files /dev/null and b/example/src/main/assets/pic/71/000013.png differ diff --git a/example/src/main/assets/pic/71/000014.png b/example/src/main/assets/pic/71/000014.png new file mode 100644 index 0000000..30ea79d Binary files /dev/null and b/example/src/main/assets/pic/71/000014.png differ diff --git a/example/src/main/assets/pic/71/000015.png b/example/src/main/assets/pic/71/000015.png new file mode 100644 index 0000000..f4849a1 Binary files /dev/null and b/example/src/main/assets/pic/71/000015.png differ diff --git a/example/src/main/assets/pic/71/000016.png b/example/src/main/assets/pic/71/000016.png new file mode 100644 index 0000000..6429aa6 Binary files /dev/null and b/example/src/main/assets/pic/71/000016.png differ diff --git a/example/src/main/assets/pic/71/000017.png b/example/src/main/assets/pic/71/000017.png new file mode 100644 index 0000000..c72021f Binary files /dev/null and b/example/src/main/assets/pic/71/000017.png differ diff --git a/example/src/main/assets/pic/71/000018.png b/example/src/main/assets/pic/71/000018.png new file mode 100644 index 0000000..1b9c47d Binary files /dev/null and b/example/src/main/assets/pic/71/000018.png differ diff --git a/example/src/main/assets/pic/71/000019.png b/example/src/main/assets/pic/71/000019.png new file mode 100644 index 0000000..a7c3dcf Binary files /dev/null and b/example/src/main/assets/pic/71/000019.png differ diff --git a/example/src/main/assets/pic/71/000020.png b/example/src/main/assets/pic/71/000020.png new file mode 100644 index 0000000..870aadd Binary files /dev/null and b/example/src/main/assets/pic/71/000020.png differ diff --git a/example/src/main/assets/pic/71/000021.png b/example/src/main/assets/pic/71/000021.png new file mode 100644 index 0000000..95f9039 Binary files /dev/null and b/example/src/main/assets/pic/71/000021.png differ diff --git a/example/src/main/assets/pic/71/000022.png b/example/src/main/assets/pic/71/000022.png new file mode 100644 index 0000000..b57e94d Binary files /dev/null and b/example/src/main/assets/pic/71/000022.png differ diff --git a/example/src/main/assets/pic/71/000023.png b/example/src/main/assets/pic/71/000023.png new file mode 100644 index 0000000..033c8a0 Binary files /dev/null and b/example/src/main/assets/pic/71/000023.png differ diff --git a/example/src/main/assets/pic/71/000024.png b/example/src/main/assets/pic/71/000024.png new file mode 100644 index 0000000..946f790 Binary files /dev/null and b/example/src/main/assets/pic/71/000024.png differ diff --git a/example/src/main/assets/pic/71/000025.png b/example/src/main/assets/pic/71/000025.png new file mode 100644 index 0000000..f4163d0 Binary files /dev/null and b/example/src/main/assets/pic/71/000025.png differ diff --git a/example/src/main/assets/pic/71/000026.png b/example/src/main/assets/pic/71/000026.png new file mode 100644 index 0000000..208f987 Binary files /dev/null and b/example/src/main/assets/pic/71/000026.png differ diff --git a/example/src/main/assets/pic/71/000027.png b/example/src/main/assets/pic/71/000027.png new file mode 100644 index 0000000..212a8d2 Binary files /dev/null and b/example/src/main/assets/pic/71/000027.png differ diff --git a/example/src/main/assets/pic/71/000028.png b/example/src/main/assets/pic/71/000028.png new file mode 100644 index 0000000..8b2e6de Binary files /dev/null and b/example/src/main/assets/pic/71/000028.png differ diff --git a/example/src/main/assets/pic/71/000029.png b/example/src/main/assets/pic/71/000029.png new file mode 100644 index 0000000..75cb971 Binary files /dev/null and b/example/src/main/assets/pic/71/000029.png differ diff --git a/example/src/main/assets/pic/71/000030.png b/example/src/main/assets/pic/71/000030.png new file mode 100644 index 0000000..75f7ef0 Binary files /dev/null and b/example/src/main/assets/pic/71/000030.png differ diff --git a/example/src/main/assets/pic/71/000031.png b/example/src/main/assets/pic/71/000031.png new file mode 100644 index 0000000..40086c3 Binary files /dev/null and b/example/src/main/assets/pic/71/000031.png differ diff --git a/example/src/main/assets/pic/71/71.png b/example/src/main/assets/pic/71/71.png deleted file mode 100644 index 93e3156..0000000 Binary files a/example/src/main/assets/pic/71/71.png and /dev/null differ diff --git a/example/src/main/assets/pic/71/71ex.png b/example/src/main/assets/pic/71/71ex.png deleted file mode 100644 index 6445dc1..0000000 Binary files a/example/src/main/assets/pic/71/71ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/71ex.png b/example/src/main/assets/pic/71ex.png new file mode 100644 index 0000000..738912f Binary files /dev/null and b/example/src/main/assets/pic/71ex.png differ diff --git a/example/src/main/assets/pic/76.png b/example/src/main/assets/pic/76.png deleted file mode 100644 index 18b08b2..0000000 Binary files a/example/src/main/assets/pic/76.png and /dev/null differ diff --git a/example/src/main/assets/pic/76/76.png b/example/src/main/assets/pic/76/76.png index 18b08b2..4bd1506 100644 Binary files a/example/src/main/assets/pic/76/76.png and b/example/src/main/assets/pic/76/76.png differ diff --git a/example/src/main/assets/pic/76/76ex.png b/example/src/main/assets/pic/76/76ex.png deleted file mode 100644 index 152c544..0000000 Binary files a/example/src/main/assets/pic/76/76ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/76ex.png b/example/src/main/assets/pic/76ex.png new file mode 100644 index 0000000..a31d15e Binary files /dev/null and b/example/src/main/assets/pic/76ex.png differ diff --git a/example/src/main/assets/pic/77.png b/example/src/main/assets/pic/77.png deleted file mode 100644 index ba46d98..0000000 Binary files a/example/src/main/assets/pic/77.png and /dev/null differ diff --git a/example/src/main/assets/pic/77/77.png b/example/src/main/assets/pic/77/77.png index ba46d98..d9a2276 100644 Binary files a/example/src/main/assets/pic/77/77.png and b/example/src/main/assets/pic/77/77.png differ diff --git a/example/src/main/assets/pic/77/77ex.png b/example/src/main/assets/pic/77/77ex.png deleted file mode 100644 index 9a9580d..0000000 Binary files a/example/src/main/assets/pic/77/77ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/77ex.png b/example/src/main/assets/pic/77ex.png new file mode 100644 index 0000000..a1e4ada Binary files /dev/null and b/example/src/main/assets/pic/77ex.png differ diff --git a/example/src/main/assets/pic/78.png b/example/src/main/assets/pic/78.png deleted file mode 100644 index cef6e74..0000000 Binary files a/example/src/main/assets/pic/78.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/000000.png b/example/src/main/assets/pic/78/000000.png new file mode 100644 index 0000000..9e551c2 Binary files /dev/null and b/example/src/main/assets/pic/78/000000.png differ diff --git a/example/src/main/assets/pic/78/000001.png b/example/src/main/assets/pic/78/000001.png new file mode 100644 index 0000000..a77e931 Binary files /dev/null and b/example/src/main/assets/pic/78/000001.png differ diff --git a/example/src/main/assets/pic/78/000002.png b/example/src/main/assets/pic/78/000002.png new file mode 100644 index 0000000..4d82a6e Binary files /dev/null and b/example/src/main/assets/pic/78/000002.png differ diff --git a/example/src/main/assets/pic/78/000003.png b/example/src/main/assets/pic/78/000003.png new file mode 100644 index 0000000..01de382 Binary files /dev/null and b/example/src/main/assets/pic/78/000003.png differ diff --git a/example/src/main/assets/pic/78/000004.png b/example/src/main/assets/pic/78/000004.png new file mode 100644 index 0000000..4e3e520 Binary files /dev/null and b/example/src/main/assets/pic/78/000004.png differ diff --git a/example/src/main/assets/pic/78/000005.png b/example/src/main/assets/pic/78/000005.png new file mode 100644 index 0000000..b5587e8 Binary files /dev/null and b/example/src/main/assets/pic/78/000005.png differ diff --git a/example/src/main/assets/pic/78/000006.png b/example/src/main/assets/pic/78/000006.png new file mode 100644 index 0000000..5478267 Binary files /dev/null and b/example/src/main/assets/pic/78/000006.png differ diff --git a/example/src/main/assets/pic/78/000007.png b/example/src/main/assets/pic/78/000007.png new file mode 100644 index 0000000..8735aeb Binary files /dev/null and b/example/src/main/assets/pic/78/000007.png differ diff --git a/example/src/main/assets/pic/78/000008.png b/example/src/main/assets/pic/78/000008.png new file mode 100644 index 0000000..588313a Binary files /dev/null and b/example/src/main/assets/pic/78/000008.png differ diff --git a/example/src/main/assets/pic/78/000009.png b/example/src/main/assets/pic/78/000009.png new file mode 100644 index 0000000..e0f0330 Binary files /dev/null and b/example/src/main/assets/pic/78/000009.png differ diff --git a/example/src/main/assets/pic/78/000010.png b/example/src/main/assets/pic/78/000010.png new file mode 100644 index 0000000..b562a56 Binary files /dev/null and b/example/src/main/assets/pic/78/000010.png differ diff --git a/example/src/main/assets/pic/78/000011.png b/example/src/main/assets/pic/78/000011.png new file mode 100644 index 0000000..9860bea Binary files /dev/null and b/example/src/main/assets/pic/78/000011.png differ diff --git a/example/src/main/assets/pic/78/000012.png b/example/src/main/assets/pic/78/000012.png new file mode 100644 index 0000000..3ece334 Binary files /dev/null and b/example/src/main/assets/pic/78/000012.png differ diff --git a/example/src/main/assets/pic/78/000013.png b/example/src/main/assets/pic/78/000013.png new file mode 100644 index 0000000..f1c7e43 Binary files /dev/null and b/example/src/main/assets/pic/78/000013.png differ diff --git a/example/src/main/assets/pic/78/000014.png b/example/src/main/assets/pic/78/000014.png new file mode 100644 index 0000000..370934d Binary files /dev/null and b/example/src/main/assets/pic/78/000014.png differ diff --git a/example/src/main/assets/pic/78/000015.png b/example/src/main/assets/pic/78/000015.png new file mode 100644 index 0000000..1ddbdcc Binary files /dev/null and b/example/src/main/assets/pic/78/000015.png differ diff --git a/example/src/main/assets/pic/78/000016.png b/example/src/main/assets/pic/78/000016.png new file mode 100644 index 0000000..9598875 Binary files /dev/null and b/example/src/main/assets/pic/78/000016.png differ diff --git a/example/src/main/assets/pic/78/000017.png b/example/src/main/assets/pic/78/000017.png new file mode 100644 index 0000000..8a40de6 Binary files /dev/null and b/example/src/main/assets/pic/78/000017.png differ diff --git a/example/src/main/assets/pic/78/000018.png b/example/src/main/assets/pic/78/000018.png new file mode 100644 index 0000000..0a86fa5 Binary files /dev/null and b/example/src/main/assets/pic/78/000018.png differ diff --git a/example/src/main/assets/pic/78/000019.png b/example/src/main/assets/pic/78/000019.png new file mode 100644 index 0000000..96c19fc Binary files /dev/null and b/example/src/main/assets/pic/78/000019.png differ diff --git a/example/src/main/assets/pic/78/000020.png b/example/src/main/assets/pic/78/000020.png new file mode 100644 index 0000000..54416c7 Binary files /dev/null and b/example/src/main/assets/pic/78/000020.png differ diff --git a/example/src/main/assets/pic/78/000021.png b/example/src/main/assets/pic/78/000021.png new file mode 100644 index 0000000..ae808db Binary files /dev/null and b/example/src/main/assets/pic/78/000021.png differ diff --git a/example/src/main/assets/pic/78/000022.png b/example/src/main/assets/pic/78/000022.png new file mode 100644 index 0000000..0b6eecf Binary files /dev/null and b/example/src/main/assets/pic/78/000022.png differ diff --git a/example/src/main/assets/pic/78/000023.png b/example/src/main/assets/pic/78/000023.png new file mode 100644 index 0000000..4f0995e Binary files /dev/null and b/example/src/main/assets/pic/78/000023.png differ diff --git a/example/src/main/assets/pic/78/000024.png b/example/src/main/assets/pic/78/000024.png new file mode 100644 index 0000000..48edbb5 Binary files /dev/null and b/example/src/main/assets/pic/78/000024.png differ diff --git a/example/src/main/assets/pic/78/000025.png b/example/src/main/assets/pic/78/000025.png new file mode 100644 index 0000000..6f24551 Binary files /dev/null and b/example/src/main/assets/pic/78/000025.png differ diff --git a/example/src/main/assets/pic/78/000026.png b/example/src/main/assets/pic/78/000026.png new file mode 100644 index 0000000..f188031 Binary files /dev/null and b/example/src/main/assets/pic/78/000026.png differ diff --git a/example/src/main/assets/pic/78/000027.png b/example/src/main/assets/pic/78/000027.png new file mode 100644 index 0000000..a591a19 Binary files /dev/null and b/example/src/main/assets/pic/78/000027.png differ diff --git a/example/src/main/assets/pic/78/000028.png b/example/src/main/assets/pic/78/000028.png new file mode 100644 index 0000000..afe5e25 Binary files /dev/null and b/example/src/main/assets/pic/78/000028.png differ diff --git a/example/src/main/assets/pic/78/000029.png b/example/src/main/assets/pic/78/000029.png new file mode 100644 index 0000000..02dc9f4 Binary files /dev/null and b/example/src/main/assets/pic/78/000029.png differ diff --git a/example/src/main/assets/pic/78/000030.png b/example/src/main/assets/pic/78/000030.png new file mode 100644 index 0000000..e934b53 Binary files /dev/null and b/example/src/main/assets/pic/78/000030.png differ diff --git a/example/src/main/assets/pic/78/000031.png b/example/src/main/assets/pic/78/000031.png new file mode 100644 index 0000000..8f4c388 Binary files /dev/null and b/example/src/main/assets/pic/78/000031.png differ diff --git a/example/src/main/assets/pic/78/000032.png b/example/src/main/assets/pic/78/000032.png new file mode 100644 index 0000000..59523cd Binary files /dev/null and b/example/src/main/assets/pic/78/000032.png differ diff --git a/example/src/main/assets/pic/78/000033.png b/example/src/main/assets/pic/78/000033.png new file mode 100644 index 0000000..ff8f328 Binary files /dev/null and b/example/src/main/assets/pic/78/000033.png differ diff --git a/example/src/main/assets/pic/78/000034.png b/example/src/main/assets/pic/78/000034.png new file mode 100644 index 0000000..624aa83 Binary files /dev/null and b/example/src/main/assets/pic/78/000034.png differ diff --git a/example/src/main/assets/pic/78/000035.png b/example/src/main/assets/pic/78/000035.png new file mode 100644 index 0000000..8a40de6 Binary files /dev/null and b/example/src/main/assets/pic/78/000035.png differ diff --git a/example/src/main/assets/pic/78/78.png b/example/src/main/assets/pic/78/78.png deleted file mode 100644 index cef6e74..0000000 Binary files a/example/src/main/assets/pic/78/78.png and /dev/null differ diff --git a/example/src/main/assets/pic/78/78ex.png b/example/src/main/assets/pic/78/78ex.png deleted file mode 100644 index e5ea4bb..0000000 Binary files a/example/src/main/assets/pic/78/78ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/78ex.png b/example/src/main/assets/pic/78ex.png new file mode 100644 index 0000000..2f10bbd Binary files /dev/null and b/example/src/main/assets/pic/78ex.png differ diff --git a/example/src/main/assets/pic/7ex.png b/example/src/main/assets/pic/7ex.png new file mode 100644 index 0000000..a6c26e0 Binary files /dev/null and b/example/src/main/assets/pic/7ex.png differ diff --git a/example/src/main/assets/pic/80.png b/example/src/main/assets/pic/80.png deleted file mode 100644 index 83c1edf..0000000 Binary files a/example/src/main/assets/pic/80.png and /dev/null differ diff --git a/example/src/main/assets/pic/80/80.png b/example/src/main/assets/pic/80/80.png index 83c1edf..e62c9c9 100644 Binary files a/example/src/main/assets/pic/80/80.png and b/example/src/main/assets/pic/80/80.png differ diff --git a/example/src/main/assets/pic/80/80ex.png b/example/src/main/assets/pic/80/80ex.png deleted file mode 100644 index c9e1179..0000000 Binary files a/example/src/main/assets/pic/80/80ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/80ex.png b/example/src/main/assets/pic/80ex.png new file mode 100644 index 0000000..93b0bd8 Binary files /dev/null and b/example/src/main/assets/pic/80ex.png differ diff --git a/example/src/main/assets/pic/81.png b/example/src/main/assets/pic/81.png deleted file mode 100644 index c5086c8..0000000 Binary files a/example/src/main/assets/pic/81.png and /dev/null differ diff --git a/example/src/main/assets/pic/81/000000.png b/example/src/main/assets/pic/81/000000.png new file mode 100644 index 0000000..66e0c2b Binary files /dev/null and b/example/src/main/assets/pic/81/000000.png differ diff --git a/example/src/main/assets/pic/81/000001.png b/example/src/main/assets/pic/81/000001.png new file mode 100644 index 0000000..eedb30e Binary files /dev/null and b/example/src/main/assets/pic/81/000001.png differ diff --git a/example/src/main/assets/pic/81/000002.png b/example/src/main/assets/pic/81/000002.png new file mode 100644 index 0000000..5ce08b9 Binary files /dev/null and b/example/src/main/assets/pic/81/000002.png differ diff --git a/example/src/main/assets/pic/81/000003.png b/example/src/main/assets/pic/81/000003.png new file mode 100644 index 0000000..d3c0421 Binary files /dev/null and b/example/src/main/assets/pic/81/000003.png differ diff --git a/example/src/main/assets/pic/81/000004.png b/example/src/main/assets/pic/81/000004.png new file mode 100644 index 0000000..061ce2a Binary files /dev/null and b/example/src/main/assets/pic/81/000004.png differ diff --git a/example/src/main/assets/pic/81/000005.png b/example/src/main/assets/pic/81/000005.png new file mode 100644 index 0000000..5805035 Binary files /dev/null and b/example/src/main/assets/pic/81/000005.png differ diff --git a/example/src/main/assets/pic/81/000006.png b/example/src/main/assets/pic/81/000006.png new file mode 100644 index 0000000..aeb3307 Binary files /dev/null and b/example/src/main/assets/pic/81/000006.png differ diff --git a/example/src/main/assets/pic/81/000007.png b/example/src/main/assets/pic/81/000007.png new file mode 100644 index 0000000..4f43f5c Binary files /dev/null and b/example/src/main/assets/pic/81/000007.png differ diff --git a/example/src/main/assets/pic/81/000008.png b/example/src/main/assets/pic/81/000008.png new file mode 100644 index 0000000..fd016d5 Binary files /dev/null and b/example/src/main/assets/pic/81/000008.png differ diff --git a/example/src/main/assets/pic/81/000009.png b/example/src/main/assets/pic/81/000009.png new file mode 100644 index 0000000..d9b0f72 Binary files /dev/null and b/example/src/main/assets/pic/81/000009.png differ diff --git a/example/src/main/assets/pic/81/000010.png b/example/src/main/assets/pic/81/000010.png new file mode 100644 index 0000000..23a8b03 Binary files /dev/null and b/example/src/main/assets/pic/81/000010.png differ diff --git a/example/src/main/assets/pic/81/000011.png b/example/src/main/assets/pic/81/000011.png new file mode 100644 index 0000000..7eb217a Binary files /dev/null and b/example/src/main/assets/pic/81/000011.png differ diff --git a/example/src/main/assets/pic/81/000012.png b/example/src/main/assets/pic/81/000012.png new file mode 100644 index 0000000..151e1a5 Binary files /dev/null and b/example/src/main/assets/pic/81/000012.png differ diff --git a/example/src/main/assets/pic/81/000013.png b/example/src/main/assets/pic/81/000013.png new file mode 100644 index 0000000..a58bec6 Binary files /dev/null and b/example/src/main/assets/pic/81/000013.png differ diff --git a/example/src/main/assets/pic/81/000014.png b/example/src/main/assets/pic/81/000014.png new file mode 100644 index 0000000..64ed63f Binary files /dev/null and b/example/src/main/assets/pic/81/000014.png differ diff --git a/example/src/main/assets/pic/81/000015.png b/example/src/main/assets/pic/81/000015.png new file mode 100644 index 0000000..82e4271 Binary files /dev/null and b/example/src/main/assets/pic/81/000015.png differ diff --git a/example/src/main/assets/pic/81/000016.png b/example/src/main/assets/pic/81/000016.png new file mode 100644 index 0000000..9928b87 Binary files /dev/null and b/example/src/main/assets/pic/81/000016.png differ diff --git a/example/src/main/assets/pic/81/000017.png b/example/src/main/assets/pic/81/000017.png new file mode 100644 index 0000000..58b5020 Binary files /dev/null and b/example/src/main/assets/pic/81/000017.png differ diff --git a/example/src/main/assets/pic/81/000018.png b/example/src/main/assets/pic/81/000018.png new file mode 100644 index 0000000..835bc02 Binary files /dev/null and b/example/src/main/assets/pic/81/000018.png differ diff --git a/example/src/main/assets/pic/81/000019.png b/example/src/main/assets/pic/81/000019.png new file mode 100644 index 0000000..33af263 Binary files /dev/null and b/example/src/main/assets/pic/81/000019.png differ diff --git a/example/src/main/assets/pic/81/000020.png b/example/src/main/assets/pic/81/000020.png new file mode 100644 index 0000000..b7cba3f Binary files /dev/null and b/example/src/main/assets/pic/81/000020.png differ diff --git a/example/src/main/assets/pic/81/000021.png b/example/src/main/assets/pic/81/000021.png new file mode 100644 index 0000000..65b6d0c Binary files /dev/null and b/example/src/main/assets/pic/81/000021.png differ diff --git a/example/src/main/assets/pic/81/000022.png b/example/src/main/assets/pic/81/000022.png new file mode 100644 index 0000000..f0f44ba Binary files /dev/null and b/example/src/main/assets/pic/81/000022.png differ diff --git a/example/src/main/assets/pic/81/000023.png b/example/src/main/assets/pic/81/000023.png new file mode 100644 index 0000000..ff09652 Binary files /dev/null and b/example/src/main/assets/pic/81/000023.png differ diff --git a/example/src/main/assets/pic/81/000024.png b/example/src/main/assets/pic/81/000024.png new file mode 100644 index 0000000..8dead55 Binary files /dev/null and b/example/src/main/assets/pic/81/000024.png differ diff --git a/example/src/main/assets/pic/81/000025.png b/example/src/main/assets/pic/81/000025.png new file mode 100644 index 0000000..712a673 Binary files /dev/null and b/example/src/main/assets/pic/81/000025.png differ diff --git a/example/src/main/assets/pic/81/000026.png b/example/src/main/assets/pic/81/000026.png new file mode 100644 index 0000000..6ada97d Binary files /dev/null and b/example/src/main/assets/pic/81/000026.png differ diff --git a/example/src/main/assets/pic/81/000027.png b/example/src/main/assets/pic/81/000027.png new file mode 100644 index 0000000..7377c5a Binary files /dev/null and b/example/src/main/assets/pic/81/000027.png differ diff --git a/example/src/main/assets/pic/81/81.png b/example/src/main/assets/pic/81/81.png deleted file mode 100644 index c5086c8..0000000 Binary files a/example/src/main/assets/pic/81/81.png and /dev/null differ diff --git a/example/src/main/assets/pic/81/81ex.png b/example/src/main/assets/pic/81/81ex.png deleted file mode 100644 index c2755a0..0000000 Binary files a/example/src/main/assets/pic/81/81ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/81ex.png b/example/src/main/assets/pic/81ex.png new file mode 100644 index 0000000..9f22535 Binary files /dev/null and b/example/src/main/assets/pic/81ex.png differ diff --git a/example/src/main/assets/pic/82.png b/example/src/main/assets/pic/82.png deleted file mode 100644 index 061d518..0000000 Binary files a/example/src/main/assets/pic/82.png and /dev/null differ diff --git a/example/src/main/assets/pic/82/82.png b/example/src/main/assets/pic/82/82.png deleted file mode 100644 index 061d518..0000000 Binary files a/example/src/main/assets/pic/82/82.png and /dev/null differ diff --git a/example/src/main/assets/pic/82/82ex.png b/example/src/main/assets/pic/82/82ex.png deleted file mode 100644 index 483c539..0000000 Binary files a/example/src/main/assets/pic/82/82ex.png and /dev/null differ diff --git a/example/src/main/assets/pic/motion_data.json b/example/src/main/assets/pic/motion_data.json index 730df9b..2851195 100644 --- a/example/src/main/assets/pic/motion_data.json +++ b/example/src/main/assets/pic/motion_data.json @@ -1,165 +1,540 @@ { + "1": [ + "000000.png" + ], + "2": [ + "000000.png" + ], + "3": [ + "000000.png" + ], "4": [ - "001.png", - "002.png", - "003.png", - "004.png", - "005.png", - "006.png", - "007.png", - "008.png", - "009.png", - "010.png", - "011.png", - "012.png", - "013.png", - "014.png", - "015.png", - "016.png", - "017.png", - "018.png", - "019.png", - "020.png", - "021.png", - "022.png", - "023.png", - "024.png", - "025.png", - "026.png", - "027.png", - "028.png", - "029.png", - "030.png", - "031.png", - "032.png", - "033.png", - "034.png", - "035.png", - "036.png", - "037.png", - "038.png", - "039.png", - "040.png", - "041.png", - "042.png", - "043.png", - "044.png", - "045.png", - "046.png", - "047.png", - "048.png", - "049.png", - "050.png", - "051.png", - "052.png", - "053.png", - "054.png", - "055.png", - "056.png", - "057.png", - "058.png", - "059.png", - "060.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" ], "5": [ - "5.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" ], "6": [ - "6.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png", + "000036.png", + "000037.png", + "000038.png", + "000039.png", + "000040.png", + "000041.png" ], "7": [ - "7.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" ], "11": [ - "002.png", - "003.png", - "004.png", - "005.png", - "006.png", - "007.png", - "008.png", - "009.png", - "010.png", - "011.png", - "11.png", - "012.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png" ], "12": [ - "12.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png" ], "13": [ - "001.png", - "002.png", - "003.png", - "004.png", - "005.png", - "006.png", - "007.png", - "008.png", - "009.png", - "010.png", - "011.png", - "012.png", - "013.png", - "13.png", - "014.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" ], "14": [ - "14.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" ], "21": [ - "21.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" ], - "23": [ - "23.png" + "54": [ + "000000.png" ], - "24": [ - "24.png" - ], - "26": [ - "26.png" - ], - "27": [ - "27.png" - ], - "32": [ - "32.png" - ], - "37": [ - "37.png" - ], - "40": [ - "40.png" - ], - "45": [ - "45.png" - ], - "48": [ - "48.png" - ], - "49": [ - "49.png" - ], - "53": [ - "53.png" + "55": [ + "000000.png" ], "56": [ - "56.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" ], "59": [ - "59.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png" ], "62": [ - "62.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" ], "65": [ - "65.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" ], "68": [ - "68.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" + ], + "69": [ + "000000.png" + ], + "70": [ + "000000.png" ], "71": [ - "71.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png" ], "76": [ "76.png" @@ -168,15 +543,74 @@ "77.png" ], "78": [ - "78.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png", + "000028.png", + "000029.png", + "000030.png", + "000031.png", + "000032.png", + "000033.png", + "000034.png", + "000035.png" ], "80": [ "80.png" ], "81": [ - "81.png" - ], - "82": [ - "82.png" + "000000.png", + "000001.png", + "000002.png", + "000003.png", + "000004.png", + "000005.png", + "000006.png", + "000007.png", + "000008.png", + "000009.png", + "000010.png", + "000011.png", + "000012.png", + "000013.png", + "000014.png", + "000015.png", + "000016.png", + "000017.png", + "000018.png", + "000019.png", + "000020.png", + "000021.png", + "000022.png", + "000023.png", + "000024.png", + "000025.png", + "000026.png", + "000027.png" ] } \ No newline at end of file diff --git a/example/src/main/assets/pic/motion_data_ex.json b/example/src/main/assets/pic/motion_data_ex.json index 00c15fd..5a52f07 100644 --- a/example/src/main/assets/pic/motion_data_ex.json +++ b/example/src/main/assets/pic/motion_data_ex.json @@ -1,494 +1,2018 @@ { + "1": { + "000000.png": { + "x": 0, + "y": 0 + } + }, + "2": { + "000000.png": { + "x": 0, + "y": 0 + } + }, + "3": { + "000000.png": { + "x": 0, + "y": 0 + } + }, "4": { - "001.png": { + "000000.png": { "x": 0, "y": 0 }, - "002.png": { - "x": 360, + "000001.png": { + "x": 256, "y": 0 }, - "003.png": { - "x": 720, + "000002.png": { + "x": 512, "y": 0 }, - "004.png": { - "x": 1080, + "000003.png": { + "x": 768, "y": 0 }, - "005.png": { - "x": 1440, + "000004.png": { + "x": 1024, "y": 0 }, - "006.png": { - "x": 1800, + "000005.png": { + "x": 1280, "y": 0 }, - "007.png": { - "x": 2160, + "000006.png": { + "x": 1536, "y": 0 }, - "008.png": { - "x": 2520, + "000007.png": { + "x": 1792, "y": 0 }, - "009.png": { + "000008.png": { "x": 0, - "y": 360 + "y": 256 }, - "010.png": { - "x": 360, - "y": 360 + "000009.png": { + "x": 256, + "y": 256 }, - "011.png": { - "x": 720, - "y": 360 + "000010.png": { + "x": 512, + "y": 256 }, - "012.png": { - "x": 1080, - "y": 360 + "000011.png": { + "x": 768, + "y": 256 }, - "013.png": { - "x": 1440, - "y": 360 + "000012.png": { + "x": 1024, + "y": 256 }, - "014.png": { - "x": 1800, - "y": 360 + "000013.png": { + "x": 1280, + "y": 256 }, - "015.png": { - "x": 2160, - "y": 360 + "000014.png": { + "x": 1536, + "y": 256 }, - "016.png": { - "x": 2520, - "y": 360 + "000015.png": { + "x": 1792, + "y": 256 }, - "017.png": { + "000016.png": { "x": 0, - "y": 720 + "y": 512 }, - "018.png": { - "x": 360, - "y": 720 + "000017.png": { + "x": 256, + "y": 512 }, - "019.png": { - "x": 720, - "y": 720 + "000018.png": { + "x": 512, + "y": 512 }, - "020.png": { - "x": 1080, - "y": 720 + "000019.png": { + "x": 768, + "y": 512 }, - "021.png": { - "x": 1440, - "y": 720 + "000020.png": { + "x": 1024, + "y": 512 }, - "022.png": { - "x": 1800, - "y": 720 + "000021.png": { + "x": 1280, + "y": 512 }, - "023.png": { - "x": 2160, - "y": 720 + "000022.png": { + "x": 1536, + "y": 512 }, - "024.png": { - "x": 2520, - "y": 720 + "000023.png": { + "x": 1792, + "y": 512 }, - "025.png": { + "000024.png": { "x": 0, - "y": 1080 + "y": 768 }, - "026.png": { - "x": 360, - "y": 1080 + "000025.png": { + "x": 256, + "y": 768 }, - "027.png": { - "x": 720, - "y": 1080 + "000026.png": { + "x": 512, + "y": 768 }, - "028.png": { - "x": 1080, - "y": 1080 + "000027.png": { + "x": 768, + "y": 768 }, - "029.png": { - "x": 1440, - "y": 1080 + "000028.png": { + "x": 1024, + "y": 768 }, - "030.png": { - "x": 1800, - "y": 1080 + "000029.png": { + "x": 1280, + "y": 768 }, - "031.png": { - "x": 2160, - "y": 1080 + "000030.png": { + "x": 1536, + "y": 768 }, - "032.png": { - "x": 2520, - "y": 1080 - }, - "033.png": { - "x": 0, - "y": 1440 - }, - "034.png": { - "x": 360, - "y": 1440 - }, - "035.png": { - "x": 720, - "y": 1440 - }, - "036.png": { - "x": 1080, - "y": 1440 - }, - "037.png": { - "x": 1440, - "y": 1440 - }, - "038.png": { - "x": 1800, - "y": 1440 - }, - "039.png": { - "x": 2160, - "y": 1440 - }, - "040.png": { - "x": 2520, - "y": 1440 - }, - "041.png": { - "x": 0, - "y": 1800 - }, - "042.png": { - "x": 360, - "y": 1800 - }, - "043.png": { - "x": 720, - "y": 1800 - }, - "044.png": { - "x": 1080, - "y": 1800 - }, - "045.png": { - "x": 1440, - "y": 1800 - }, - "046.png": { - "x": 1800, - "y": 1800 - }, - "047.png": { - "x": 2160, - "y": 1800 - }, - "048.png": { - "x": 2520, - "y": 1800 - }, - "049.png": { - "x": 0, - "y": 2160 - }, - "050.png": { - "x": 360, - "y": 2160 - }, - "051.png": { - "x": 720, - "y": 2160 - }, - "052.png": { - "x": 1080, - "y": 2160 - }, - "053.png": { - "x": 1440, - "y": 2160 - }, - "054.png": { - "x": 1800, - "y": 2160 - }, - "055.png": { - "x": 2160, - "y": 2160 - }, - "056.png": { - "x": 2520, - "y": 2160 - }, - "057.png": { - "x": 0, - "y": 2520 - }, - "058.png": { - "x": 360, - "y": 2520 - }, - "059.png": { - "x": 720, - "y": 2520 - }, - "060.png": { - "x": 1080, - "y": 2520 + "000031.png": { + "x": 1792, + "y": 768 } }, "5": { - "5.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 } }, "6": { - "6.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + }, + "000032.png": { + "x": 0, + "y": 1024 + }, + "000033.png": { + "x": 256, + "y": 1024 + }, + "000034.png": { + "x": 512, + "y": 1024 + }, + "000035.png": { + "x": 768, + "y": 1024 + }, + "000036.png": { + "x": 1024, + "y": 1024 + }, + "000037.png": { + "x": 1280, + "y": 1024 + }, + "000038.png": { + "x": 1536, + "y": 1024 + }, + "000039.png": { + "x": 1792, + "y": 1024 + }, + "000040.png": { + "x": 0, + "y": 1280 + }, + "000041.png": { + "x": 256, + "y": 1280 } }, "7": { - "7.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + }, + "000032.png": { + "x": 0, + "y": 1024 + }, + "000033.png": { + "x": 256, + "y": 1024 + }, + "000034.png": { + "x": 512, + "y": 1024 + }, + "000035.png": { + "x": 768, + "y": 1024 } }, "11": { - "002.png": { + "000000.png": { "x": 0, "y": 0 }, - "003.png": { - "x": 360, + "000001.png": { + "x": 256, "y": 0 }, - "004.png": { - "x": 720, + "000002.png": { + "x": 512, "y": 0 }, - "005.png": { - "x": 1080, + "000003.png": { + "x": 768, "y": 0 }, - "006.png": { - "x": 1440, + "000004.png": { + "x": 1024, "y": 0 }, - "007.png": { - "x": 1800, + "000005.png": { + "x": 1280, "y": 0 }, - "008.png": { - "x": 2160, + "000006.png": { + "x": 1536, "y": 0 }, - "009.png": { - "x": 2520, + "000007.png": { + "x": 1792, "y": 0 }, - "010.png": { + "000008.png": { "x": 0, - "y": 360 + "y": 256 }, - "011.png": { - "x": 360, - "y": 360 + "000009.png": { + "x": 256, + "y": 256 }, - "11.png": { - "x": 720, - "y": 360 + "000010.png": { + "x": 512, + "y": 256 }, - "012.png": { - "x": 1080, - "y": 360 + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 } }, "12": { - "12.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 } }, "13": { - "001.png": { + "000000.png": { "x": 0, "y": 0 }, - "002.png": { - "x": 360, + "000001.png": { + "x": 256, "y": 0 }, - "003.png": { - "x": 720, + "000002.png": { + "x": 512, "y": 0 }, - "004.png": { - "x": 1080, + "000003.png": { + "x": 768, "y": 0 }, - "005.png": { - "x": 1440, + "000004.png": { + "x": 1024, "y": 0 }, - "006.png": { - "x": 1800, + "000005.png": { + "x": 1280, "y": 0 }, - "007.png": { - "x": 2160, + "000006.png": { + "x": 1536, "y": 0 }, - "008.png": { - "x": 2520, + "000007.png": { + "x": 1792, "y": 0 }, - "009.png": { + "000008.png": { "x": 0, - "y": 360 + "y": 256 }, - "010.png": { - "x": 360, - "y": 360 + "000009.png": { + "x": 256, + "y": 256 }, - "011.png": { - "x": 720, - "y": 360 + "000010.png": { + "x": 512, + "y": 256 }, - "012.png": { - "x": 1080, - "y": 360 + "000011.png": { + "x": 768, + "y": 256 }, - "013.png": { - "x": 1440, - "y": 360 + "000012.png": { + "x": 1024, + "y": 256 }, - "13.png": { - "x": 1800, - "y": 360 + "000013.png": { + "x": 1280, + "y": 256 }, - "014.png": { - "x": 2160, - "y": 360 + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 } }, "14": { - "14.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + }, + "000032.png": { + "x": 0, + "y": 1024 + }, + "000033.png": { + "x": 256, + "y": 1024 + }, + "000034.png": { + "x": 512, + "y": 1024 + }, + "000035.png": { + "x": 768, + "y": 1024 } }, "21": { - "21.png": { + "000000.png": { + "x": 0, + "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + }, + "000032.png": { + "x": 0, + "y": 1024 + }, + "000033.png": { + "x": 256, + "y": 1024 + }, + "000034.png": { + "x": 512, + "y": 1024 + }, + "000035.png": { + "x": 768, + "y": 1024 + } + }, + "54": { + "000000.png": { "x": 0, "y": 0 } }, - "23": { - "23.png": { - "x": 0, - "y": 0 - } - }, - "24": { - "24.png": { - "x": 0, - "y": 0 - } - }, - "26": { - "26.png": { - "x": 0, - "y": 0 - } - }, - "27": { - "27.png": { - "x": 0, - "y": 0 - } - }, - "32": { - "32.png": { - "x": 0, - "y": 0 - } - }, - "37": { - "37.png": { - "x": 0, - "y": 0 - } - }, - "40": { - "40.png": { - "x": 0, - "y": 0 - } - }, - "45": { - "45.png": { - "x": 0, - "y": 0 - } - }, - "48": { - "48.png": { - "x": 0, - "y": 0 - } - }, - "49": { - "49.png": { - "x": 0, - "y": 0 - } - }, - "53": { - "53.png": { + "55": { + "000000.png": { "x": 0, "y": 0 } }, "56": { - "56.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + }, + "000032.png": { + "x": 0, + "y": 1024 + }, + "000033.png": { + "x": 256, + "y": 1024 + }, + "000034.png": { + "x": 512, + "y": 1024 + }, + "000035.png": { + "x": 768, + "y": 1024 } }, "59": { - "59.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 } }, "62": { - "62.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 } }, "65": { - "65.png": { + "000000.png": { + "x": 0, + "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + }, + "000032.png": { + "x": 0, + "y": 1024 + }, + "000033.png": { + "x": 256, + "y": 1024 + }, + "000034.png": { + "x": 512, + "y": 1024 + }, + "000035.png": { + "x": 768, + "y": 1024 + } + }, + "68": { + "000000.png": { + "x": 0, + "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + } + }, + "69": { + "000000.png": { "x": 0, "y": 0 } }, - "68": { - "68.png": { + "70": { + "000000.png": { "x": 0, "y": 0 } }, "71": { - "71.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 } }, "76": { @@ -504,9 +2028,149 @@ } }, "78": { - "78.png": { + "000000.png": { "x": 0, "y": 0 + }, + "000001.png": { + "x": 256, + "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 + }, + "000028.png": { + "x": 1024, + "y": 768 + }, + "000029.png": { + "x": 1280, + "y": 768 + }, + "000030.png": { + "x": 1536, + "y": 768 + }, + "000031.png": { + "x": 1792, + "y": 768 + }, + "000032.png": { + "x": 0, + "y": 1024 + }, + "000033.png": { + "x": 256, + "y": 1024 + }, + "000034.png": { + "x": 512, + "y": 1024 + }, + "000035.png": { + "x": 768, + "y": 1024 } }, "80": { @@ -516,15 +2180,117 @@ } }, "81": { - "81.png": { + "000000.png": { "x": 0, "y": 0 - } - }, - "82": { - "82.png": { - "x": 0, + }, + "000001.png": { + "x": 256, "y": 0 + }, + "000002.png": { + "x": 512, + "y": 0 + }, + "000003.png": { + "x": 768, + "y": 0 + }, + "000004.png": { + "x": 1024, + "y": 0 + }, + "000005.png": { + "x": 1280, + "y": 0 + }, + "000006.png": { + "x": 1536, + "y": 0 + }, + "000007.png": { + "x": 1792, + "y": 0 + }, + "000008.png": { + "x": 0, + "y": 256 + }, + "000009.png": { + "x": 256, + "y": 256 + }, + "000010.png": { + "x": 512, + "y": 256 + }, + "000011.png": { + "x": 768, + "y": 256 + }, + "000012.png": { + "x": 1024, + "y": 256 + }, + "000013.png": { + "x": 1280, + "y": 256 + }, + "000014.png": { + "x": 1536, + "y": 256 + }, + "000015.png": { + "x": 1792, + "y": 256 + }, + "000016.png": { + "x": 0, + "y": 512 + }, + "000017.png": { + "x": 256, + "y": 512 + }, + "000018.png": { + "x": 512, + "y": 512 + }, + "000019.png": { + "x": 768, + "y": 512 + }, + "000020.png": { + "x": 1024, + "y": 512 + }, + "000021.png": { + "x": 1280, + "y": 512 + }, + "000022.png": { + "x": 1536, + "y": 512 + }, + "000023.png": { + "x": 1792, + "y": 512 + }, + "000024.png": { + "x": 0, + "y": 768 + }, + "000025.png": { + "x": 256, + "y": 768 + }, + "000026.png": { + "x": 512, + "y": 768 + }, + "000027.png": { + "x": 768, + "y": 768 } } } \ No newline at end of file diff --git a/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt b/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt index 363c59d..f19215b 100644 --- a/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt +++ b/example/src/main/java/com/inewme/uvmirror/MakeupActivity.kt @@ -1,71 +1,27 @@ package com.inewme.uvmirror -import android.content.Context import android.os.Bundle import android.util.Log import android.view.KeyEvent import android.view.KeyEvent.KEYCODE_BACK import android.view.MotionEvent import androidx.lifecycle.lifecycleScope + import com.hmwl.face_sdk.FaceActivity -import com.hmwl.face_sdk.Frame -import com.hmwl.face_sdk.InitArg -import com.hmwl.face_sdk.Motion -import com.hmwl.face_sdk.MotionList import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.json.JSONObject -import java.io.BufferedReader -import java.io.InputStreamReader class MakeupActivity : FaceActivity() { - var animationFinishedFun = object : AnimationFinishedCallbackInterface { - override fun OnAnimationFinished() { - Log.i("MakeupActivity", "OnAnimationFinished: ") - } - } - - var loadFinishedFun = object : CallbackInterface { - override fun OnLoadActionFinished(motion_type: String) { - if(actionState == ActionState.Loading) - { - actionState = ActionState.LoadingFinished - } - } - } - - var actionState : ActionState = ActionState.None; - - enum class ActionState{ - None, - Loading, - LoadingFinished, - Playing - } - + lateinit var motionMgr: MotionManager private var updateJob: Job? = null - - - private var existMotions: Map? = null override fun onCreate(savedInstanceState: Bundle?) { - - existMotions = readMotionsFromAssets(this, "pic/motion_data_ex.json") - - val initArg = InitArg().apply { - action_fps = 10 - zoom = 1.5f - } - - SetInitArg(initArg.toJson()) - + motionMgr = MotionManager(this, 10, 1.5f) super.onCreate(savedInstanceState) - - - // 启动一个生命周期感知的协程 + // 启动一个生命周期感知的协程, 每10ms 调用一次,可以通过update 来处理业务的逻辑 updateJob = lifecycleScope.launch { while (true) { update() @@ -73,27 +29,90 @@ class MakeupActivity : FaceActivity() } } - val mlist = MotionList(); - getMotionByName("4")?.let { mlist.motions.add(it) } - getMotionByName("11")?.let { mlist.motions.add(it) } - getMotionByName("13")?.let { mlist.motions.add(it) } - if(actionState == ActionState.None) - { - PreLoadAction(mlist.toJsonString(), loadFinishedFun) - actionState = ActionState.Loading + // 首先一次性加载当前业务逻辑所要求的所有动画资源, 之后就可以任意跳转,和播放,不用考虑状态 + motionMgr.LoadMotionList(sequenceAll){ + //当加载完成了所有资源后会回调 + isMotionLoadFinished = true } - } + //定义加载完成的变量,通过回调函数设置,加载完成后才可以进行动画播放的操作 + var isMotionLoadFinished: Boolean = false + + + + //这里是模拟业务逻辑的地方 + // 模拟问题1, 打断当前的动画,然后跳转到指定步骤 + // 首先播放动画序列 粉底(4、5、6、7)、腮红(55、59)、口红由(76、77、78) 一直循环播放 "4", "5", "6", "7", "55", "59", "76", "77", "78" + // 然后 当播放到 10秒的时候,也可以是其他事件,需要暂停动画 + // 然后 暂停5秒,这个时候需要继续播放动画 + // 然后 又播放了8秒钟,这个时候要却换到 (11, 13, 21 动画序列了), 同时设置序列播放完成回调函数 + // 然后 播放完这个序列又要切换为原来的序列播放,通过序列播放完成回调函数实现 + private var elapsedTime = 0 // 总经过时间(ms) + private val sequenceA = listOf("4", "5", "6", "7", "55", "59", "76", "77", "78") + private val sequenceB = listOf("55", "59", "76") + private val sequenceAll = listOf("4", "5", "6", "7", "55", "59", "76", "77", "78") + private fun update() { - if(actionState == ActionState.LoadingFinished) + if(isMotionLoadFinished) { - ChangeMotionList(animationFinishedFun, true) - actionState = ActionState.Playing + if(elapsedTime == 0){ + //这次播放是一直循环播放,我们不需要判断动画是否播放完成, 回调函数直接传入null + PlayMotionList(sequenceA, true, null) + } + + elapsedTime += 10 // 动画加载完成后开始计时,每次调用增加 10ms + + if(elapsedTime == 10*1000){ + //暂停动画 + StopMotion() + } + + if(elapsedTime == 10*1000 + 5*1000){ + //恢复播放动画 + ResumeMotion() + } + + if(elapsedTime == 10*1000 + 5*1000 + 8*1000){ + PlayMotionList(sequenceB, true){ + //这里是播放完动画后的回调,再次切换到原来的 sequenceA + PlayMotionList(sequenceA, true, null) + } + } + } + } + // 模拟问题2, 当语音播报结束的时候,打断当前的动画, 跳转到另外一个动画 + // 首先播放动画序列 粉底(4、5、6、7)、 + // 然后 当播放到 10秒的时候,表示语音播报结束, 条装到 "55", "59" 动画 +// private var elapsedTime = 0 // 总经过时间(ms) +// private val sequenceA = listOf("4", "5", "6") +// private val sequenceB = listOf("7", "55", "59") +// private val sequenceAll = listOf("4", "5", "6", "7", "55", "59") +// +// private fun update() +// { +// if(isMotionLoadFinished) +// { +// if(elapsedTime == 0){ +// //这次播放是一直循环播放,我们不需要判断动画是否播放完成, 回调函数直接传入null +// PlayMotionList(sequenceA, true, null) +// } +// +// elapsedTime += 10 // 动画加载完成后开始计时,每次调用增加 10ms +// +// if(elapsedTime == 10*1000){ +// //暂停动画 +// PlayMotionList(sequenceB, true, null) +// } +// } +// +// } + + override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { if (keyCode == KEYCODE_BACK) { Log.d("MakeupActivity", "Back key pressed") @@ -109,12 +128,12 @@ class MakeupActivity : FaceActivity() } - private fun getMotionByName(m: String): Motion? { - return existMotions?.get(m); + var animationFinishedFun = object : PlayMotionListFinishedCallback { + override fun OnPlayMotionListFinished() { + Log.i("MakeupActivity", "OnAnimationFinished: ") + } } - - override fun onTouchEvent(event: MotionEvent): Boolean { when (event.action) { MotionEvent.ACTION_UP -> { @@ -123,46 +142,4 @@ class MakeupActivity : FaceActivity() } return true } - - private fun readMotionsFromAssets(context: Context, filename: String): Map { - val motionMap = mutableMapOf() - - try { - context.assets.open(filename).use { inputStream -> - BufferedReader(InputStreamReader(inputStream)).use { reader -> - val stringBuilder = StringBuilder() - var line: String? - while (reader.readLine().also { line = it } != null) { - stringBuilder.append(line) - } - - val jsonObject = JSONObject(stringBuilder.toString()) - // 遍历JSON对象 - val keys = jsonObject.keys() - while (keys.hasNext()) { - val key = keys.next() // 获取键,即"Motion"的名字 - val motionObject = jsonObject.getJSONObject(key) - - val frameList = mutableListOf() - val fileKeys = motionObject.keys() - while (fileKeys.hasNext()) { - val fileKey = fileKeys.next() // 获取每个文件名 - val fileObject = motionObject.getJSONObject(fileKey) - val x = fileObject.getDouble("x").toFloat() - val y = fileObject.getDouble("y").toFloat() - frameList.add(Frame(fileKey, x, y)) - } - - motionMap[key] = Motion(key, frameList) - } - - } - } - } catch (e: Exception) { - e.printStackTrace() - } - - return motionMap - } - } \ No newline at end of file diff --git a/example/src/main/java/com/inewme/uvmirror/MotionManager.kt b/example/src/main/java/com/inewme/uvmirror/MotionManager.kt new file mode 100644 index 0000000..408d95b --- /dev/null +++ b/example/src/main/java/com/inewme/uvmirror/MotionManager.kt @@ -0,0 +1,97 @@ +package com.inewme.uvmirror + +import android.content.Context +import com.hmwl.face_sdk.FaceActivity +import com.hmwl.face_sdk.FaceActivity.PlayMotionListFinishedCallback +import com.hmwl.face_sdk.FaceActivity.LoadMotionListFinishedCallback +import com.hmwl.face_sdk.Frame +import com.hmwl.face_sdk.InitArg +import com.hmwl.face_sdk.Motion +import com.hmwl.face_sdk.MotionList +import org.json.JSONObject +import java.io.BufferedReader +import java.io.InputStreamReader + +class MotionManager { + var faceActivity:FaceActivity + + constructor(activity: FaceActivity, fps: Int, z: Float) { + faceActivity = activity + val initArg = InitArg().apply { + action_fps = fps + zoom = z + } + activity.SetInitArg(initArg.toJson()) + existMotions = readMotionsFromAssets(activity, "pic/motion_data_ex.json") + + + } + + + + + fun LoadMotionList(motions:List, loadMotionFinishedCallback: LoadMotionListFinishedCallback){ + val mlist = MotionList(); + for(s in motions){ + getMotionByName(s)?.let { mlist.motions.add(it) } + } + + faceActivity.PreLoadAction(mlist.toJsonString(), loadMotionFinishedCallback) + } + + private fun getMotionByName(m: String): Motion? { + return existMotions?.get(m); + } + +// public fun update() +// { +// if(actionState == ActionState.LoadingFinished) +// { +// faceActivity.ChangeMotionList(animationFinishedFun, true) +// actionState = ActionState.Playing +// } +// } + + + private var existMotions: Map? = null + private fun readMotionsFromAssets(context: Context, filename: String): Map { + val motionMap = mutableMapOf() + + try { + context.assets.open(filename).use { inputStream -> + BufferedReader(InputStreamReader(inputStream)).use { reader -> + val stringBuilder = StringBuilder() + var line: String? + while (reader.readLine().also { line = it } != null) { + stringBuilder.append(line) + } + + val jsonObject = JSONObject(stringBuilder.toString()) + // 遍历JSON对象 + val keys = jsonObject.keys() + while (keys.hasNext()) { + val key = keys.next() // 获取键,即"Motion"的名字 + val motionObject = jsonObject.getJSONObject(key) + + val frameList = mutableListOf() + val fileKeys = motionObject.keys() + while (fileKeys.hasNext()) { + val fileKey = fileKeys.next() // 获取每个文件名 + val fileObject = motionObject.getJSONObject(fileKey) + val x = fileObject.getDouble("x").toFloat() + val y = fileObject.getDouble("y").toFloat() + frameList.add(Frame(fileKey, x, y)) + } + + motionMap[key] = Motion(key, frameList) + } + + } + } + } catch (e: Exception) { + e.printStackTrace() + } + + return motionMap + } +} \ No newline at end of file diff --git a/python/combin_png.py b/python/combin_png.py index accd60c..6423a5c 100644 --- a/python/combin_png.py +++ b/python/combin_png.py @@ -3,8 +3,8 @@ from PIL import Image import os # 全局变量定义分辨率 -RESIZE_TO = (360, 360) -LARGE_IMAGE_SIZE = (2880, 2880) +RESIZE_TO = (256, 256) +LARGE_IMAGE_SIZE = (2048, 2048) IMAGE_COUNT = 64 ROOT_DIR = '../example/src/main/assets/pic' @@ -80,7 +80,7 @@ def main(json_file_path): images_coordinates[image_name] = {'x': x, 'y': y} index += 1 - output_image_path = os.path.join(ROOT_DIR, folder_name, f"{folder_name}ex.png") + output_image_path = os.path.join(ROOT_DIR, f"{folder_name}ex.png") large_image.save(output_image_path, format='png') # 将坐标信息直接保存到new_data字典中 diff --git a/vulkan/FaceApp.cpp b/vulkan/FaceApp.cpp index fc729eb..7f67452 100644 --- a/vulkan/FaceApp.cpp +++ b/vulkan/FaceApp.cpp @@ -588,9 +588,9 @@ void FaceApp::setup_descriptor_set() update_descriptor_set(m_texs_left, m_descriptor_sets_left); - m_descriptor_sets_right.resize(kTextureMax); - VK_CHECK(vkAllocateDescriptorSets(device, &alloc_info, m_descriptor_sets_right.data())); - update_descriptor_set(m_texs_left, m_descriptor_sets_right); + //m_descriptor_sets_right.resize(kTextureMax); + //VK_CHECK(vkAllocateDescriptorSets(device, &alloc_info, m_descriptor_sets_right.data())); + //update_descriptor_set(m_texs_left, m_descriptor_sets_right); } void FaceApp::update_descriptor_set(vector& texs, vector& descriptSet) @@ -675,6 +675,7 @@ void FaceApp::render(VkCommandBuffer commandBuffer, long long frameTime) std::unique_lock lock(mtx); std::unique_lock lock_point(mtx_point); + std::unique_lock lock_changeMotion(changeMotionMtx); //Application::render(commandBuffer); @@ -686,15 +687,19 @@ void FaceApp::render(VkCommandBuffer commandBuffer, long long frameTime) vkCmdDraw(commandBuffer, 6, 1, 0, 0); + if (!_isChangeMostion) + { + return; + } - if (cur_left) + //if (cur_left) { vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipelineLayout, 0, 1, &m_descriptor_sets_left[_curMotionIndex], 0, NULL); } - else - { - vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipelineLayout, 0, 1, &m_descriptor_sets_right[_curMotionIndex], 0, NULL); - } + //else + //{ + // vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipelineLayout, 0, 1, &m_descriptor_sets_right[_curMotionIndex], 0, NULL); + //} float fsValues[3] = { myFloatValue, 0 , 0}; if (_curMotionIndex < _curMotions.size()) @@ -763,7 +768,7 @@ void FaceApp::initVulkan() createVmaAllocator(); LoadOBJ("face_picture_3dmax.obj", obj_vertices, obj_indices); m_texs_left.resize(kTextureMax); - m_texs_right.resize(kTextureMax); + //m_texs_right.resize(kTextureMax); if (kThick) { m_texs_thick.resize(kTextureMax); @@ -774,12 +779,12 @@ void FaceApp::initVulkan() for (int i = 0; i < kTextureInit; ++i) { - string id_str = std::to_string(i); - loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, m_texs_left[i], true, commandPool, "dummy.png_left_" + id_str); - loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, m_texs_right[i], true, commandPool, "dummy.png_right_" + id_str); + //string id_str = std::to_string(i); + //loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, m_texs_left[i], true, commandPool, "dummy.png_left_" + id_str); + //loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, m_texs_right[i], true, commandPool, "dummy.png_right_" + id_str); if (kThick) { - loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, m_texs_thick[i], true, commandPool, "dummy.png_thick_" + id_str); + //loadTexture(dummy_data, dummy_data.size(), dummy_w, dummy_h, m_texs_thick[i], true, commandPool, "dummy.png_thick_" + id_str); } } @@ -1286,7 +1291,7 @@ void FaceApp::cleanupResources(VkDevice device, VmaAllocator allocator) { // 清空描述符集列表(不需要单独销毁,由描述符池管理) m_descriptor_sets_left.clear(); - m_descriptor_sets_right.clear(); + //m_descriptor_sets_right.clear(); } void FaceApp::cleanup() @@ -1312,10 +1317,10 @@ void FaceApp::cleanup() destroyTexture(device, m_texs_left[i]); } - for (int i = 0; i < this->m_texs_right.size(); ++i) - { - destroyTexture(device, m_texs_right[i]); - } + //for (int i = 0; i < this->m_texs_right.size(); ++i) + //{ + // destroyTexture(device, m_texs_right[i]); + //} destroyTexture(device, tex_bg); vkDestroyCommandPool(device, commandPool, nullptr); @@ -1369,13 +1374,14 @@ void FaceApp::drawFrame(long long frameTime) // } // } - std::unique_lock lock(changeMotionMtx); - if (_curMotions.size() > 0) { static long long game_time = 0; - game_time += frameTime; + if (_playMotion) + { + game_time += frameTime; + } long long actionTime = (1000 / _initArg.action_fps); if (game_time > actionTime) { @@ -1429,10 +1435,10 @@ string FaceApp::preLoadMotionList(string motion_list_str, Callback callback) } _isLoadMotion = true; _callback_loadfinish = callback; - _preLoadMotions.clear(); + _loadMotions.clear(); json j = json::parse(motion_list_str); MotionList motion_list = j.get(); - _preLoadMotions = motion_list.motions; + _loadMotions = motion_list.motions; worker_ = std::thread(&FaceApp::loadMotionThread, this); return "ok"; } @@ -1445,17 +1451,17 @@ void FaceApp::loadMotionThread() } vector* load_text = nullptr; - if (cur_left) - { - load_text = &m_texs_right; - } - else - { + //if (cur_left) + //{ + // load_text = &m_texs_right; + //} + //else + //{ load_text = &m_texs_left; - } + //} vector& pre_texs = *load_text; - for (int i = 0; i < _preLoadMotions.size(); ++i) + for (int i = 0; i < _loadMotions.size(); ++i) { if (pre_texs[i].image == VK_NULL_HANDLE) { @@ -1465,11 +1471,11 @@ void FaceApp::loadMotionThread() #ifdef _WIN32 string path = "pic"; - string path_name = path + "/" + _preLoadMotions[i].name + "/" + _preLoadMotions[i].name + "ex.png"; + string path_name = path + "/" + _loadMotions[i].name + "ex.png"; loadTextureExample(UTF8ToWideString(path_name), pre_texs[i], true, commandPool_ex); #else string path = "pic"; - string path_name = path + "/" + _preLoadMotions[i].name + "/" + _preLoadMotions[i].name + "ex.png"; + string path_name = path + "/" + _loadMotions[i].name + "ex.png"; loadTexture(path_name, pre_texs[i], true, commandPool_ex); #endif // _WIN32 } @@ -1479,7 +1485,19 @@ void FaceApp::loadMotionThread() } -void FaceApp::changeMotionList(AnimationFinishedCallback callback, bool loop) +Motion FaceApp::getMotionByName(string name) +{ + for (auto m : _loadMotions) + { + if (m.name == name) + { + return m; + } + } + return Motion(); +} + +void FaceApp::changeMotionList(vector motions, AnimationFinishedCallback callback, bool loop) { if (_isLoadMotion) { @@ -1499,26 +1517,42 @@ void FaceApp::changeMotionList(AnimationFinishedCallback callback, bool loop) // //m_texs_next[i].reset(); //} + vector motion_list; + for (auto ms : motions) { + Motion m = getMotionByName(ms); + motion_list.push_back(m); + } - if (cur_left) - { - update_descriptor_set(m_texs_right, m_descriptor_sets_right); - cur_left = false; - } - else - { + _curMotions = motion_list; + + //if (cur_left) + //{ + // update_descriptor_set(m_texs_right, m_descriptor_sets_right); + // cur_left = false; + //} + //else + //{ update_descriptor_set(m_texs_left, m_descriptor_sets_left); - cur_left = true; - } + // cur_left = true; + //} + + + - _curMotions = _preLoadMotions; _curFrameIndex = 0; _curMotionIndex = 0; _animationFinishedCallback = callback; _animationLoop = loop; + _isChangeMostion = true; +} - -} \ No newline at end of file +void FaceApp::StopMotion() { + _playMotion = false; +} + +void FaceApp::ResumeMotion() { + _playMotion = true; +} diff --git a/vulkan/FaceApp.h b/vulkan/FaceApp.h index 408f1a2..60886fe 100644 --- a/vulkan/FaceApp.h +++ b/vulkan/FaceApp.h @@ -116,17 +116,18 @@ private: VkPipelineLayout m_pipelineLayout = VK_NULL_HANDLE; VkDescriptorSetLayout m_descriptorSetLayout = VK_NULL_HANDLE; vector m_descriptor_sets_left; - vector m_descriptor_sets_right; + //vector m_descriptor_sets_right; const uint32_t kTextureInit = 1; - const uint32_t kTextureMax = 10; + const uint32_t kTextureMax = 20; vector m_texs_left; - vector m_texs_right; - bool cur_left = true; + //vector m_texs_right; + //bool cur_left = true; + //vector* _cur_texs; vector m_texs_thick; std::vector dummy_data; - unsigned dummy_w = 2880; - unsigned dummy_h = 2880; + unsigned dummy_w = 2048; + unsigned dummy_h = 2048; std::vector obj_vertices; std::vector obj_indices; @@ -161,13 +162,15 @@ public: void loadMotionThread(); std::thread worker_; bool _isLoadMotion = false; + bool _isChangeMostion = false; Callback _callback_loadfinish; AnimationFinishedCallback _animationFinishedCallback; bool _animationLoop = true; string preLoadMotionList(string motion_list_str, Callback callback); - vector_preLoadMotions; + Motion getMotionByName(string name); + vector_loadMotions; vector_curMotions; - void changeMotionList(AnimationFinishedCallback callback, bool loop); + void changeMotionList(vector motions, AnimationFinishedCallback callback, bool loop); //void changeMotion(Motion& motion); InitArg _initArg; @@ -195,6 +198,11 @@ public: void cleanupResources(VkDevice device, VmaAllocator allocator); bool _running = false; + + bool _playMotion = true; + void StopMotion(); + + void ResumeMotion(); }; #endif diff --git a/vulkan/main.cpp b/vulkan/main.cpp index 68027b9..76715ee 100644 --- a/vulkan/main.cpp +++ b/vulkan/main.cpp @@ -49,7 +49,8 @@ void CppAnimationFinishedCallback() void CppCallback() { - g_app->changeMotionList(CppAnimationFinishedCallback, true); + vector motions = {"4", "11", "13"}; + g_app->changeMotionList(motions, CppAnimationFinishedCallback, true); } // 读取JSON文件并填充到motions容器中