release(Android): 0.9.5

smallpath · Nov 13, 2018 · 968b616 · 968b616
1 parent d157d8c
commit 968b616
Show file tree

Hide file tree

Showing 81 changed files with 146 additions and 140 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.9.5
+- 启用 HTTPS
+
+## 0.9.4
+- 修复机因广告导致解析失败的问题
+
 ## 0.9.3
 - 修复部分机型上折叠工具栏报错的问题
 - 修复安卓5.0涟漪错位的问题

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "psnine",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

diff --git a/psnine/component/BattleItem.tsx b/psnine/component/BattleItem.tsx
@@ -154,7 +154,7 @@ export default class BattleItem extends React.PureComponent<ExtendedProp, Flatli
                   this.props.navigation.navigate('Home', {
                     title: rowData.psnid,
                     id: rowData.psnid,
-                    URL: `http://psnine.com/psnid/${rowData.psnid}`
+                    URL: `https://psnine.com/psnid/${rowData.psnid}`
                   })
                 }
               }>{rowData.psnid}</Text>

diff --git a/psnine/component/CircleItem.tsx b/psnine/component/CircleItem.tsx
@@ -71,7 +71,7 @@ export default class CircleItem extends React.PureComponent<ExtendedProp, {}> {
                   this.props.navigation.navigate('Home', {
                     title: rowData.owner,
                     id: rowData.owner,
-                    URL: `http://psnine.com/psnid/${rowData.owner}`
+                    URL: `https://psnine.com/psnid/${rowData.owner}`
                   })
                 }
               }><Text style={{ flex: -1, color: modeInfo.standardTextColor, fontSize: 12 }} numberOfLines={1}>机长：</Text>{rowData.owner}</Text>

diff --git a/psnine/component/CommunityItem.android.tsx b/psnine/component/CommunityItem.android.tsx
@@ -154,7 +154,7 @@ export default class ComplexComment extends React.PureComponent<ExtendedProp, Fl
                   navigation.navigate('Home', {
                     title: rowData.psnid,
                     id: rowData.psnid,
-                    URL: `http://psnine.com/psnid/${rowData.psnid}`
+                    URL: `https://psnine.com/psnid/${rowData.psnid}`
                   })
                 }}>{rowData.psnid}</Text>
               <Text selectable={false} numberOfLines={1}

diff --git a/psnine/component/CommunityItem.ios.tsx b/psnine/component/CommunityItem.ios.tsx
@@ -143,7 +143,7 @@ export default class ComplexComment extends React.PureComponent<ExtendedProp, Fl
                   navigation.navigate('Home', {
                     title: rowData.psnid,
                     id: rowData.psnid,
-                    URL: `http://psnine.com/psnid/${rowData.psnid}`
+                    URL: `https://psnine.com/psnid/${rowData.psnid}`
                   })
                 }}>{rowData.psnid}</Text>
               <Text selectable={false} numberOfLines={1}

diff --git a/psnine/component/ComplexComment.tsx b/psnine/component/ComplexComment.tsx
@@ -237,7 +237,7 @@ export default class ComplexComment extends React.PureComponent<ExtendedProp, Ex
         id: rowData.id.replace('comment-', ''),
         at: name ? name : rowData.psnid,
         callback: () => {
-          fetch(`http://psnine.com/get/comson?id=${rowData.id.replace('comment-', '')}`).then(() => {
+          fetch(`https://psnine.com/get/comson?id=${rowData.id.replace('comment-', '')}`).then(() => {
             preFetch && preFetch()
           })
         },
@@ -317,7 +317,7 @@ export default class ComplexComment extends React.PureComponent<ExtendedProp, Ex
                     this.props.navigation.navigate('Home', {
                       title: rowData.psnid,
                       id: rowData.psnid,
-                      URL: `http://psnine.com/psnid/${rowData.psnid}`
+                      URL: `https://psnine.com/psnid/${rowData.psnid}`
                     })
                   }
                 }>{rowData.psnid}</Text>

diff --git a/psnine/component/DiscountItem.tsx b/psnine/component/DiscountItem.tsx
@@ -22,8 +22,8 @@ export default class extends React.PureComponent<ExtendedProp, FlatlistItemState
     const { navigation } = this.props
     const id = rowData.id || parseInt(rowData.url.split('/').pop(), 10)
     const URL = rowData.type === 'outter' ?
