Преглед на файлове

fix:
1. 修改了在《记录》、《日记》view下 list Item 的文字排版显示问题
2. 修改了 app 的基地址
3. 修改了部分文案

YuJing преди 2 месеца
родител
ревизия
7322ea3cfb

+ 2 - 1
commons/basic/src/main/ets/apis/YTRequest.ets

@@ -13,7 +13,8 @@ import { yTRouter } from '../utils/YTRouter';
 
 
 // export const baseURL: string = 'https://hm-test.ytpm.net/prod-api'
 // export const baseURL: string = 'https://hm-test.ytpm.net/prod-api'
 
 
-export const baseURL: string = 'http://192.168.1.160:48099/'
+// export const baseURL: string = 'http://192.168.1.160:48099/'
+export const baseURL: string = 'https://hm.ytpm.net/prod-diary/'
 
 
 export const instance = axios.create({
 export const instance = axios.create({
   baseURL,
   baseURL,

+ 1 - 0
commons/basic/src/main/ets/utils/YTRequest.ets

@@ -12,6 +12,7 @@ import { AppStorageKeyCollect } from '../constants';
 import { ReqString } from '../models';
 import { ReqString } from '../models';
 import { userInfo, UserInfo } from '../models/UserInfo';
 import { userInfo, UserInfo } from '../models/UserInfo';
 import { HuaweiAuthPlugin } from './HuaWeiAuthPlugin';
 import { HuaweiAuthPlugin } from './HuaWeiAuthPlugin';
+import { YTToast } from './YTToast';
 
 
 
 
 export const baseURL: string = 'https://hm-test.ytpm.net/prod-api'
 export const baseURL: string = 'https://hm-test.ytpm.net/prod-api'

+ 1 - 1
features/feature/src/main/ets/components/DiaryDatePicker.ets

@@ -17,7 +17,7 @@ export struct DiaryDatePicker {
   build() {
   build() {
     Column({space: 10}){
     Column({space: 10}){
       Row(){
       Row(){
-        Text("最新")
+        Text("今天")
           .fontSize(18)
           .fontSize(18)
           .fontWeight(700)
           .fontWeight(700)
           .onClick(() => {
           .onClick(() => {

+ 2 - 0
features/feature/src/main/ets/components/DiaryTitleItem.ets

@@ -9,6 +9,8 @@ export struct DiaryTitleItem {
       Text(this.title)
       Text(this.title)
         .fontSize(16)
         .fontSize(16)
         .fontWeight(600)
         .fontWeight(600)
+        .maxLines(1)
+        .textOverflow ({overflow: TextOverflow.Ellipsis})
     }
     }
     .height(60)
     .height(60)
     .width("100%")
     .width("100%")

+ 1 - 1
features/feature/src/main/ets/pages/DiarySearchPage.ets

@@ -80,7 +80,7 @@ struct DiarySearchPage{
             .width(18)
             .width(18)
             .aspectRatio(1)
             .aspectRatio(1)
 
 
-          TextInput({ placeholder: "输入物品名称", text: $$this.keyWord })
+          TextInput({ placeholder: "输入日记标题", text: $$this.keyWord })
             .padding(0)
             .padding(0)
             .fontSize(16)
             .fontSize(16)
             .layoutWeight(1)
             .layoutWeight(1)

+ 1 - 1
features/feature/src/main/ets/pages/IncreaseDiaryPage.ets

@@ -294,7 +294,7 @@ struct IncreaseDiaryPage {
 
 
               // 标题栏
               // 标题栏
               Row() {
               Row() {
-                TextInput({ text: $$this.diaryData.title, placeholder: "输入标题会更受欢迎(✪ω✪)" })
+                TextInput({ text: $$this.diaryData.title, placeholder: "输入标题会更受欢迎!" })
                   .padding(0)
                   .padding(0)
                   .fontSize(16)
                   .fontSize(16)
                   .fontWeight(500)
                   .fontWeight(500)

+ 21 - 14
features/feature/src/main/ets/view/DiaryView.ets

@@ -79,23 +79,30 @@ export struct DiaryView {
     CalendarPickerDialog.show({
     CalendarPickerDialog.show({
       selected: new Date(),
       selected: new Date(),
       onAccept: (value) => {
       onAccept: (value) => {
-        // this.selectedDate = value;
-        console.info("calendar onAccept:" + JSON.stringify(value));
-        let ans = DateUtils.formatDateToCustomString(value, false);
-        let target = 0;
-        for (let i = 0; i < this.Vm.dateList.length; i++) {
-          let current = this.Vm.dateList[i]
-          if(current > ans) {
-            target = i;
-          }
-        }
-        console.log("target " + target)
-        this.Vm.scroller.scrollToIndex(target, true,  ScrollAlign.START)
-
+        this.toDiaryHead(value)
       }
       }
     })
     })
   }
   }
 
 
+  /**
+   * 跳转到指定的日期的日记索引 ( 如果找不到指定的日期, 跳转到最近的比目标值大的索引 )
+   * @param date 选择的 日期
+   */
+  toDiaryHead(date: Date) {
+    console.info("calendar onAccept:" + JSON.stringify(date));
+    let ans = DateUtils.formatDateToCustomString(date, false);
+    let target = 0;
+    for (let i = 0; i < this.Vm.dateList.length; i++) {
+      let current = this.Vm.dateList[i]
+      if(current >= ans) {
+        target = i;
+      }
+    }
+    console.log("target " + target)
+    this.Vm.scroller.scrollToIndex(target, true,  ScrollAlign.START)
+  }
+
+
   /**
   /**
    * 重新加载日记数据
    * 重新加载日记数据
    */
    */
@@ -192,7 +199,7 @@ export struct DiaryView {
                     end: this.DiaryDel(item.id),
                     end: this.DiaryDel(item.id),
                     edgeEffect: SwipeEdgeEffect.None
                     edgeEffect: SwipeEdgeEffect.None
                   })
                   })
-                }, (item: DiaryData) => item.id?.toString())
+                }, (item: DiaryData) => item.id?.toString() + item.title!)
               }
               }
             }, (groupTitle: string, index: number) => groupTitle)
             }, (groupTitle: string, index: number) => groupTitle)
           }
           }

+ 5 - 0
features/feature/src/main/ets/view/RecodView.ets

@@ -274,6 +274,7 @@ export struct RecodView {
 
 
                       // 标题 和 内容
                       // 标题 和 内容
                       Column({space: 5}){
                       Column({space: 5}){
+                        // 标题
                         Row(){
                         Row(){
                           Text(item.title)
                           Text(item.title)
                             .fontSize(14)
                             .fontSize(14)
@@ -284,6 +285,8 @@ export struct RecodView {
                               right: 8,
                               right: 8,
                               bottom: 5
                               bottom: 5
                             })
                             })
+                            .maxLines(1)
+                            .textOverflow ({overflow: TextOverflow.Ellipsis})
                         }
                         }
                         .height(30)
                         .height(30)
                         .alignItems(VerticalAlign.Center)
                         .alignItems(VerticalAlign.Center)
@@ -295,6 +298,8 @@ export struct RecodView {
                             .fontSize(12)
                             .fontSize(12)
                             .fontColor('#212245')
                             .fontColor('#212245')
                             .opacity(0.5)
                             .opacity(0.5)
+                            .maxLines(2)
+                            .textOverflow ({overflow: TextOverflow.Ellipsis})
 
 
                           // 图片显示
                           // 图片显示
                           Scroll(){
                           Scroll(){

+ 14 - 12
features/user/src/main/ets/views/Mine.ets

@@ -92,6 +92,13 @@ export struct Mine {
     }
     }
   }
   }
 
 
+  private toSettingPage(){
+      if (this.userInfo.checkLogin()) {
+        yTRouter.router2SettingPage()
+        return
+      }
+      yTRouter.router2LoginPage()
+  }
 
 
   private linearInfo: LinearGradientOptions = {
   private linearInfo: LinearGradientOptions = {
     colors: [ ['#B9FD2A', 0.01], ['#F5FD6D', 1] ],
     colors: [ ['#B9FD2A', 0.01], ['#F5FD6D', 1] ],
@@ -125,11 +132,7 @@ export struct Mine {
           .borderRadius(40)
           .borderRadius(40)
           .position({ y: -40 })
           .position({ y: -40 })
           .onClick(() => {
           .onClick(() => {
-            if (this.userInfo.checkLogin()) {
-              yTRouter.router2SettingPage()
-              return
-            }
-            yTRouter.router2LoginPage()
+            this.toSettingPage()
           })
           })
 
 
           // 编辑按钮
           // 编辑按钮
@@ -141,18 +144,14 @@ export struct Mine {
               .fontColor(Color.Black)
               .fontColor(Color.Black)
               .linearGradient(this.linearInfo)
               .linearGradient(this.linearInfo)
               .padding({ left: 14, top: 5, right: 14, bottom: 5 })
               .padding({ left: 14, top: 5, right: 14, bottom: 5 })
-              .onClick(() => {
-                if (this.userInfo.checkLogin()) {
-                  yTRouter.router2SettingPage()
-                  return
-                }
-                yTRouter.router2LoginPage()
-              })
           }
           }
           .width("100%")
           .width("100%")
           .alignItems(VerticalAlign.Center)
           .alignItems(VerticalAlign.Center)
           .justifyContent(FlexAlign.End)
           .justifyContent(FlexAlign.End)
           .padding({top: 32})
           .padding({top: 32})
+          .onClick(() => {
+            this.toSettingPage()
+          })
 
 
           // 昵称 + 编辑按钮
           // 昵称 + 编辑按钮
           Row(){
           Row(){
@@ -160,6 +159,9 @@ export struct Mine {
               '未登录')
               '未登录')
               .fontSize(18)
               .fontSize(18)
               .fontColor('Color.Black')
               .fontColor('Color.Black')
+              .onClick(() => {
+                this.toSettingPage()
+              })
           }
           }
           .width("100%")
           .width("100%")
           .alignItems(VerticalAlign.Center)
           .alignItems(VerticalAlign.Center)

+ 2 - 1
products/entry/src/main/ets/entryability/EntryAbility.ets

@@ -3,6 +3,7 @@ import { hilog } from '@kit.PerformanceAnalysisKit';
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
 import {
 import {
   AppStorageKeyCollect,
   AppStorageKeyCollect,
+  IBestInit,
   jHStartAd,
   jHStartAd,
   permissionController,
   permissionController,
   YTAvoid,
   YTAvoid,
@@ -46,7 +47,7 @@ export default class EntryAbility extends UIAbility {
       if (AppStorage.get<string>(AppStorageKeyCollect.TOKEN)) {
       if (AppStorage.get<string>(AppStorageKeyCollect.TOKEN)) {
         YTUserRequest.refreshUserInfo()
         YTUserRequest.refreshUserInfo()
       }
       }
-      // IBestInit(windowStage, this.context)
+      IBestInit(windowStage, this.context)
       bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_SIGNATURE_INFO)
       bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_SIGNATURE_INFO)
         .then(res => {
         .then(res => {
           YTLog.info(`signatureInfo:` + JSON.stringify(res.signatureInfo))
           YTLog.info(`signatureInfo:` + JSON.stringify(res.signatureInfo))