diff --git a/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.bin b/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.bin index 9304727..a3638bb 100644 Binary files a/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.bin and b/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.bin differ diff --git a/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.lock b/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.lock index fc8d862..3fa1169 100644 Binary files a/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.lock and b/xiaomi-src/.gradle/8.7/executionHistory/executionHistory.lock differ diff --git a/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.bin b/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.bin index 7f7319b..07a3666 100644 Binary files a/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.bin and b/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.bin differ diff --git a/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.lock b/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.lock index 2c9de18..4af12eb 100644 Binary files a/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.lock and b/xiaomi-src/.gradle/8.7/fileHashes/fileHashes.lock differ diff --git a/xiaomi-src/.gradle/8.7/fileHashes/resourceHashesCache.bin b/xiaomi-src/.gradle/8.7/fileHashes/resourceHashesCache.bin index 020a547..17fe6b8 100644 Binary files a/xiaomi-src/.gradle/8.7/fileHashes/resourceHashesCache.bin and b/xiaomi-src/.gradle/8.7/fileHashes/resourceHashesCache.bin differ diff --git a/xiaomi-src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/xiaomi-src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 97fecb1..224a96a 100644 Binary files a/xiaomi-src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/xiaomi-src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/xiaomi-src/app/build/intermediates/apk/debug/app-debug.apk b/xiaomi-src/app/build/intermediates/apk/debug/app-debug.apk index 0d31d5d..5af3122 100644 Binary files a/xiaomi-src/app/build/intermediates/apk/debug/app-debug.apk and b/xiaomi-src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index 6a66e90..11ce700 100644 Binary files a/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex index ab82b6d..48489c2 100644 Binary files a/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/xiaomi-src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index e462ff9..4b2951c 100644 --- a/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Jan 10 20:01:54 CST 2025 +#Fri Jan 10 21:12:58 CST 2025 base.0=D\:\\software engineering\\xiaomi\\xiaomi\\xiaomi-src\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.1=D\:\\software engineering\\xiaomi\\xiaomi\\xiaomi-src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.10=D\:\\software engineering\\xiaomi\\xiaomi\\xiaomi-src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\6\\classes.dex diff --git a/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index b40c1ce..fdae63b 100644 Binary files a/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/xiaomi-src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$1.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$1.class deleted file mode 100644 index 8b28061..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$1.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2$1.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2$1.class deleted file mode 100644 index 1fe4c18..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2$1.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2$2.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2$2.class deleted file mode 100644 index b455327..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2$2.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2.class deleted file mode 100644 index 9fc83d3..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$2.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$3.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$3.class deleted file mode 100644 index fa784d7..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$3.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$4.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$4.class deleted file mode 100644 index 8757ff4..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$4.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$5.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$5.class deleted file mode 100644 index 2ee4efd..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$5.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$6.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$6.class deleted file mode 100644 index 18d4992..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$6.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$7.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$7.class deleted file mode 100644 index 1e338ab..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$7.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$8.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$8.class deleted file mode 100644 index 373e42b..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity$8.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity.class deleted file mode 100644 index 6278b2a..0000000 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/IflytexActivity.class and /dev/null differ diff --git a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/NoteEditActivity$2.class b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/NoteEditActivity$2.class index 37405e0..4215c5a 100644 Binary files a/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/xiaomi-src/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/xiaomi-src/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt b/xiaomi-src/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt index ebc059d..88e5bcf 100644 --- a/xiaomi-src/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt +++ b/xiaomi-src/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt @@ -122,8 +122,8 @@ 57-->D:\software engineering\xiaomi\xiaomi\xiaomi-src\app\src\main\AndroidManifest.xml:46:19-64 58 D:\software engineering\xiaomi\xiaomi\xiaomi-src\app\src\main\AndroidManifest.xml:47:9-52:64 -59 android:name="net.micode.notes.ui.IflytexActivity" -59-->D:\software engineering\xiaomi\xiaomi\xiaomi-src\app\src\main\AndroidManifest.xml:48:13-47 +59 android:name="net.micode.notes.SparkChain.IflytexActivity" +59-->D:\software engineering\xiaomi\xiaomi\xiaomi-src\app\src\main\AndroidManifest.xml:48:13-55 60 android:configChanges="orientation|keyboardHidden|screenSize" 60-->D:\software engineering\xiaomi\xiaomi\xiaomi-src\app\src\main\AndroidManifest.xml:49:13-74 61 android:exported="true" diff --git a/xiaomi-src/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml b/xiaomi-src/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml index d9e07aa..d8e318a 100644 --- a/xiaomi-src/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml +++ b/xiaomi-src/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml @@ -56,7 +56,7 @@ granted, boolean all) { - Log.d(TAG,"SDK获取系统权限成功:"+all); - for(int i=0;i denied, boolean quick) { - if(quick){ - Log.e(TAG,"onDenied:被永久拒绝授权，请手动授予权限"); - XXPermissions.startPermissionActivity(MainActivity.this,denied); - }else{ - Log.e(TAG,"onDenied:权限获取失败"); - } - } - }); - }*/ - - - //Android permission ask for - private void Android_Permission_init(){ - ArrayList NOPER_List = new ArrayList(); - String tempList[]; - String Perm[] = {android.Manifest.permission.RECORD_AUDIO, //录音权限 - android.Manifest.permission.ACCESS_NETWORK_STATE, //络连接信息权限 - android.Manifest.permission.INTERNET, //连网权限 - Manifest.permission.READ_EXTERNAL_STORAGE,//qxq: - Manifest.permission.MANAGE_EXTERNAL_STORAGE,//qxq: - Manifest.permission.WRITE_EXTERNAL_STORAGE}; //应用写入设备的外部存储 - - //is permission granted ? otherwise add to 'List' - for(String P : Perm) - if(PackageManager.PERMISSION_GRANTED!= ContextCompat.checkSelfPermission(this,P)) - NOPER_List.add(P); - - tempList = new String[NOPER_List.size()]; - if(!NOPER_List.isEmpty()) - ActivityCompat.requestPermissions(this,NOPER_List.toArray(tempList),123); - - initSDK(); - } - - - /************************* - * 初始化SparkChainSDK - * *******************************/ - private void initSDK() { - Log.d(TAG,"initSDK"); - // 初始化SDK，Appid等信息在清单中配置 - SparkChainConfig sparkChainConfig = SparkChainConfig.builder(); - sparkChainConfig.appID(getResources().getString(R.string.appid)) - .apiKey(getResources().getString(R.string.apikey)) - .apiSecret(getResources().getString(R.string.apiSecret))//应用申请的appid三元组 -// .uid(getAndroidId()) - .logLevel(666); - - int ret = SparkChain.getInst().init(getApplicationContext(),sparkChainConfig); - String result; - if(ret == 0){ - result = "qxq:spark pro SDK初始化成功,请选择相应的功能点击体验。"; - isAuth = true; - }else{ - result = "SDK初始化失败,错误码:" + ret; - isAuth = false; - } - Log.d(TAG,result); - showInfo(result); - } - - private void showInfo(String text){ - runOnUiThread(new Runnable() { - @Override - public void run() { - //tv_result.setText(text); - } - }); - } - - /********* - * 文本交互结果监听回调 - * ***********/ - LLMCallbacks llmCallbacks = new LLMCallbacks() { - @Override - public void onLLMResult(LLMResult llmResult, Object usrContext) { - if(token == (int)usrContext){//本次返回的结果是否跟请求的问题是否匹配，通过用户自定义标识判断。 - Log.d(TAG,"onLLMResult\n"); - Log.d(TAG,"onLLMResult sid:"+llmResult.getSid()); - String content = llmResult.getContent();//获取交互结果 - Log.e(TAG,"onLLMResult:" + content); - - String answerJson = llmResult.getRaw(); - Log.e(TAG,"onLLMResultRaw:" + answerJson); - int status = llmResult.getStatus();//获取结果状态 - if(content != null) { - runOnUiThread(new Runnable() { - @Override - public void run() { - chatText.append(content); - toend(); - } - }); - } - if(status == 2){//2表示大模型结果返回完成 - int completionTokens = llmResult.getCompletionTokens(); - int promptTokens = llmResult.getPromptTokens();// - int totalTokens = llmResult.getTotalTokens(); - Log.e(TAG,"completionTokens:" + completionTokens + "promptTokens:" + promptTokens + "totalTokens:" + totalTokens); - sessionFinished = true; - } - } - } - - @Override - public void onLLMEvent(LLMEvent event, Object usrContext) { - Log.d(TAG,"onLLMEvent\n"); - Log.w(TAG,"onLLMEvent:" + " " + event.getEventID() + " " + event.getEventMsg()); - } - - @Override - public void onLLMError(LLMError error, Object usrContext) { - Log.d(TAG,"onLLMError\n"); - Log.d(TAG,"onLLMError sid:"+error.getSid()); - Log.e(TAG,"errCode:" + error.getErrCode() + "errDesc:" + error.getErrMsg()); - runOnUiThread(new Runnable() { - @Override - public void run() { - chatText.append("错误:" + " err:" + error.getErrCode() + " errDesc:" + error.getErrMsg() + "\n"); - } - }); - sessionFinished = true; - - } - }; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_iflytex); - - Android_Permission_init();//qxq:这里初始化了android权限，同时也进行了初始化SDK。在原本的demo里这里是放在main程序里执行 - initView(); - initButtonClickListener(); - setLLMConfig(); - //tv_result = findViewById(R.id.Iflytex_Notification); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - SparkChain.getInst().unInit();//qxq:逆初始化 - } - /*************** - * 配置文本交互LLM，注册结果监听回调 - * ******************/ - private void setLLMConfig(){ - Log.d(TAG,"setLLMConfig"); - LLMConfig llmConfig = LLMConfig.builder() - .domain("4.0Ultra"); - llmConfig.showRefLabel(true);//返回信源信息，4.0Utral版本支持，其他版本传递无效。 -// Memory window_memory = Memory.windowMemory(5); - llm = LLMFactory.textGeneration(llmConfig); -// String rawJson = "{\n" + -// " \"header\": {\n" + -// " \"app_id\": 30dfb58a,\n" + -// " \"uid\": \"1234\", \n" + -// " # \"patch_id\": [] #接入微调模型，对应服务发布后的resourceid \n" + -// " },\n" + -// " \"parameter\": {\n" + -// " \"chat\": {\n" + -// " \"domain\": 4.0Ultra,\n" + -// " \"temperature\": 0.5,\n" + -// " \"max_tokens\": 4096,\n" + -// " \"auditing\": \"default\",\n" + -// " }\n" + -// " },\n" + -// " \"payload\": {\n" + -// " \"message\": {\n" + -// " \"text\": [{\"role\": \"user\", \"content\": 给我写一篇100字的作文}]\n" + -// " }\n" + -// " }"; -// int ret = llm.arunWithJson(rawJson,token); - llm.registerLLMCallbacks(llmCallbacks); - - } - - private String getAndroidId() { - try { - return Settings.Secure.getString(this.getContentResolver(),Settings.Secure.ANDROID_ID); - } catch (Exception ex) { - ex.printStackTrace(); - } - return ""; - } - /*************** - * 取消本次交互 - * ****************/ - private void stopChat(){ - if(llm == null){ - Log.e(TAG,"startChat failed,please setLLMConfig before!"); - return; - } - llm.stop(); - } - - private void startSyncChat(){ - String question = "给我讲个笑话吧。"; - LLMOutput syncOutput = llm.run(question); - if(syncOutput.getErrCode() == 0) { - Log.i(TAG, "同步调用：" + syncOutput.getRole() + ":" + syncOutput.getContent()); - String results = syncOutput.getContent(); - - }else { - Log.e(TAG, "同步调用：" + "errCode" + syncOutput.getErrCode() + " errMsg:" + syncOutput.getErrMsg()); - } - } - - - /*************** - * 开始交互，异步 - * ****************/ - private void startChat() { - if(llm == null){ - Log.e(TAG,"startChat failed,please setLLMConfig before!"); - return; - } - - String usrInputText = inputText.getText().toString(); - Log.d(TAG,"用户输入：" + usrInputText); - if(usrInputText.length() >= 1) - chatText.append("\n输入:\n " + usrInputText + "\n"); - token++; - - int ret = llm.arun(usrInputText,token); - if(ret != 0){ - Log.e(TAG,"SparkChain failed:\n" + ret); - return; - } - - runOnUiThread(new Runnable() { - @Override - public void run() { - inputText.setText(""); - chatText.append("输出:\n "); - } - }); - - sessionFinished = false; - } - - /*********** - * 使用原始json输入方式 - * *************/ - private void startChatWithJson(){ - if(llm == null){ - Log.e(TAG,"startChat failed,please setLLMConfig before!"); - return; - } - /*******************仅供示例**************************/ - String rawJson = "{\n" + - " \"header\":{\n" + - " \"app_id\":\"4CC5779A\",\n" + - " \"uid\":\"12345\"\n" + - " },\n" + - " \"parameter\":{\n" + - " \"chat\":{\n" + - " \"domain\":\"4.0Ultra\",\n" + - " \"temperature\":0.5,\n" + - " \"max_tokens\":1024\n" + - " }\n" + - " },\n" + - " \"payload\":{\n" + - " \"message\":{\n" + - " \"text\":[\n" + - /*******************************prompt人设*********************************************/ - " {\n" + - " \"role\":\"system\",\n" + - " \"content\":\"你现在扮演李白，你豪情万丈，狂放不羁；接下来请用李白的口吻和用户对话。\"\n" + - " },\n" + - /*******************************历史会话*********************************************/ - " {\n" + - " \"role\":\"user\",\n" + - " \"content\":\"你是谁\"\n" + - " },\n" + - " {\n" + - " \"role\":\"assistant\",\n" + - " \"content\":\"吾乃李白，字太白，号青莲居士，唐代诗人，人称“诗仙”。吾之诗篇，豪放不羁，飘逸如风，犹如天上明月，照耀千古。汝有何事，欲与吾言？\"\n" + - " },\n" + - /*******************************当前提问*********************************************/ - " {\n" + - " \"role\":\"user\",\n" + - " \"content\":\"你会做什么\"\n" + - " }\n" + - /*********************************************************************************/ - " ]\n" + - " }\n" + - " }\n" + - "}"; - chatText.append("\n输入:\n " + "你会做什么" + "\n"); - token++; - int ret = llm.arunWithJson(rawJson,token); - if(ret != 0){ - Log.e(TAG,"SparkChain failed:\n" + ret); - return; - } - runOnUiThread(new Runnable() { - @Override - public void run() { - inputText.setText(""); - chatText.append("输出:\n "); - } - }); - sessionFinished = false; - } - - - private void initButtonClickListener() { - btn_startChat.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - startChat(); -// startChatWithJson(); - toend(); - } - }); - - btn_stopChat.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - stopChat(); - } - }); - // 监听文本框点击时间,跳转到底部 - inputText.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - toend(); - } - }); - } - - private void initView() { - btn_startChat = findViewById(R.id.test_start); - chatText = findViewById(R.id.Chat_Notification); - inputText = findViewById(R.id.test_input); - btn_stopChat = findViewById(R.id.Chat_arun_stop_btn); - chatText.setMovementMethod(new ScrollingMovementMethod()); - - GradientDrawable drawable = new GradientDrawable(); - // 设置圆角弧度为5dp - drawable.setCornerRadius(dp2px(this, 5f)); - // 设置边框线的粗细为1dp，颜色为黑色【#000000】 - drawable.setStroke((int) dp2px(this, 1f), Color.parseColor("#000000")); - inputText.setBackground(drawable); - } - - private float dp2px(Context context, float dipValue) { - if (context == null) { - return 0; - } - final float scale = context.getResources().getDisplayMetrics().density; - return (float) (dipValue * scale + 0.5f); - } - - public static void showToast(final Activity context, final String content){ - - context.runOnUiThread(new Runnable() { - @Override - public void run() { - int random = (int) (Math.random()*(1-0)+0); - Toast.makeText(context,content,random).show(); - } - }); - - } - - public void toend(){ - int scrollAmount = chatText.getLayout().getLineTop(chatText.getLineCount()) - chatText.getHeight(); - if (scrollAmount > 0) { - chatText.scrollTo(0, scrollAmount+10); - } - } -} \ No newline at end of file diff --git a/xiaomi-src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/xiaomi-src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 8267b79..add5e85 100644 --- a/xiaomi-src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/xiaomi-src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -320,7 +320,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, findViewById(R.id.spark).setOnClickListener(new View.OnClickListener(){//qxq:这个按钮被触发时，设置了点击监听器函数 @Override public void onClick(View view) { - Intent intent = new Intent(NoteEditActivity.this, IflytexActivity.class); + Intent intent = new Intent(NoteEditActivity.this, net.micode.notes.SparkChain.IflytexActivity.class); startActivity(intent); } });