-      'http://psnine.com/dd/' + id :
-      'http://psnine.com/topic/' + id
+      'https://psnine.com/dd/' + id :
+      'https://psnine.com/topic/' + id
     navigation.navigate(rowData.type === 'outter' ? 'DiscountTopic' : 'CommunityTopic', {
       URL,
       title: rowData.title,

diff --git a/psnine/component/GameItem.tsx b/psnine/component/GameItem.tsx
@@ -23,7 +23,7 @@ export default class extends React.PureComponent<ExtendedProp, {}> {
     const { navigation } = this.props
     const URL = getGameUrl(rowData.id)
     navigation.navigate('GamePage', {
-      // URL: 'http://psnine.com/psngame/5424?psnid=Smallpath',
+      // URL: 'https://psnine.com/psngame/5424?psnid=Smallpath',
       URL,
       title: rowData.title,
       rowData,

diff --git a/psnine/component/GeneItem.tsx b/psnine/component/GeneItem.tsx
@@ -148,7 +148,7 @@ export default class extends React.PureComponent<ExtendedProp, FlatlistItemState
                     this.props.navigation.navigate('Home', {
                       title: rowData.psnid,
                       id: rowData.psnid,
-                      URL: `http://psnine.com/psnid/${rowData.psnid}`
+                      URL: `https://psnine.com/psnid/${rowData.psnid}`
                     })
                   }
                 }>{rowData.psnid}</Text>

diff --git a/psnine/component/HTMLView/htmlToElement.tsx b/psnine/component/HTMLView/htmlToElement.tsx
@@ -213,7 +213,7 @@ export default function htmlToElement(rawHtml, opts, done) {
           if (ImageComponent === ResizableImgComponent) {
               let src = node.attribs.src
               if (/^(.*?):\/\//.exec(src)) {} else {
-                src = 'http://psnine.com' + src
+                src = 'https://psnine.com' + src
               }
               // console.log('pushing', src)
               opts.imageArr.push({ url: src })

diff --git a/psnine/component/HTMLView/inlineImage.tsx b/psnine/component/HTMLView/inlineImage.tsx
@@ -22,7 +22,7 @@ export default props => {
   }
   let src = props.attribs.src
   if (/^(.*?):\/\//.exec(src)) {} else {
-    src = 'http://psnine.com' + src
+    src = 'https://psnine.com' + src
   }
   const source = {
     uri: src,

diff --git a/psnine/component/HTMLView/resizableImage.android.tsx b/psnine/component/HTMLView/resizableImage.android.tsx
@@ -26,7 +26,7 @@ export default props => {
   }
   let src = props.attribs.src
   if (/^(.*?):\/\//.exec(src)) {} else {
-    src = 'http://psnine.com' + src
+    src = 'https://psnine.com' + src
   }
 
   const source = {

diff --git a/psnine/component/HTMLView/resizableImage.ios.tsx b/psnine/component/HTMLView/resizableImage.ios.tsx
@@ -26,7 +26,7 @@ export default props => {
   }
   let src = props.attribs.src
   if (/^(.*?):\/\//.exec(src)) {} else {
-    src = 'http://psnine.com' + src
+    src = 'https://psnine.com' + src
   }
 
   const source = {

diff --git a/psnine/component/LatestCommentItem.tsx b/psnine/component/LatestCommentItem.tsx
@@ -54,7 +54,7 @@ export default class PhotoItem extends React.PureComponent<FlatlistItemProp> {
                 navigation.navigate('Home', {
                   title: rowData.psnid,
                   id: rowData.psnid,
-                  URL: `http://psnine.com/psnid/${rowData.psnid}`
+                  URL: `https://psnine.com/psnid/${rowData.psnid}`
                 })
               }}>{rowData.psnid}</Text>
             <Text numberOfLines={1} ellipsizeMode='tail' selectable={false} style={{

diff --git a/psnine/component/MessageItem.tsx b/psnine/component/MessageItem.tsx
@@ -131,7 +131,7 @@ export default class ComplexComment extends React.PureComponent<ExtendedProp, Fl
                     this.props.navigation.navigate('Home', {
                       title: rowData.psnid,
                       id: rowData.psnid,
-                      URL: `http://psnine.com/psnid/${rowData.psnid}`
+                      URL: `https://psnine.com/psnid/${rowData.psnid}`
                     })
                   }
                 }>{rowData.psnid}</Text>

diff --git a/psnine/component/NewsItem.tsx b/psnine/component/NewsItem.tsx
@@ -91,7 +91,7 @@ export default class NewsItem extends React.PureComponent<FlatlistItemProp, Flat
                     navigation.navigate('Home', {
                       title: rowData.psnid,
                       id: rowData.psnid,
-                      URL: `http://psnine.com/psnid/${rowData.psnid}`
+                      URL: `https://psnine.com/psnid/${rowData.psnid}`
                     })
                   }}>{rowData.psnid}</Text>
                 <Text selectable={false} style={{

diff --git a/psnine/component/QaItem.tsx b/psnine/component/QaItem.tsx
@@ -139,7 +139,7 @@ export default class extends React.PureComponent<ExtendedProp, FlatlistItemState
                   this.props.navigation.navigate('Home', {
                     title: rowData.psnid,
                     id: rowData.psnid,
-                    URL: `http://psnine.com/psnid/${rowData.psnid}`
+                    URL: `https://psnine.com/psnid/${rowData.psnid}`
                   })
                 }
               }>{rowData.psnid}</Text>

diff --git a/psnine/component/RankItem.tsx b/psnine/component/RankItem.tsx
@@ -35,7 +35,7 @@ export default class extends React.PureComponent<ExtendedProp, FlatlistItemState
     const { navigation } = this.props
     const URL = getHomeURL(rowData.psnid)
     navigation.navigate('Home', {
-      // URL: 'http://psnine.com/psngame/5424?psnid=Smallpath',
+      // URL: 'https://psnine.com/psngame/5424?psnid=Smallpath',
       URL,
       title: rowData.psnid,
       rowData

diff --git a/psnine/component/SimpleComment.tsx b/psnine/component/SimpleComment.tsx
@@ -204,7 +204,7 @@ export default class extends React.PureComponent<ExtendedProp, FlatlistItemState
                     this.props.navigation.navigate('Home', {
                       title: rowData.psnid,
                       id: rowData.psnid,
-                      URL: `http://psnine.com/psnid/${rowData.psnid}`
+                      URL: `https://psnine.com/psnid/${rowData.psnid}`
                     })
                   }
                 }>{rowData.psnid}</Text>

diff --git a/psnine/component/TipItem.tsx b/psnine/component/TipItem.tsx
@@ -56,7 +56,7 @@ export default class PhotoItem extends React.PureComponent<FlatlistItemProp> {
                 navigation.navigate('Home', {
                   title: rowData.psnid,
                   id: rowData.psnid,
-                  URL: `http://psnine.com/psnid/${rowData.psnid}`
+                  URL: `https://psnine.com/psnid/${rowData.psnid}`
                 })
               }}>{rowData.psnid}</Text>
             <Text numberOfLines={1} ellipsizeMode='tail' selectable={false} style={{

diff --git a/psnine/component/TradeItem.tsx b/psnine/component/TradeItem.tsx
@@ -150,7 +150,7 @@ export default class TradeItem extends React.PureComponent<ExtendedProp, Flatlis
                     this.props.navigation.navigate('Home', {
                       title: rowData.psnid,
                       id: rowData.psnid,
-                      URL: `http://psnine.com/psnid/${rowData.psnid}`
+                      URL: `https://psnine.com/psnid/${rowData.psnid}`
                     })
                   }
                 }>{rowData.psnid}</Text>

diff --git a/psnine/container/LeftDrawer.tsx b/psnine/container/LeftDrawer.tsx
@@ -37,7 +37,7 @@ const ListItems = [
       const { navigation, closeDrawer } = this.props
       closeDrawer()
 
-      let URL = 'http://psnine.com/my/fav?page=1'
+      let URL = 'https://psnine.com/my/fav?page=1'
 
       navigation.navigate('Favorite', {
         URL,
@@ -52,7 +52,7 @@ const ListItems = [
       const { navigation, closeDrawer } = this.props
       closeDrawer()
 
-      let URL = 'http://psnine.com/my/issue?page=1'
+      let URL = 'https://psnine.com/my/issue?page=1'
 
       navigation.navigate('Issue', {
         URL,
@@ -67,7 +67,7 @@ const ListItems = [
       const { navigation, closeDrawer } = this.props
       closeDrawer()
 
-      let URL = 'http://psnine.com/my/block'
+      let URL = 'https://psnine.com/my/block'
 
       navigation.navigate('UserBlock', {
         URL,
@@ -82,7 +82,7 @@ const ListItems = [
   //     const { navigation, closeDrawer } = this.props
   //     closeDrawer()
 
-  //     let URL = 'http://psnine.com/my/element'
+  //     let URL = 'https://psnine.com/my/element'
 
   //     navigation.navigate('UserElement', {
   //       URL,
@@ -97,7 +97,7 @@ const ListItems = [
       const { navigation, closeDrawer } = this.props
       closeDrawer()
 
-      let URL = 'http://psnine.com/my/photo?page=1'
+      let URL = 'https://psnine.com/my/photo?page=1'
 
       navigation.navigate('UserPhoto', {
         URL,
@@ -112,7 +112,7 @@ const ListItems = [
       const { navigation, closeDrawer } = this.props
       closeDrawer()
 
-      let URL = 'http://psnine.com/my/account'
+      let URL = 'https://psnine.com/my/account'
 
       navigation.navigate('UserDetail', {
         URL,
@@ -127,7 +127,7 @@ const ListItems = [
       const { navigation, closeDrawer } = this.props
       closeDrawer()
 
-      let URL = 'http://psnine.com/my/setting'
+      let URL = 'https://psnine.com/my/setting'
 
       navigation.navigate('UserCustom', {
         URL,
@@ -341,7 +341,7 @@ export default class NavigationDrawer extends Component<any, any> {
           const { navigation, closeDrawer } = this.props
           closeDrawer()
 
-          let URL = 'http://psnine.com/my/pass'
+          let URL = 'https://psnine.com/my/pass'
 
           navigation.navigate('Pass', {
             URL,

diff --git a/psnine/container/Toolbar.android.tsx b/psnine/container/Toolbar.android.tsx
@@ -174,7 +174,7 @@ class Toolbar extends Component<any, any> {
         index === 1 && this._onSearchClicked()
         const obj: any = {}
         if (communityType) {
-          obj.URL = `http://psnine.com/node/${communityType}/add`
+          obj.URL = `https://psnine.com/node/${communityType}/add`
         }
         index === 0 && this.props.navigation.navigate('NewTopic', obj)
       }
@@ -457,7 +457,7 @@ class Toolbar extends Component<any, any> {
     // this.props.navigation.navigate('Home', {
     //   title: 'secondlife_xhm',
     //   id: 'secondlife_xhm',
-    //   URL: `http://psnine.com/psnid/${'secondlife_xhm'}`
+    //   URL: `https://psnine.com/psnid/${'secondlife_xhm'}`
     // })
   }
 

diff --git a/psnine/container/Toolbar.ios.tsx b/psnine/container/Toolbar.ios.tsx
@@ -168,7 +168,7 @@ class Toolbar extends Component<any, any> {
         index === 1 && this._onSearchClicked()
         const obj: any = {}
         if (communityType) {
-          obj.URL = `http://psnine.com/node/${communityType}/add`
+          obj.URL = `https://psnine.com/node/${communityType}/add`
         }
         index === 0 && this.props.navigation.navigate('NewTopic', obj)
       }

diff --git a/psnine/container/circle/Circle.tsx b/psnine/container/circle/Circle.tsx
@@ -73,7 +73,7 @@ export default class extends Component<any, any> {
         // alert(id)
         this.props.navigation.navigate('NewGene', {
           // shouldSeeBackground: true,
-          URL: `http://psnine.com/set/gene?ele=${id}`
+          URL: `https://psnine.com/set/gene?ele=${id}`
         })
         break
       case 0:
@@ -201,7 +201,7 @@ export default class extends Component<any, any> {
                   this.props.navigation.navigate('Home', {
                     title: rowData.owner,
                     id: rowData.owner,
-                    URL: `http://psnine.com/psnid/${rowData.owner}`
+                    URL: `https://psnine.com/psnid/${rowData.owner}`
                   })
                 }}><Text style={{fontSize: 12, color: modeInfo.standardTextColor}}>元素发起者：</Text>{rowData.owner}</Text>
             </View>

diff --git a/psnine/container/game/GameBattle.tsx b/psnine/container/game/GameBattle.tsx
@@ -78,7 +78,7 @@ class GameTopic extends Component<any, any> {
         const { params } = this.props.navigation.state
         const id = (params.URL.match(/\d+/) || [0])[0]
         this.props.navigation.navigate('NewBattle', {
-          URL: `http://psnine.com/set/battle?psngameid=${id}`
+          URL: `https://psnine.com/set/battle?psngameid=${id}`
         })
         // console.log(id)
         return

diff --git a/psnine/container/game/GamePoint.tsx b/psnine/container/game/GamePoint.tsx
@@ -114,7 +114,7 @@ class CommunityTopic extends Component<any, any> {
         onPress={() => {
           if (rowData.url) {
             this.props.navigation.navigate('GamePage', {
-              // URL: 'http://psnine.com/psngame/5424?psnid=Smallpath',
+              // URL: 'https://psnine.com/psngame/5424?psnid=Smallpath',
               URL: rowData.url,
               title: rowData.title,
               rowData,

diff --git a/psnine/container/game/GameQa.tsx b/psnine/container/game/GameQa.tsx
@@ -118,7 +118,7 @@ class GameTopic extends Component<any, any> {
         const { params } = this.props.navigation.state
         const id = (params.URL.match(/\d+/) || [0])[0]
         this.props.navigation.navigate('NewQa', {
-          URL: `http://psnine.com/set/qa?psngameid=${id}`
+          URL: `https://psnine.com/set/qa?psngameid=${id}`
         })
         // console.log(id)
         return

diff --git a/psnine/container/game/GameRank.tsx b/psnine/container/game/GameRank.tsx
@@ -43,7 +43,7 @@ class TopicItem extends React.PureComponent<any, any> {
     navigation.navigate('Home', {
       title: rowData.psnid,
       id: rowData.psnid,
-      URL: `http://psnine.com/psnid/${rowData.psnid}`
+      URL: `https://psnine.com/psnid/${rowData.psnid}`
     })
   }
 

diff --git a/psnine/container/game/Trophy.tsx b/psnine/container/game/Trophy.tsx
@@ -110,7 +110,7 @@ class CommunityTopic extends Component<any, any> {
         onPress={() => {
           if (rowData.url) {
             this.props.navigation.navigate('GamePage', {
-              // URL: 'http://psnine.com/psngame/5424?psnid=Smallpath',
+              // URL: 'https://psnine.com/psngame/5424?psnid=Smallpath',
               URL: rowData.url,
               title: rowData.title,
               rowData,

diff --git a/psnine/container/new/NewBattle.tsx b/psnine/container/new/NewBattle.tsx
@@ -312,7 +312,7 @@ export default class NewTopic extends Component<any, any> {
             <Button title='选择联机奖杯' color={modeInfo.standardColor} onPress={() => {
               if (this.state.psngameid === '') return global.toast('请先选择游戏')
               this.props.navigation.navigate('GamePage', {
-                URL: 'http://psnine.com/psngame/' + this.state.psngameid,
+                URL: 'https://psnine.com/psngame/' + this.state.psngameid,
                 title: this.state.data.game.reduce((prev, curr) => {
                   if (this.state.psngameid === curr.value) return curr.text
                   return prev
@@ -518,7 +518,7 @@ export default class NewTopic extends Component<any, any> {
   _pressImageButton = () => {
     Keyboard.dismiss()
     this.props.navigation.navigate('UserPhoto', {
-      URL: 'http://psnine.com/my/photo?page=1',
+      URL: 'https://psnine.com/my/photo?page=1',
       callback: ({ url }) => {
         this.addText(`[img]${url}[/img]`)
       }